--- a/src/JavaBoolBox.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-JavaTypeBox subclass:#JavaBoolBox
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Types'
-!
-
-!JavaBoolBox class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!JavaBoolBox methodsFor:'accessing'!
-
-box:smalltalkObject
- ^ (smalltalkObject = true) ifTrue: [1] ifFalse: [0].
-
- "Created: / 25-09-2011 / 17:58:08 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-javaType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ #Z
-
- "Created: / 05-09-2011 / 21:21:00 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-smalltalkType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ #Boolean
-
- "Created: / 05-09-2011 / 21:21:16 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-unbox:javaType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ javaType = 0 ifTrue: [ false ] ifFalse: [ true ].
-
- "Created: / 05-09-2011 / 21:20:38 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaBoolBox class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/JavaBooleanBox.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-JavaTypeBox subclass:#JavaBooleanBox
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Types'
-!
-
-!JavaBooleanBox class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!JavaBooleanBox methodsFor:'accessing'!
-
-javaType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ #'Ljava/lang/Boolean;'
-
- "Created: / 05-09-2011 / 21:14:47 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-smalltalkType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ #Boolean
-
- "Created: / 05-09-2011 / 21:15:04 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-unbox:javaObject
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ javaObject booleanValue
-
- "Created: / 05-09-2011 / 21:15:32 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaBooleanBox class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/JavaClass.st Sat Dec 03 21:02:53 2011 +0000
+++ b/src/JavaClass.st Sat Dec 03 21:05:52 2011 +0000
@@ -507,28 +507,35 @@
!
perform: aMessage onReceiver: receiver from: sender ifNotFound: aBlock
- | method selector class args retval|
- selector := aMessage selector.
- args := aMessage arguments.
- class := receiver class.
-
- method := JavaLookup instance lookupMethodForSelector: selector
- directedTo: class
- for: receiver
- withArguments: args
- from: sender
- ilc: nil.
-
- method ifNotNil:
- [ | boxedArgs |
- boxedArgs := self box: args to: method argTypes.
- retval := receiver perform: method selector withArguments: boxedArgs.
- ^ self unbox: retval returnType: method returnType.
- ].
- ^ aBlock value.
+ | method selector class args retval|
+ selector := aMessage selector.
+ args := aMessage arguments.
+ class := receiver class.
+
+ JavaLookup isNil ifTrue:[
+ (Smalltalk loadPackage: 'stx:libjava/experiments') ifFalse:[
+ self error: 'You should load package stx:libjava/experiments if you want some interop - still experimental' mayProceed: true.
+ ^nil
+ ]
+ ].
+
+ method := JavaLookup instance lookupMethodForSelector: selector
+ directedTo: class
+ for: receiver
+ withArguments: args
+ from: sender
+ ilc: nil.
+
+ method ifNotNil:
+ [ | boxedArgs |
+ boxedArgs := self box: args to: method argTypes.
+ retval := receiver perform: method selector withArguments: boxedArgs.
+ ^ self unbox: retval returnType: method returnType.
+ ].
+ ^ aBlock value.
"Created: / 19-09-2011 / 23:33:06 / Jan Kurs <kursjan@fit.cvut.cz>"
- "Modified: / 19-11-2011 / 12:38:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 03-12-2011 / 21:38:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaClass class methodsFor:'signature parsing'!
--- a/src/JavaIntegerBox.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-JavaTypeBox subclass:#JavaIntegerBox
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Types'
-!
-
-!JavaIntegerBox class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!JavaIntegerBox methodsFor:'accessing'!
-
-box:smalltalkObject
- |i|
-
- i := (Java at:'java.lang.Integer') new.
- i perform:#'<init>(I)V' with:smalltalkObject.
- ^ i
-
- "
- Java as_Integer:1
- "
-
- "Created: / 25-09-2011 / 11:49:57 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-javaType
- ^ #'Ljava/lang/Integer;'
-
- "Created: / 25-09-2011 / 11:49:57 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-smalltalkType
- ^ #SmallInteger
-
- "Modified: / 25-09-2011 / 22:21:13 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-unbox:javaObject
- ^ javaObject intValue
-
- "Created: / 25-09-2011 / 11:50:18 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaIntegerBox class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/JavaLookup.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Lookup subclass:#JavaLookup
- instanceVariableNames:''
- classVariableNames:'Instance'
- poolDictionaries:''
- category:'Languages-Java-Lookup'
-!
-
-!JavaLookup class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!JavaLookup class methodsFor:'instance creation'!
-
-cleanup
- Instance := nil.
-
- "Modified: / 25-02-2011 / 14:45:03 / kursjan <kursjan@fit.cvut.cz>"
- "Created: / 19-09-2011 / 23:25:08 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-instance
- Instance ifNil: [
- Instance := self basicNew initialize.
- ].
- ^ Instance.
-
- "Modified: / 25-02-2011 / 14:45:03 / kursjan <kursjan@fit.cvut.cz>"
- "Created: / 19-09-2011 / 23:20:49 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-new
- ^ self shouldNeverBeSent.
-
- "Created: / 25-02-2011 / 14:44:43 / kursjan <kursjan@fit.cvut.cz>"
- "Modified: / 29-08-2011 / 21:10:12 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaLookup methodsFor:'* uncommented (%1) *'!
-
-initialize
- "nothing to do"
-
- "Created: / 19-09-2011 / 23:39:57 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaLookup methodsFor:'lookup'!
-
-lookupMethodForSelector:selector directedTo:initialSearchClass for:aReceiver withArguments:argArrayOrNil from:sendingContext ilc: ilc
- "
- As a courtesy to a Smalltalker, try to map smalltalk selectors to a java ones.
- Returns JavaMethodDescriptor or nil.
- "
- |sm javaMethods |
- javaMethods := OrderedCollection new.
-
- sm := self descriptorForSmalltalkSelector: selector arguments: argArrayOrNil.
-
- (self javaSelectorsFor: initialSearchClass) do: [:s || jm |
- jm := self descriptorForJavaSelector: s.
- "find methods with same name and either static or non-static"
- (jm name = sm name) ifTrue: [ javaMethods add: jm ].
- ].
- ^ self findBestMatchOf: sm in: javaMethods.
-
- "Created: / 21-02-2011 / 13:38:55 / kursjan <kursjan@fit.cvut.cz>"
- "Modified: / 11-04-2011 / 20:19:50 / kursjan <kursjan@fit.cvut.cz>"
- "Modified: / 16-08-2011 / 09:40:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 29-08-2011 / 20:38:21 / kursjan"
- "Modified: / 20-09-2011 / 00:03:48 / Jan Kurs <kursjan@fit.cvut.cz>"
- "Modified (format): / 25-09-2011 / 21:08:45 / Jan Kurs <kursjan@fit.cvut.cz>"
- "Created: / 19-11-2011 / 13:03:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaLookup methodsFor:'matching'!
-
-descriptorForJavaSelector:arg
- ^ MessageDescription new
- parserClass: JavaSelectorParser;
- selector: arg;
- yourself.
-
- "Created: / 29-08-2011 / 20:41:48 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-descriptorForSmalltalkSelector:selector arguments: args
- ^ MessageDescription new
- parserClass: SmalltalkSelectorParser;
- runtimeArguments: args;
- selector: selector;
- yourself.
-
- "Created: / 29-08-2011 / 21:44:06 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-findBestMatchOf: smalltalkMethod in: javaMethods
- | methods |
- javaMethods size = 1 ifTrue: [
- ^ javaMethods first.
- ].
- javaMethods size = 0 ifTrue: [
- ^ nil
- ].
-
- methods := javaMethods select: [:m |
- m argSize = smalltalkMethod argSize.
- ].
- methods size = 1 ifTrue: [
- ^ methods first.
- ].
-
- methods := methods select: [:m |
- self javaMatches: m argTypes to: smalltalkMethod args.
- ].
- methods size = 1 ifTrue: [
- ^ methods first.
- ].
-
- methods size = 0 ifTrue: [
- ^ nil.
- ].
-
- ^ Error raiseErrorString: 'Ambiguous selector: ', smalltalkMethod name.
-
- "Created: / 29-08-2011 / 20:50:14 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-javaMatches: jArgs to: sArgs
-
- 1 to: jArgs size do: [ :i |
- ((JavaTypeBox typeBoxForJava: (jArgs at: i)) smalltalkType = ((sArgs at: i) className)) ifFalse: [ ^ false ].
- ].
- ^ true.
-
- "Created: / 29-08-2011 / 21:21:37 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-javaSelectorsFor:class
- | selectors cls static |
- cls := class.
- selectors := IdentitySet new.
- self breakPoint: #jk info: 'determine static based on class'.
- static := false.
-
- [cls = JavaObject] whileFalse: [
- cls methodDictionary keysAndValuesDo: [:k :v |
- (v isJavaMethod and: [v isStatic = static]) ifTrue: [
- selectors add: k.
- ].
- ].
- cls := cls superclass.
- ].
- ^ selectors.
-
- "Created: / 06-09-2011 / 22:20:34 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaLookup class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/JavaMethodWrapperCompiler.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,321 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Java subclass:#JavaMethodWrapperCompiler
- instanceVariableNames:'method source'
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Lookup'
-!
-
-!JavaMethodWrapperCompiler class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-!
-
-documentation
-"
- Helper class responsible for compiling wrapper methods
- that wraps/unwraps java methods. It compiles both,
- wrappers callable from smalltalk that calls Java method
- and vice versa. For details, refer documentation in
- #compileSmalltalk:toJava: and #compileJava:toSmalltalk:
-
- NOTE: Experimental.
-
- [author:]
- Jan Vrany <jan.vrany@fit.cvut.cz>
-
- [instance variables:]
- method a __JAVA__ for which to compile a
- wrapper.
-
- [class variables:]
-
- [see also:]
-
-"
-! !
-
-!JavaMethodWrapperCompiler class methodsFor:'instance creation'!
-
-new
- "return an initialized instance"
-
- ^ self basicNew initialize.
-! !
-
-!JavaMethodWrapperCompiler methodsFor:'accessing'!
-
-method
- ^ method
-!
-
-method:aJavaMethod
-
- self assert: aJavaMethod isJavaMethod
- description:'Not a Java method'.
- method := aJavaMethod.
-
- "Modified: / 25-11-2011 / 20:15:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaMethodWrapperCompiler methodsFor:'coding'!
-
-codeArgument: index descriptor: descriptor
-
- "Code one argument, whose type is described by
- a descriptor"
-
- | nm |
- nm := descriptor javaClassName asSymbol.
- nm == #'java.lang.Byte' ifTrue:[
- self code:'(JavaByte javaBox: arg%1) .' with: index.
- self codeCR.
- ^self.
- ].
- nm == #'java.lang.Short' ifTrue:[
- self code:'(JavaShort javaBox: arg%1) .' with: index.
- self codeCR.
- ^self.
- ].
- nm == #'java.lang.Integer' ifTrue:[
- self code:'(Integer javaBox: arg%1) .' with: index.
- self codeCR.
- ^self.
- ].
- nm == #'java.lang.Long' ifTrue:[
- self code:'(LargeInteger javaBox: arg%1) .' with: index.
- self codeCR.
- ^self.
- ].
- nm == #'java.lang.Character' ifTrue:[
- self code:'(Character javaBox: arg%1) .' with: index.
- self codeCR.
- ^self.
- ].
- nm == #'java.lang.Boolean' ifTrue:[
- self code:'(Boolean javaBox: arg%1) .' with: index.
- self codeCR.
- ^self.
- ].
- nm == #'LargeInteger' ifTrue:[
- "long occupies two slots"
- self code:'(arg%1) . nil .'.
- self codeCR.
- ^self.
- ].
- nm == #'Float' ifTrue:[
- "long occupies two slots"
- self code:'(arg%1) . nil .'.
- self codeCR.
- ^self.
- ].
- self code:'(arg%1) .'.
-
- "Created: / 25-11-2011 / 23:36:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-codeArgumentTypeCheck: index descriptor: descriptor
-
- self code:'"/ typecheck for arg%1 type %2' with: index with: descriptor javaClassName.
- self code:'(JavaVM canCast: arg%1 class to: (JavaVM classForName: #''%2'') ifFalse:['
- with: index with: descriptor javaClassName.
- self codeTab; code: 'self error:''Invalid argument type''.^nil'.
- self code: ']'.
- self codeCRCR.
-
- "Created: / 25-11-2011 / 23:10:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-codeMethodHeader: selector
-
- selector isUnarySelector ifTrue:[
- self code: selector.
- ] ifFalse:[
- selector keywords withIndexDo:[:kw :i|
- self code: '%1: arg%2' with: kw with: i.
- ].
- ].
- source cr; cr.
-
- "Created: / 25-11-2011 / 20:38:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaMethodWrapperCompiler methodsFor:'coding-helpers'!
-
-code: string
-
- source nextPutAll: string
-
- "Created: / 25-11-2011 / 20:42:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-code: string with: arg
-
- source nextPutAll: (string bindWith: arg)
-
- "Created: / 25-11-2011 / 20:42:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-code: string with: arg1 with: arg2
-
- source nextPutAll: (string bindWith: arg1 with: arg2)
-
- "Created: / 25-11-2011 / 20:42:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-code: string with: arg1 with: arg2 with: arg3
-
- source nextPutAll: (string bindWith: arg1 with: arg2 with: arg3)
-
- "Created: / 25-11-2011 / 20:42:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-code: string with: arg1 with: arg2 with: arg3 with: arg4
-
- source nextPutAll: (string bindWith: arg1 with: arg2 with: arg3 with: arg4)
-
- "Created: / 25-11-2011 / 20:42:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-codeCR
-
- source cr
-
- "Created: / 25-11-2011 / 20:48:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-codeCRCR
-
- source cr; cr.
-
- "Created: / 25-11-2011 / 20:48:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-codeTab
-
- source tab
-
- "Created: / 25-11-2011 / 20:47:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaMethodWrapperCompiler methodsFor:'compiling'!
-
-compileJava: javaSelector toSmalltalk: smalltalkSelector
-
- "Created: / 25-11-2011 / 20:09:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-compileSmalltalk: smalltalkSelector toJava: javaSelector
-
- "Compiles a method with smalltalk selector that calls
- java method is java object.
-
- Compiled method looks like:
- 1) check the type of each argument, if they do not
- match, throw an error (for now, we can be smarter)
- 2) box each argument, if neccessary
- 3) self-send javaSelector
- 4) unbox the return value (if it returns a wrapper object)
- "
-
- | mdescriptor |
- mdescriptor := method descriptor.
-
- self codeMethodHeader: smalltalkSelector.
- self code:'| retval |'; codeCRCR.
- "/code type checks
- mdescriptor parameters withIndexDo:[:descriptor :index|
- self codeArgumentTypeCheck: index descriptor: descriptor.
- ].
-
- "/code self send with inlined boxing
- self code:'retval := self'; codeCR.
- self codeTab; code:'perform: '; code: javaSelector asSymbol storeString; codeCR.
- smalltalkSelector isUnarySelector ifFalse:[
- self codeTab; code: 'withArguments: { '; codeCR.
- mdescriptor parameters withIndexDo:[:descriptor :index|
- self codeArgument: index descriptor: descriptor.
- ].
- self codeTab; code: '}'.
- ].
- self code:'.'; codeCR.
- "TODO: Should code unbox here..."
- self code:'^ retval'.
-
- ^self compile
-
- "Created: / 25-11-2011 / 20:09:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaMethodWrapperCompiler methodsFor:'compiling-private'!
-
-compile
-
- "Actually compiles the source"
-
- self halt:'Not yet implemented'
-
- "Created: / 25-11-2011 / 20:25:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaMethodWrapperCompiler methodsFor:'initialization'!
-
-initialize
- "Invoked when a new instance is created."
-
- "/ please change as required (and remove this comment)
- "/ method := nil.
- source := (String new: 100) writeStream.
-
- "/ super initialize. -- commented since inherited method does nothing
-
- "Modified: / 25-11-2011 / 20:24:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaMethodWrapperCompiler class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/JavaSelectorParser.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-SelectorParser subclass:#JavaSelectorParser
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Lookup'
-!
-
-!JavaSelectorParser class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!JavaSelectorParser methodsFor:'* uncategorized *'!
-
-translate:arg
- ^ arg.
-
- "Created: / 29-08-2011 / 22:21:57 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaSelectorParser methodsFor:'parsing'!
-
-parse:selector
- |pos pos2 posCloseBracket type lit|
- pos := selector indexOf: $(.
- handler name: (selector copyTo: pos - 1).
-
- posCloseBracket :=selector indexOf: $).
-
- [pos + 1 = posCloseBracket] whileFalse: [
- "parse arguments"
- lit := selector atIndex: pos + 1.
- lit = $L ifTrue: [
- pos2 := selector indexOf: $; startingAt: pos+1.
- type := self translate: (selector copyFrom: pos+1 to: pos2).
- pos := pos2.
- ] ifFalse: [
- type:= self translate: lit.
- pos := pos + 1.
- ].
- handler addArgumentOfType: type.
- ].
-
- type := selector copyFrom: posCloseBracket + 1 to: selector size.
- handler returnType: (self translate: type)
-
- "Created: / 29-08-2011 / 22:03:09 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaSelectorParser class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/JavaStringBox.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-JavaTypeBox subclass:#JavaStringBox
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Types'
-!
-
-!JavaStringBox class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!JavaStringBox methodsFor:'accessing'!
-
-javaType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ #'Ljava/lang/String;'
-
- "Created: / 31-08-2011 / 22:39:52 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-smalltalkType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ #'String'
-
- "Created: / 31-08-2011 / 22:40:06 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaStringBox methodsFor:'boxing-unboxing'!
-
-box:stString
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ Java as_String: stString
-
- "Created: / 31-08-2011 / 22:42:36 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-unbox:javaString
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ Java as_ST_String: javaString
-
- "Created: / 31-08-2011 / 22:42:03 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaStringBox class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/JavaTypeBox.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Object subclass:#JavaTypeBox
- instanceVariableNames:''
- classVariableNames:'SmalltalkTypeToBoxDictionary JavaTypeToBoxDictionary'
- poolDictionaries:''
- category:'Languages-Java-Types'
-!
-
-!JavaTypeBox class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!JavaTypeBox class methodsFor:'boxing-unboxing'!
-
-initialize
- JavaTypeToBoxDictionary := IdentityDictionary new.
- SmalltalkTypeToBoxDictionary := IdentityDictionary new.
-
- JavaTypeBox allSubclasses do: [:tb | | inst |
- inst := tb new.
- JavaTypeToBoxDictionary at: inst javaType put: inst.
- SmalltalkTypeToBoxDictionary at: inst smalltalkType put: inst.
- ].
-
- "Created: / 31-08-2011 / 22:30:36 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-new
- ^ self basicNew initialize
-
- "Created: / 25-09-2011 / 20:46:23 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-typeBoxForJava: javaType
- ^ JavaTypeToBoxDictionary at: javaType asSymbol ifAbsent: [ NoOpTypeBox new. ]
-
- "Created: / 25-09-2011 / 21:28:27 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-typeBoxForSmalltalk: smalltalkType
- ^ SmalltalkTypeToBoxDictionary at: smalltalkType asSymbol ifAbsent: [ NoOpTypeBox new. ]
-
- "Created: / 25-09-2011 / 21:28:47 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-typeBoxForSmalltalkClass: aClass
- | c typeBox |
- c := aClass.
-
- [c = Object] whileFalse:
- [
- typeBox := SmalltalkTypeToBoxDictionary at: c name ifAbsent: [nil].
- typeBox ifNotNil: [ ^ typeBox ].
- c := c superclass.
- ].
- ^ NoOpTypeBox new.
-
- "Created: / 25-09-2011 / 21:34:22 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaTypeBox methodsFor:'boxing-unboxing'!
-
-box: smalltalkObject
- "transform smalltalk object to java object"
- self subclassResponsibility.
-
- "Created: / 31-08-2011 / 22:43:26 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-initialize
- "nothing to do here"
-
- "Created: / 25-09-2011 / 20:46:34 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-javaMessageToSmalltalk: aMessageDescription
- ^ nil
-
- "Created: / 25-09-2011 / 21:49:42 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-javaType
- "return java class I can box to"
- self subclassResponsibility.
-
- "Created: / 31-08-2011 / 22:39:35 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-smalltalkType
- "return smalltalk type, I can unbox to"
- self subclassResponsibility.
-
- "Created: / 31-08-2011 / 22:39:39 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-unbox: javaObject
- "transform java object to smalltalk object"
- self subclassResponsibility.
-
- "Created: / 31-08-2011 / 22:32:54 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!JavaTypeBox class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
-
-JavaTypeBox initialize!
--- a/src/Make.proto Sat Dec 03 21:02:53 2011 +0000
+++ b/src/Make.proto Sat Dec 03 21:05:52 2011 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-11-27 23:54:33.137.
+# automagically generated from the projectDefinition: stx_libjava at 2011-12-03 22:08:11.491.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/java/java/nio/charset -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/squeak/petitparser -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libhtml -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libcomp
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/squeak/petitparser -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libhtml -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libjava/experiments
# if you need any additional defines for embedded C code,
@@ -201,8 +201,8 @@
$(OUTDIR)JavaAnnotationNestedAnnotationValue.$(O) JavaAnnotationNestedAnnotationValue.$(H): JavaAnnotationNestedAnnotationValue.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaAnnotationPrimitiveValue.$(O) JavaAnnotationPrimitiveValue.$(H): JavaAnnotationPrimitiveValue.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaBehavior.$(O) JavaBehavior.$(H): JavaBehavior.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaBoolBox.$(O) JavaBoolBox.$(H): JavaBoolBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaBooleanBox.$(O) JavaBooleanBox.$(H): JavaBooleanBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaBoolBox.$(O) JavaBoolBox.$(H): JavaBoolBox.st $(INCLUDE_TOP)/stx/libjava/experiments/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaBooleanBox.$(O) JavaBooleanBox.$(H): JavaBooleanBox.st $(INCLUDE_TOP)/stx/libjava/experiments/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaByteCodeDisassembler.$(O) JavaByteCodeDisassembler.$(H): JavaByteCodeDisassembler.st $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaByteCodeEnumerator.$(O) JavaByteCodeEnumerator.$(H): JavaByteCodeEnumerator.st $(INCLUDE_TOP)/stx/libjava/JavaDecompiler.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaByteCodeInterpreter.$(O) JavaByteCodeInterpreter.$(H): JavaByteCodeInterpreter.st $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -214,7 +214,7 @@
$(OUTDIR)JavaFieldAnnotationContainer.$(O) JavaFieldAnnotationContainer.$(H): JavaFieldAnnotationContainer.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaFieldDescriptor.$(O) JavaFieldDescriptor.$(H): JavaFieldDescriptor.st $(INCLUDE_TOP)/stx/libjava/JavaDescriptor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaFormalParameterNode.$(O) JavaFormalParameterNode.$(H): JavaFormalParameterNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaIntegerBox.$(O) JavaIntegerBox.$(H): JavaIntegerBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaIntegerBox.$(O) JavaIntegerBox.$(H): JavaIntegerBox.st $(INCLUDE_TOP)/stx/libjava/experiments/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaInvalidRefError.$(O) JavaInvalidRefError.$(H): JavaInvalidRefError.st $(INCLUDE_TOP)/stx/libjava/JavaError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethod.$(O) JavaMethod.$(H): JavaMethod.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodAnnotationContainer.$(O) JavaMethodAnnotationContainer.$(H): JavaMethodAnnotationContainer.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -223,10 +223,9 @@
$(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)/stx/libjava/JavaDescriptor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodWrapperCompiler.$(O) JavaMethodWrapperCompiler.$(H): JavaMethodWrapperCompiler.st $(INCLUDE_TOP)/stx/libjava/Java.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaPackage.$(O) JavaPackage.$(H): JavaPackage.st $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(STCHDR)
-$(OUTDIR)JavaSelectorParser.$(O) JavaSelectorParser.$(H): JavaSelectorParser.st $(INCLUDE_TOP)/stx/libjava/SelectorParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaStringBox.$(O) JavaStringBox.$(H): JavaStringBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaSelectorParser.$(O) JavaSelectorParser.$(H): JavaSelectorParser.st $(INCLUDE_TOP)/stx/libjava/experiments/SelectorParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaStringBox.$(O) JavaStringBox.$(H): JavaStringBox.st $(INCLUDE_TOP)/stx/libjava/experiments/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)/stx/libjava/JavaError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -234,9 +233,9 @@
$(OUTDIR)JavaUnresolvedStringConstant.$(O) JavaUnresolvedStringConstant.$(H): JavaUnresolvedStringConstant.st $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaVM.$(O) JavaVM.$(H): JavaVM.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavadocDeclarationNode.$(O) JavadocDeclarationNode.$(H): JavadocDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SetBox.$(O) SetBox.$(H): SetBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmalltalkSelectorParser.$(O) SmalltalkSelectorParser.$(H): SmalltalkSelectorParser.st $(INCLUDE_TOP)/stx/libjava/SelectorParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VoidBox.$(O) VoidBox.$(H): VoidBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SetBox.$(O) SetBox.$(H): SetBox.st $(INCLUDE_TOP)/stx/libjava/experiments/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmalltalkSelectorParser.$(O) SmalltalkSelectorParser.$(H): SmalltalkSelectorParser.st $(INCLUDE_TOP)/stx/libjava/experiments/SelectorParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)VoidBox.$(O) VoidBox.$(H): VoidBox.st $(INCLUDE_TOP)/stx/libjava/experiments/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaArrayTypeNode.$(O) JavaArrayTypeNode.$(H): JavaArrayTypeNode.st $(INCLUDE_TOP)/stx/libjava/JavaTypeNode.$(H) $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaBooleanTypeNode.$(O) JavaBooleanTypeNode.$(H): JavaBooleanTypeNode.st $(INCLUDE_TOP)/stx/libjava/JavaTypeNode.$(H) $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaBothOldAndNewClassRef.$(O) JavaBothOldAndNewClassRef.$(H): JavaBothOldAndNewClassRef.st $(INCLUDE_TOP)/stx/libjava/JavaClassRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -255,8 +254,7 @@
$(OUTDIR)JavaInterfaceMethodRef2.$(O) JavaInterfaceMethodRef2.$(H): JavaInterfaceMethodRef2.st $(INCLUDE_TOP)/stx/libjava/JavaMethodRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaClassContentRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodWithHandler.$(O) JavaMethodWithHandler.$(H): JavaMethodWithHandler.st $(INCLUDE_TOP)/stx/libjava/JavaMethodWithException.$(H) $(INCLUDE_TOP)/stx/libjava/JavaMethod.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaNativeMethod.$(O) JavaNativeMethod.$(H): JavaNativeMethod.st $(INCLUDE_TOP)/stx/libjava/JavaMethodWithHandler.$(H) $(INCLUDE_TOP)/stx/libjava/JavaMethodWithException.$(H) $(INCLUDE_TOP)/stx/libjava/JavaMethod.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic2/BooleanArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/BitArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic2/ZipArchive.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/DoubleArray.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractNumberVector.$(H) $(INCLUDE_TOP)/stx/libbasic/Float.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/FloatArray.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/LargeInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/ShortFloat.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/UnboxedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedLongIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic2/WordArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Process.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic2/BooleanArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/BitArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic2/ZipArchive.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/DoubleArray.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractNumberVector.$(H) $(INCLUDE_TOP)/stx/libbasic/Float.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/FloatArray.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/LargeInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/ShortFloat.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/UnboxedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedLongIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic2/WordArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Process.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Delay.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
-
--- a/src/Make.spec Sat Dec 03 21:02:53 2011 +0000
+++ b/src/Make.spec Sat Dec 03 21:05:52 2011 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-11-27 23:54:31.590.
+# automagically generated from the projectDefinition: stx_libjava at 2011-12-03 22:08:09.802.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/MessageDescription.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Object subclass:#MessageDescription
- instanceVariableNames:'parserClass name arguments argumentTypes returnType selector'
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Lookup'
-!
-
-!MessageDescription class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!MessageDescription class methodsFor:'instance creation'!
-
-new
- ^ self basicNew initialize
-
- "Created: / 29-08-2011 / 23:40:55 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!MessageDescription methodsFor:'accessing'!
-
-argSize
- ^ argumentTypes size
-
- "Created: / 29-08-2011 / 22:02:54 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-argTypes
- ^ argumentTypes
-
- "Created: / 05-09-2011 / 21:48:45 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-args
- ^ arguments
-
- "Created: / 30-08-2011 / 21:09:04 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-name
- ^ name
-!
-
-parserClass
- ^ parserClass
-!
-
-parserClass:something
- parserClass := something.
-!
-
-returnType
- ^ returnType
-!
-
-runtimeArguments: args
- arguments := args
-
- "Created: / 29-08-2011 / 21:46:42 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-selector
- ^ selector
-!
-
-selector: newSelector
- selector := newSelector.
- self parse: newSelector.
-
- "Created: / 29-08-2011 / 21:24:25 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!MessageDescription methodsFor:'handling'!
-
-addArgumentOfType: type
- argumentTypes add: type.
-
- "Created: / 29-08-2011 / 22:01:51 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-name: newName
- name := newName
-
- "Created: / 29-08-2011 / 23:39:29 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-returnType:something
- returnType := something.
-! !
-
-!MessageDescription methodsFor:'initialization'!
-
-initialize
- argumentTypes := OrderedCollection new.
-
- "Created: / 29-08-2011 / 22:02:22 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!MessageDescription methodsFor:'parsing'!
-
-parse:arg
- parserClass new parse: arg handler: self.
-
- "Created: / 29-08-2011 / 21:24:46 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!MessageDescription class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/NoOpTypeBox.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Object subclass:#NoOpTypeBox
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Types'
-!
-
-!NoOpTypeBox class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!NoOpTypeBox methodsFor:'accessing'!
-
-box: sObj
- ^ sObj
-
- "Created: / 31-08-2011 / 22:37:10 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-javaMessageToSmalltalk: aMessageDescription
- ^ nil.
-
- "Created: / 25-09-2011 / 21:49:25 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-smalltalkType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ nil
-
- "Created: / 05-09-2011 / 22:01:51 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-unbox: jObj
- ^ jObj
-
- "Created: / 31-08-2011 / 22:36:58 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!NoOpTypeBox class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/PersonSample.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Object subclass:#PersonSample
- instanceVariableNames:'name age'
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Lookup-Tests'
-!
-
-!PersonSample class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!PersonSample methodsFor:'* uncommented (%1) *'!
-
-doesNotUnderstand:aMessage
- "This is obviously work around, we have to find out, how to call this, when Java Selector is called"
- ^ self class
- perform: aMessage
- onReceiver: self
- from: thisContext sender
- ifNotFound: [ super doesNotUnderstand: aMessage]
-
-"/ [
-"/ ^ SmalltalkLookup instance
-"/ perform: aMessage onReceiver: self from: thisContext sender.
-"/ ] on: JavaDoesNotUnderstandException do: [:e |
-"/ ^ super doesNotUnderstand: aMessage.
-"/ ]
-
- "Created: / 06-09-2011 / 22:16:26 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!PersonSample methodsFor:'Java protocol'!
-
-getAge
- ^ self age
-
- "Created: / 06-09-2011 / 22:22:24 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-getName
- ^ self name
-
- "Created: / 06-09-2011 / 22:22:16 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!PersonSample methodsFor:'accessing'!
-
-age
- ^ age
-!
-
-age:something
- age := something.
-!
-
-name
- ^ name
-!
-
-name:something
- name := something.
-! !
-
-!PersonSample class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/SampleHandler.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Object subclass:#SampleHandler
- instanceVariableNames:'events'
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Lookup-Tests'
-!
-
-!SampleHandler class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!SampleHandler class methodsFor:'instance creation'!
-
-new
- ^ self basicNew initialize
-
- "Created: / 29-08-2011 / 22:51:35 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SampleHandler methodsFor:'* As yet uncategorized *'!
-
-addArgumentOfType: type
- events add: (Array with: #addArgumentOfType with: type).
-
- "Created: / 29-08-2011 / 22:56:11 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SampleHandler methodsFor:'accessing'!
-
-events
- ^ events
-! !
-
-!SampleHandler methodsFor:'handling'!
-
-name:aString
- events add: (Array with: #name with: aString).
-
- "Created: / 29-08-2011 / 22:46:38 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-returnType:aString
- events add: (Array with: #returnType with: aString).
-
- "Created: / 29-08-2011 / 22:52:04 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SampleHandler methodsFor:'initialization'!
-
-initialize
- events := OrderedCollection new.
-
- "Created: / 29-08-2011 / 22:42:08 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SampleHandler class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/SelectorParser.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Object subclass:#SelectorParser
- instanceVariableNames:'handler'
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Lookup'
-!
-
-!SelectorParser class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!SelectorParser methodsFor:'parsing'!
-
-parse:arg
- self subclassResponsibility
-
- "Created: / 29-08-2011 / 21:29:25 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-parse: selector handler: newHandler
- handler := newHandler.
- self parse: selector.
-
- "Created: / 29-08-2011 / 21:29:08 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SelectorParser class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/SetBox.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-JavaTypeBox subclass:#SetBox
- instanceVariableNames:'javaToSmalltalkSelectors'
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Types'
-!
-
-!SetBox class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!SetBox methodsFor:'accessing'!
-
-box: stSet
- " I don't want to convert, I provide translation between java.util.Set and Smalltalk Set class interfaces"
- ^ stSet
-
- "Created: / 25-09-2011 / 20:27:50 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-initialize
- javaToSmalltalkSelectors := IdentityDictionary new.
- javaToSmalltalkSelectors
- at: #contains
- put: #java__contains:.
-
- Set compile: 'java__contains:anObject
- ^ self contains: [:el | anObject = el ] ' classified: #javaProtocol
-
- "Created: / 25-09-2011 / 20:46:57 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-javaMessageToSmalltalk: aMessageDescription
- | sel stSel |
- sel := aMessageDescription name asSymbol.
- stSel := javaToSmalltalkSelectors at: sel ifAbsent: [^nil].
- ^ MessageDescription new
- parserClass: SmalltalkSelectorParser;
- selector: stSel;
- returnType: aMessageDescription returnType;
- yourself.
-
- "Created: / 25-09-2011 / 21:12:00 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-javaType
- ^ #'Ljava/util/Set;'
-
- "Created: / 25-09-2011 / 20:29:11 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-smalltalkType
- ^ #Set
-
- "Created: / 25-09-2011 / 20:29:23 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-unbox: javaSet
- ^ javaSet
-
- "Created: / 25-09-2011 / 20:28:48 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SetBox class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/SetSample.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Set subclass:#SetSample
- instanceVariableNames:'name age'
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Lookup-Tests'
-!
-
-!SetSample class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!SetSample methodsFor:'message sending'!
-
-doesNotUnderstand:aMessage
- "This is obviously work around, we have to find out, how to call this, when Java Selector is called"
- ^ self class
- perform: aMessage
- onReceiver: self
- from: thisContext sender
- ifNotFound: [ super doesNotUnderstand: aMessage]
-
-"/ [
-"/ ^ SmalltalkLookup instance
-"/ perform: aMessage onReceiver: self from: thisContext sender.
-"/ ] on: JavaDoesNotUnderstandException do: [:e |
-"/ ^ super doesNotUnderstand: aMessage.
-"/ ]
-
- "Created: / 06-09-2011 / 22:16:26 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SetSample class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/SmalltalkLookup.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-Lookup subclass:#SmalltalkLookup
- instanceVariableNames:''
- classVariableNames:'Instance'
- poolDictionaries:''
- category:'Languages-Java-Lookup'
-!
-
-!SmalltalkLookup class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!SmalltalkLookup class methodsFor:'instance creation'!
-
-instance
- Instance ifNil: [
- Instance := self basicNew initialize
- ].
- ^ Instance
-
- "Modified: / 25-09-2011 / 22:24:07 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-new
- ^ self shouldNeverBeSent.
-
- "Modified: / 25-09-2011 / 22:24:14 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SmalltalkLookup class methodsFor:'lookup'!
-
-cleanInstance
- ^ Instance := nil.
-
- "Created: / 28-09-2011 / 12:33:09 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SmalltalkLookup methodsFor:'lookup'!
-
-lookupMethodForSelector:selector directedTo:initialSearchClass for:aReceiver withArguments:argArrayOrNil from:sendingContext ilc: ilc
- | m jm sm cls |
- "perform standard lookup"
- m := super lookupMethodForSelector:selector directedTo:initialSearchClass for:aReceiver withArguments:argArrayOrNil from:sendingContext ilc: ilc.
- m notNil ifTrue: [ ^ m ].
-
- "nothing found? Maybe selector is JavaSelector"
- (selector includes: $() ifFalse:[
- "Hmm, not a Java selector..."
- ^nil.
- ].
- jm := self descriptorForJavaSelector: selector.
-
- sm := (JavaTypeBox typeBoxForSmalltalkClass: initialSearchClass) javaMessageToSmalltalk: jm.
- sm notNil ifTrue: [ ^ sm ].
-
- cls := initialSearchClass.
- [ cls notNil ] whileTrue:[
- cls selectorsAndMethodsDo: [:s :m || sm |
- sm := self descriptorForSmalltalkSelector: s.
- "find methods with same name and either static or non-static"
- ((sm name = jm name) and: [sm argSize = jm argSize]) ifTrue: [
- self error:'lookupMethod... MUST return method or nil, NOTHING else!!!!!!!!'.
- ^ sm
- returnType: jm returnType;
- yourself.
- "/^m.
- ]
- ].
- cls := cls superclass.
- ].
- ^ nil.
-
- "Created: / 06-09-2011 / 22:04:04 / Jan Kurs <kursjan@fit.cvut.cz>"
- "Modified: / 09-10-2011 / 22:59:18 / kursjan <kursjan@fit.cvut.cz>"
- "Created: / 19-11-2011 / 12:37:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmalltalkLookup methodsFor:'matching'!
-
-descriptorForJavaSelector:arg
- ^ MessageDescription new
- parserClass: JavaSelectorParser;
- selector: arg;
- yourself.
-
- "Created: / 29-08-2011 / 20:41:48 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-descriptorForSmalltalkSelector:selector
- ^ MessageDescription new
- parserClass: SmalltalkSelectorParser;
- selector: selector;
- yourself.
-
- "Created: / 28-09-2011 / 11:34:52 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SmalltalkLookup class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/SmalltalkSelectorParser.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-SelectorParser subclass:#SmalltalkSelectorParser
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Lookup'
-!
-
-!SmalltalkSelectorParser class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!SmalltalkSelectorParser methodsFor:'parsing'!
-
-parse:selector
- | pos |
- ((pos := selector indexOf: $:) > 0) ifTrue:
- [
- handler name: (selector copyTo: pos -1).
- handler addArgumentOfType: nil.
-
- [(pos := selector indexOf:$: startingAt: pos + 1) > 0] whileTrue:
- [
- handler addArgumentOfType: nil.
- ].
-
- ] ifFalse: [
- handler name: selector.
- ].
-
- "Created: / 29-08-2011 / 21:50:37 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!SmalltalkSelectorParser class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/VoidBox.st Sat Dec 03 21:02:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-JavaTypeBox subclass:#VoidBox
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Languages-Java-Types'
-!
-
-!VoidBox class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!VoidBox methodsFor:'accessing'!
-
-javaType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ #V
-
- "Created: / 31-08-2011 / 22:43:56 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-smalltalkType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- ^ #nil
-
- "Created: / 31-08-2011 / 22:44:12 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!VoidBox methodsFor:'boxing-unboxing'!
-
-box:stType
- "superclass JavaTypeBox says that I am responsible to implement this method"
-
- "we should never convert to void"
- ^ self shouldNeverBeSent
-
- "Created: / 31-08-2011 / 22:44:41 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-unbox:arg
- "lets return nil instead of void"
- ^ nil
-
- "Created: / 31-08-2011 / 22:44:57 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!VoidBox class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id$'
-! !
--- a/src/abbrev.stc Sat Dec 03 21:02:53 2011 +0000
+++ b/src/abbrev.stc Sat Dec 03 21:05:52 2011 +0000
@@ -37,12 +37,12 @@
JavaLibrariesResource JavaLibrariesResource stx:libjava 'Languages-Java-Tests' 1
JavaLocalVariableTable JavaLocalVariableTable stx:libjava 'Languages-Java-Support' 0
JavaLocalVariableTableEntry JavaLocalVariableTableEntry stx:libjava 'Languages-Java-Support' 0
-JavaLookup JavaLookup stx:libjava 'Languages-Java-Lookup' 0
+JavaLookup JavaLookup stx:libjava 'Languages-Java-Experiments-Lookup' 0
JavaMathSupport JavaMathSupport stx:libjava 'Languages-Java-Support-Native' 0
JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaNameAndType2 JavaNameAndType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaNativeMemory JavaNativeMemory stx:libjava 'Languages-Java-Support' 0
+JavaNativeMemory JavaNativeMemory stx:libjava 'Languages-Java-Support-Native' 0
JavaNode JavaNode stx:libjava 'Languages-Java-AST' 0
JavaObject JavaObject stx:libjava 'Languages-Java-Classes' 0
JavaObjectDictionary JavaObjectDictionary stx:libjava 'Languages-Java-Support' 0
@@ -59,7 +59,7 @@
JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 0
JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaSelectorParserTests JavaSelectorParserTests stx:libjava 'Languages-Java-Lookup-Tests' 1
+JavaSelectorParserTests JavaSelectorParserTests stx:libjava 'Languages-Java-Experiments-Tests' 1
JavaSlotIndexCache JavaSlotIndexCache stx:libjava 'Languages-Java-Support' 0
JavaSourceCodeCache JavaSourceCodeCache stx:libjava 'Languages-Java-Support' 1
JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
@@ -68,27 +68,27 @@
JavaTestsLoader JavaTestsLoader stx:libjava 'Languages-Java-Tests' 0
JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support' 2
-JavaTypeBox JavaTypeBox stx:libjava 'Languages-Java-Types' 0
+JavaTypeBox JavaTypeBox stx:libjava 'Languages-Java-Experiments-Types' 0
JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 1
JavaUnresolvedConstant JavaUnresolvedConstant stx:libjava 'Languages-Java-Reader-Support' 0
JavaVM JavaVM stx:libjava 'Languages-Java-Support' 0
JavaView JavaView stx:libjava 'Languages-Java-Views-Support' 2
-JavaZipSupport JavaZipSupport stx:libjava 'Languages-Java-Support' 0
-LookupIntegrationTests LookupIntegrationTests stx:libjava 'Languages-Java-Lookup-Tests' 1
-LookupIntegrationTestsResource LookupIntegrationTestsResource stx:libjava 'Languages-Java-Lookup-Tests' 3
-LookupTests LookupTests stx:libjava 'Languages-Java-Lookup-Tests' 1
-MessageDescription MessageDescription stx:libjava 'Languages-Java-Lookup' 0
-NoOpTypeBox NoOpTypeBox stx:libjava 'Languages-Java-Types' 0
+JavaZipSupport JavaZipSupport stx:libjava 'Languages-Java-Support-Native' 0
+LookupIntegrationTests LookupIntegrationTests stx:libjava 'Languages-Java-Experiments-Tests' 1
+LookupIntegrationTestsResource LookupIntegrationTestsResource stx:libjava 'Languages-Java-Experiments-Tests' 3
+LookupTests LookupTests stx:libjava 'Languages-Java-Experiments-Tests' 1
+MessageDescription MessageDescription stx:libjava 'Languages-Java-Experiments-Lookup' 0
+NoOpTypeBox NoOpTypeBox stx:libjava 'Languages-Java-Experiments-Types' 0
PPJavaNode PPJavaNode stx:libjava 'Languages-Java-AST' 0
-PersonSample PersonSample stx:libjava 'Languages-Java-Lookup-Tests' 0
-SampleHandler SampleHandler stx:libjava 'Languages-Java-Lookup-Tests' 0
-SelectorParser SelectorParser stx:libjava 'Languages-Java-Lookup' 0
-SetSample SetSample stx:libjava 'Languages-Java-Lookup-Tests' 0
+PersonSample PersonSample stx:libjava 'Languages-Java-Experiments-Tests' 0
+SampleHandler SampleHandler stx:libjava 'Languages-Java-Experiments-Tests' 0
+SelectorParser SelectorParser stx:libjava 'Languages-Java-Experiments-Lookup' 0
+SetSample SetSample stx:libjava 'Languages-Java-Experiments-Tests' 0
JavaShort JavaShort stx:libjava 'Languages-Java-Support' 0
SmalltalkAppletContext SmalltalkAppletContext stx:libjava 'Languages-Java-Views-Support' 0
SmalltalkAppletStub SmalltalkAppletStub stx:libjava 'Languages-Java-Views-Support' 0
-SmalltalkLookup SmalltalkLookup stx:libjava 'Languages-Java-Lookup' 0
-SmalltalkSelectorParserTests SmalltalkSelectorParserTests stx:libjava 'Languages-Java-Lookup-Tests' 1
+SmalltalkLookup SmalltalkLookup stx:libjava 'Languages-Java-Experiments-Lookup' 0
+SmalltalkSelectorParserTests SmalltalkSelectorParserTests stx:libjava 'Languages-Java-Experiments-Tests' 1
TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
stx_libjava stx_libjava stx:libjava '* Projects & Packages *' 3
JavaAnnotationArrayValue JavaAnnotationArrayValue stx:libjava 'Languages-Java-Reader-Support' 0
@@ -96,8 +96,8 @@
JavaAnnotationEnumValue JavaAnnotationEnumValue stx:libjava 'Languages-Java-Reader-Support' 0
JavaAnnotationNestedAnnotationValue JavaAnnotationNestedAnnotationValue stx:libjava 'Languages-Java-Reader-Support' 0
JavaAnnotationPrimitiveValue JavaAnnotationPrimitiveValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaBoolBox JavaBoolBox stx:libjava 'Languages-Java-Types' 0
-JavaBooleanBox JavaBooleanBox stx:libjava 'Languages-Java-Types' 0
+JavaBoolBox JavaBoolBox stx:libjava 'Languages-Java-Experiments-Types' 0
+JavaBooleanBox JavaBooleanBox stx:libjava 'Languages-Java-Experiments-Types' 0
JavaByteCodeDisassembler JavaByteCodeDisassembler stx:libjava 'Languages-Java-Bytecode' 0
JavaByteCodeEnumerator JavaByteCodeEnumerator stx:libjava 'Languages-Java-Support-Decompiling' 0
JavaByteCodeInterpreter JavaByteCodeInterpreter stx:libjava 'Languages-Java-Bytecode' 0
@@ -109,7 +109,7 @@
JavaFieldAnnotationContainer JavaFieldAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
JavaFieldDescriptor JavaFieldDescriptor stx:libjava 'Languages-Java-Support' 0
JavaFormalParameterNode JavaFormalParameterNode stx:libjava 'Languages-Java-AST' 0
-JavaIntegerBox JavaIntegerBox stx:libjava 'Languages-Java-Types' 0
+JavaIntegerBox JavaIntegerBox stx:libjava 'Languages-Java-Experiments-Types' 0
JavaInvalidRefError JavaInvalidRefError stx:libjava 'Languages-Java-Support' 1
JavaMethodAnnotationContainer JavaMethodAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
JavaMethodDeclarationNode JavaMethodDeclarationNode stx:libjava 'Languages-Java-AST' 0
@@ -118,17 +118,17 @@
JavaMethodNode JavaMethodNode stx:libjava 'Languages-Java-AST' 0
JavaMethodWithException JavaMethodWithException stx:libjava 'Languages-Java-Classes' 0
JavaParser JavaParser stx:libjava 'Languages-Java-Parser' 0
-JavaSelectorParser JavaSelectorParser stx:libjava 'Languages-Java-Lookup' 0
-JavaStringBox JavaStringBox stx:libjava 'Languages-Java-Types' 0
+JavaSelectorParser JavaSelectorParser stx:libjava 'Languages-Java-Experiments-Lookup' 0
+JavaStringBox JavaStringBox stx:libjava 'Languages-Java-Experiments-Types' 0
JavaStringRef2 JavaStringRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
JavaTypeNode JavaTypeNode stx:libjava 'Languages-Java-AST' 0
JavaUnhandledExceptionError JavaUnhandledExceptionError stx:libjava 'Languages-Java-Support' 1
JavaUnresolvedClassConstant JavaUnresolvedClassConstant stx:libjava 'Languages-Java-Reader-Support' 0
JavaUnresolvedStringConstant JavaUnresolvedStringConstant stx:libjava 'Languages-Java-Reader-Support' 0
JavadocDeclarationNode JavadocDeclarationNode stx:libjava 'Languages-Java-AST' 0
-SetBox SetBox stx:libjava 'Languages-Java-Types' 0
-SmalltalkSelectorParser SmalltalkSelectorParser stx:libjava 'Languages-Java-Lookup' 0
-VoidBox VoidBox stx:libjava 'Languages-Java-Types' 0
+SetBox SetBox stx:libjava 'Languages-Java-Experiments-Types' 0
+SmalltalkSelectorParser SmalltalkSelectorParser stx:libjava 'Languages-Java-Experiments-Lookup' 0
+VoidBox VoidBox stx:libjava 'Languages-Java-Experiments-Types' 0
JavaArrayTypeNode JavaArrayTypeNode stx:libjava 'Languages-Java-AST' 0
JavaBooleanTypeNode JavaBooleanTypeNode stx:libjava 'Languages-Java-AST' 0
JavaBothOldAndNewClassRef JavaBothOldAndNewClassRef stx:libjava 'Languages-Java-Reader-Support-new' 0
@@ -153,4 +153,4 @@
JavaMonitor JavaMonitor stx:libjava 'Languages-Java-Support' 0
JavaMonitorsTests JavaMonitorsTests stx:libjava 'Languages-Java-Tests-Synchronization' 1
MPXJTests MPXJTests stx:libjava 'Languages-Java-Tests-Libraries' 1
-JavaMethodWrapperCompiler JavaMethodWrapperCompiler stx:libjava 'Languages-Java-Lookup' 0
+JavaMethodWrapperCompiler JavaMethodWrapperCompiler stx:libjava 'Languages-Java-Experiments-Lookup' 0
--- a/src/bc.mak Sat Dec 03 21:02:53 2011 +0000
+++ b/src/bc.mak Sat Dec 03 21:05:52 2011 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-11-27 23:54:33.932.
+# automagically generated from the projectDefinition: stx_libjava at 2011-12-03 22:08:12.232.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -33,7 +33,7 @@
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\squeak\petitparser -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libwidg2 -I$(INCLUDE_TOP)\stx\libbasic3
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\squeak\petitparser -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libwidg2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libjava\experiments
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -156,8 +156,8 @@
$(OUTDIR)JavaAnnotationNestedAnnotationValue.$(O) JavaAnnotationNestedAnnotationValue.$(H): JavaAnnotationNestedAnnotationValue.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaAnnotationPrimitiveValue.$(O) JavaAnnotationPrimitiveValue.$(H): JavaAnnotationPrimitiveValue.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaBehavior.$(O) JavaBehavior.$(H): JavaBehavior.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaBoolBox.$(O) JavaBoolBox.$(H): JavaBoolBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaBooleanBox.$(O) JavaBooleanBox.$(H): JavaBooleanBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaBoolBox.$(O) JavaBoolBox.$(H): JavaBoolBox.st $(INCLUDE_TOP)\stx\libjava\experiments\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaBooleanBox.$(O) JavaBooleanBox.$(H): JavaBooleanBox.st $(INCLUDE_TOP)\stx\libjava\experiments\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaByteCodeDisassembler.$(O) JavaByteCodeDisassembler.$(H): JavaByteCodeDisassembler.st $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaByteCodeEnumerator.$(O) JavaByteCodeEnumerator.$(H): JavaByteCodeEnumerator.st $(INCLUDE_TOP)\stx\libjava\JavaDecompiler.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaByteCodeInterpreter.$(O) JavaByteCodeInterpreter.$(H): JavaByteCodeInterpreter.st $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -169,7 +169,7 @@
$(OUTDIR)JavaFieldAnnotationContainer.$(O) JavaFieldAnnotationContainer.$(H): JavaFieldAnnotationContainer.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaFieldDescriptor.$(O) JavaFieldDescriptor.$(H): JavaFieldDescriptor.st $(INCLUDE_TOP)\stx\libjava\JavaDescriptor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaFormalParameterNode.$(O) JavaFormalParameterNode.$(H): JavaFormalParameterNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaIntegerBox.$(O) JavaIntegerBox.$(H): JavaIntegerBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaIntegerBox.$(O) JavaIntegerBox.$(H): JavaIntegerBox.st $(INCLUDE_TOP)\stx\libjava\experiments\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaInvalidRefError.$(O) JavaInvalidRefError.$(H): JavaInvalidRefError.st $(INCLUDE_TOP)\stx\libjava\JavaError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethod.$(O) JavaMethod.$(H): JavaMethod.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodAnnotationContainer.$(O) JavaMethodAnnotationContainer.$(H): JavaMethodAnnotationContainer.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -178,9 +178,9 @@
$(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)\stx\libjava\JavaDescriptor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodWrapperCompiler.$(O) JavaMethodWrapperCompiler.$(H): JavaMethodWrapperCompiler.st $(INCLUDE_TOP)\stx\libjava\Java.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(STCHDR)
-$(OUTDIR)JavaSelectorParser.$(O) JavaSelectorParser.$(H): JavaSelectorParser.st $(INCLUDE_TOP)\stx\libjava\SelectorParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaStringBox.$(O) JavaStringBox.$(H): JavaStringBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaSelectorParser.$(O) JavaSelectorParser.$(H): JavaSelectorParser.st $(INCLUDE_TOP)\stx\libjava\experiments\SelectorParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaStringBox.$(O) JavaStringBox.$(H): JavaStringBox.st $(INCLUDE_TOP)\stx\libjava\experiments\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)\stx\libjava\JavaError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -188,9 +188,9 @@
$(OUTDIR)JavaUnresolvedStringConstant.$(O) JavaUnresolvedStringConstant.$(H): JavaUnresolvedStringConstant.st $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaVM.$(O) JavaVM.$(H): JavaVM.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavadocDeclarationNode.$(O) JavadocDeclarationNode.$(H): JavadocDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SetBox.$(O) SetBox.$(H): SetBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmalltalkSelectorParser.$(O) SmalltalkSelectorParser.$(H): SmalltalkSelectorParser.st $(INCLUDE_TOP)\stx\libjava\SelectorParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)VoidBox.$(O) VoidBox.$(H): VoidBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SetBox.$(O) SetBox.$(H): SetBox.st $(INCLUDE_TOP)\stx\libjava\experiments\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmalltalkSelectorParser.$(O) SmalltalkSelectorParser.$(H): SmalltalkSelectorParser.st $(INCLUDE_TOP)\stx\libjava\experiments\SelectorParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)VoidBox.$(O) VoidBox.$(H): VoidBox.st $(INCLUDE_TOP)\stx\libjava\experiments\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaArrayTypeNode.$(O) JavaArrayTypeNode.$(H): JavaArrayTypeNode.st $(INCLUDE_TOP)\stx\libjava\JavaTypeNode.$(H) $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaBooleanTypeNode.$(O) JavaBooleanTypeNode.$(H): JavaBooleanTypeNode.st $(INCLUDE_TOP)\stx\libjava\JavaTypeNode.$(H) $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaBothOldAndNewClassRef.$(O) JavaBothOldAndNewClassRef.$(H): JavaBothOldAndNewClassRef.st $(INCLUDE_TOP)\stx\libjava\JavaClassRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -209,7 +209,6 @@
$(OUTDIR)JavaInterfaceMethodRef2.$(O) JavaInterfaceMethodRef2.$(H): JavaInterfaceMethodRef2.st $(INCLUDE_TOP)\stx\libjava\JavaMethodRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaClassContentRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaMethodWithHandler.$(O) JavaMethodWithHandler.$(H): JavaMethodWithHandler.st $(INCLUDE_TOP)\stx\libjava\JavaMethodWithException.$(H) $(INCLUDE_TOP)\stx\libjava\JavaMethod.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaNativeMethod.$(O) JavaNativeMethod.$(H): JavaNativeMethod.st $(INCLUDE_TOP)\stx\libjava\JavaMethodWithHandler.$(H) $(INCLUDE_TOP)\stx\libjava\JavaMethodWithException.$(H) $(INCLUDE_TOP)\stx\libjava\JavaMethod.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic2\BooleanArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\BitArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic2\ZipArchive.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\DoubleArray.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractNumberVector.$(H) $(INCLUDE_TOP)\stx\libbasic\Float.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\FloatArray.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\LargeInteger.$(H) $(INCLUDE_TOP)\stx\libbasic\ShortFloat.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedLongIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic2\WordArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Process.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic2\BooleanArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\BitArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic2\ZipArchive.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\DoubleArray.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractNumberVector.$(H) $(INCLUDE_TOP)\stx\libbasic\Float.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\FloatArray.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\LargeInteger.$(H) $(INCLUDE_TOP)\stx\libbasic\ShortFloat.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedLongIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic2\WordArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Process.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Delay.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
-
--- a/src/extensions.st Sat Dec 03 21:02:53 2011 +0000
+++ b/src/extensions.st Sat Dec 03 21:05:52 2011 +0000
@@ -122,47 +122,36 @@
! !
!Class methodsFor:'method lookup'!
-box: sObj toType: type
- ^ (JavaTypeBox typeBoxForJava: type) box: sObj.
+perform:aMessage onReceiver:receiver from:sender ifNotFound:aBlock
+ | method selector class args retval|
+ selector := aMessage selector.
+ args := aMessage arguments.
+ class := receiver class.
- "Created: / 06-09-2011 / 22:12:59 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-!Class methodsFor:'method lookup'!
-
-perform:aMessage onReceiver:receiver from:sender ifNotFound:aBlock
- | method selector class args retval|
- selector := aMessage selector.
- args := aMessage arguments.
- class := receiver class.
+ SmalltalkLookup isNil ifTrue:[
+ (Smalltalk loadPackage: 'stx:libjava/experiments') ifFalse:[
+ self error: 'You should load package stx:libjava/experiments if you want some interop - still experimental' mayProceed: true.
+ ^nil
+ ]
+ ].
- method := SmalltalkLookup instance lookupMethodForSelector: selector
- directedTo: class
- for: receiver
- withArguments: args
- from: sender
- ilc: nil.
+ method := SmalltalkLookup instance lookupMethodForSelector: selector
+ directedTo: class
+ for: receiver
+ withArguments: args
+ from: sender
+ ilc: nil.
- method ifNotNil:
- [ | unboxedArgs |
- unboxedArgs := self unbox: args to: method argTypes.
- retval := receiver perform: method selector withArguments: unboxedArgs.
- ^ self box: retval toType: method returnType.
- ].
- ^ aBlock value.
+ method ifNotNil:
+ [ | unboxedArgs |
+ unboxedArgs := self unbox: args to: method argTypes.
+ retval := receiver perform: method selector withArguments: unboxedArgs.
+ ^ self box: retval toType: method returnType.
+ ].
+ ^ aBlock value.
"Created: / 28-09-2011 / 11:31:33 / Jan Kurs <kursjan@fit.cvut.cz>"
- "Modified: / 19-11-2011 / 12:38:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-!Class methodsFor:'method lookup'!
-
-unbox: javaArgumentsCollection to: typesCollection
- " box smalltalk arguments collection to Java arguments "
-"/ ^ stArgumentsCollection with: typesCollection collect: [ :stObject :javaType |
-"/ (JavaTypeBox javaTypeAt: javaType) box: stObject.
-"/ ]
- ^ javaArgumentsCollection.
-
- "Created: / 25-09-2011 / 20:22:59 / Jan Kurs <kursjan@fit.cvut.cz>"
+ "Modified: / 03-12-2011 / 21:37:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!Delay methodsFor:'delaying'!
--- a/src/libjava.rc Sat Dec 03 21:02:53 2011 +0000
+++ b/src/libjava.rc Sat Dec 03 21:05:52 2011 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,1520,1520
+ FILEVERSION 6,2,1559,1559
PRODUCTVERSION 6,2,1,1
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.2.1520.1520\0"
+ VALUE "FileVersion", "6.2.1559.1559\0"
VALUE "InternalName", "stx:libjava\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\b SWING Research Group, Czech Technical University In Prague\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.1.1\0"
- VALUE "ProductDate", "Sun, 27 Nov 2011 22:55:02 GMT\0"
+ VALUE "ProductDate", "Sat, 03 Dec 2011 21:08:34 GMT\0"
END
END