Fixes in INSTANCE_OF + added missing method. SAXON-B now works again jk_new_structure
authorvranyj1
Fri, 24 Feb 2012 17:57:26 +0000
branchjk_new_structure
changeset 1384 d62dd4b29c22
parent 1383 2be65ff08ca5
child 1385 3426388640da
Fixes in INSTANCE_OF + added missing method. SAXON-B now works again
src/JavaMethod.st
src/JavaVM.st
src/extensions.st
src/stx_libjava.st
--- a/src/JavaMethod.st	Fri Feb 24 13:46:31 2012 +0000
+++ b/src/JavaMethod.st	Fri Feb 24 17:57:26 2012 +0000
@@ -760,6 +760,13 @@
 
 !JavaMethod methodsFor:'* As yet uncategorized *'!
 
+annotationIndexOf:aSymbol
+
+    ^nil
+
+    "Created: / 24-02-2012 / 16:06:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 sends:symbol1 or:symbol2
 
     ^false
--- a/src/JavaVM.st	Fri Feb 24 13:46:31 2012 +0000
+++ b/src/JavaVM.st	Fri Feb 24 17:57:26 2012 +0000
@@ -2952,7 +2952,7 @@
      "
      - If T is a class type, then T must be Object.
     "
-    t isJavaClassType ifTrue: [ ^ (sc == t) or: [t == (self classForName: 'java.lang.Object') ]].
+    t isJavaClassType ifTrue: [ ^ t == (self classForName: 'java.lang.Object') ].
      "
      - If T is an array type TC[], that is, an array of components of type TC ,
      then one of the following must be true:
@@ -2977,7 +2977,7 @@
     "Modified: / 09-01-1999 / 00:45:21 / cg"
     "Created: / 11-02-2011 / 08:21:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 21-10-2011 / 13:50:36 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-12-2011 / 20:49:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 24-02-2012 / 16:34:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 invoke: method receiver: obj arguments: args
--- a/src/extensions.st	Fri Feb 24 13:46:31 2012 +0000
+++ b/src/extensions.st	Fri Feb 24 17:57:26 2012 +0000
@@ -1233,6 +1233,43 @@
     "Modified: / 25-02-2011 / 19:03:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!SignedWordArray class methodsFor:'queries'!
+
+isJavaArrayClass
+
+    ^true
+
+    "Created: / 20-12-2010 / 22:47:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SignedWordArray class methodsFor:'queries'!
+
+isJavaReferenceType
+
+    "Java arrays are reference types"
+    ^true
+
+    "Created: / 20-12-2010 / 22:30:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SignedWordArray class methodsFor:'accessing'!
+
+javaComponentClass
+
+    ^JavaShort
+
+    "Modified: / 24-02-2012 / 17:46:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SignedWordArray class methodsFor:'accessing'!
+
+javaName
+
+    ^'[S'.
+
+    "Modified: / 24-02-2012 / 17:46:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !SmallInteger methodsFor:'autoboxing'!
 
 javaUnwrapFrom: javaType
--- a/src/stx_libjava.st	Fri Feb 24 13:46:31 2012 +0000
+++ b/src/stx_libjava.st	Fri Feb 24 17:57:26 2012 +0000
@@ -159,17 +159,17 @@
 
     ^ #(
         #'squeak:petitparser'    "PPCompositeParser - superclass of JavaPetitParser "
-        #'stx:goodies/sunit'    "TestCase - superclass of JavaByteCodeProcessorTests "
-        #'stx:libbasic'    "UninterpretedBytes - superclass of extended String "
-        #'stx:libbasic2'    "UnboxedIntegerArray - superclass of extended WordArray "
-        #'stx:libbasic3'    "WrappedMethod - extended "
-        #'stx:libcomp'    "SelfNode - referenced by ProxyMethodMethodInvocationNode>>generate: "
+        #'stx:goodies/sunit'    "TestSuite - referenced by stx_libjava class>>testSuite "
+        #'stx:libbasic'    "ArrayedCollection - superclass of JavaArray "
+        #'stx:libbasic2'    "BitArray - superclass of extended BooleanArray "
+        #'stx:libbasic3'    "MessageTracer - referenced by JavaMethod>>setBreakPoint "
+        #'stx:libcomp'    "ConstantNode - referenced by ProxyMethodCompiler>>argsArray "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
         #'stx:libtool'    "WorkspaceApplication - referenced by GroovyEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
-        #'stx:libview'    "PopUpView - superclass of JavaPopUpView "
-        #'stx:libview2'    "GIFReader - referenced by JavaVM class>>_GifImageDecoder_parseImage: "
-        #'stx:libwidg'    "Button - referenced by JavaVM class>>_WButtonPeer_create: "
-        #'stx:libwidg2'    "ComboBoxView - referenced by JavaVM class>>processEvent: "
+        #'stx:libview'    "SimpleView - superclass of JavaPopUpView "
+        #'stx:libview2'    "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
+        #'stx:libwidg'    "FileSelectionBox - referenced by Java class>>javaProcessForMainOf:argumentString: "
+        #'stx:libwidg2'    "MenuPanel - referenced by JavaVM class>>processEvent: "
     )
 ! !
 
@@ -430,7 +430,6 @@
         CharacterArray asSlashedJavaClassName
         CharacterArray isJavaArrayDescriptor
         CharacterArray isJavaPrimitiveTypeDescriptor
-        Class perform:onReceiver:from:ifNotFound:
         Delay waitWithState:
         Object isJavaArray
         Object isJavaNameAndType
@@ -488,18 +487,6 @@
         'FloatArray class' isJavaReferenceType
         'FloatArray class' javaComponentClass
         'FloatArray class' javaName
-        'GenericToolbarIconLibrary class' javaClassBrowserIcon
-        'GenericToolbarIconLibrary class' javaExceptionBrowserIcon
-        'GenericToolbarIconLibrary class' javaPrivateClassBrowserIcon
-        'GenericToolbarIconLibrary class' javaPrivateEnumBrowserIcon
-        'GenericToolbarIconLibrary class' javaPrivateInterfaceBrowserIcon
-        'GenericToolbarIconLibrary class' javaProtectedClassBrowserIcon
-        'GenericToolbarIconLibrary class' javaProtectedEnumBrowserIcon
-        'GenericToolbarIconLibrary class' javaProtectedInterfaceBrowserIcon
-        'GenericToolbarIconLibrary class' javaPublicClassBrowserIcon
-        'GenericToolbarIconLibrary class' javaPublicEnumBrowserIcon
-        'GenericToolbarIconLibrary class' javaPublicInterfaceBrowserIcon
-        'GenericToolbarIconLibrary class' javaRuntimeExceptionBrowserIcon
         'Integer class' isJavaPrimitiveType
         'Integer class' javaArrayClass
         'Integer class' javaBox:
@@ -555,7 +542,13 @@
         Object isGroovyClass
         'ConfigurableFeatures class' hasJavaSupport
         Behavior isInterface
+        'SignedWordArray class' isJavaArrayClass
+        'SignedWordArray class' isJavaReferenceType
+        'SignedWordArray class' javaComponentClass
+        'SignedWordArray class' javaName
     )
+
+    "Modified: / 24-02-2012 / 17:56:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !stx_libjava class methodsFor:'description - java'!
@@ -633,7 +626,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'1731'"$"
+    ^ "$SVN-Revision:"1737M"$"
 ! !
 
 !stx_libjava class methodsFor:'file generation'!