--- a/Java.st Thu May 02 15:18:31 1996 +0000
+++ b/Java.st Thu May 02 15:20:07 1996 +0000
@@ -10,13 +10,17 @@
allClasses
^ Classes
+!
+
+classNamed:aString
+ ^ self at:aString
! !
!Java class methodsFor:'registering java classes'!
at:aJavaName
Classes isNil ifTrue:[^ nil].
- ^ Classes at:aJavaName asSymbol ifAbsent:nil
+ ^ Classes at:(aJavaName asSymbol) ifAbsent:nil
"Created: 17.4.1996 / 23:29:46 / cg"
"Modified: 18.4.1996 / 00:45:33 / cg"
@@ -26,7 +30,7 @@
Classes isNil ifTrue:[
Classes := IdentityDictionary new.
].
- Classes at:aJavaName asSymbol put:aJavaClass.
+ Classes at:(aJavaName asSymbol) put:aJavaClass.
UnresolvedClassRefs notNil ifTrue:[
UnresolvedClassRefs do:[:toResolve |
@@ -62,5 +66,5 @@
!Java class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.4 1996/04/30 23:24:33 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.5 1996/05/02 15:19:44 cg Exp $'
! !
--- a/JavaClassReader.st Thu May 02 15:18:31 1996 +0000
+++ b/JavaClassReader.st Thu May 02 15:20:07 1996 +0000
@@ -74,7 +74,7 @@
javaClass := self readFile:aFilename.
javaClass notNil ifTrue:[
- Java at:javaClass fullName asSymbol put:javaClass.
+ Java at:(javaClass fullName asSymbol) put:javaClass.
javaClass resolveClassRefs.
@@ -231,7 +231,7 @@
super_class := nil
] ifFalse:[
super_class := constants at:super_class_index.
- existingSuperClass := Java at:super_class fullName.
+ existingSuperClass := Java classNamed:super_class fullName.
existingSuperClass notNil ifTrue:[
super_class := existingSuperClass
].
@@ -1011,6 +1011,6 @@
!JavaClassReader class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClassReader.st,v 1.10 1996/05/01 16:22:12 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClassReader.st,v 1.11 1996/05/02 15:20:07 cg Exp $'
! !
JavaClassReader initialize!
--- a/JavaContext.st Thu May 02 15:18:31 1996 +0000
+++ b/JavaContext.st Thu May 02 15:20:07 1996 +0000
@@ -1,5 +1,5 @@
Object subclass:#JavaContext
- instanceVariableNames:'method class sender stack frameBase'
+ instanceVariableNames:'method class sender stack frameBase pc'
classVariableNames:''
poolDictionaries:''
category:'Java-Support'
@@ -32,7 +32,7 @@
!
lineNumber
- ^ 0
+ ^ method lineNumberForPC:pc
"Created: 1.5.1996 / 15:05:47 / cg"
!
@@ -68,8 +68,8 @@
"Modified: 1.5.1996 / 17:43:17 / cg"
!
-selector
- ^ method signatureName
+selector
+ ^ (method name , method signature) asSymbol "/ signatureName
"Created: 1.5.1996 / 15:03:03 / cg"
! !
@@ -94,11 +94,19 @@
"Modified: 1.5.1996 / 15:00:47 / cg"
!
+pc
+ ^ pc
+!
+
sender
^ sender.
"Modified: 1.5.1996 / 15:00:47 / cg"
"Created: 1.5.1996 / 15:01:18 / cg"
+!
+
+setPC:anInteger
+ pc := anInteger
! !
!JavaContext methodsFor:'printing & storing'!
@@ -121,5 +129,5 @@
!JavaContext class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaContext.st,v 1.1 1996/05/01 16:22:02 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaContext.st,v 1.2 1996/05/02 15:20:02 cg Exp $'
! !
--- a/JavaDecompiler.st Thu May 02 15:18:31 1996 +0000
+++ b/JavaDecompiler.st Thu May 02 15:20:07 1996 +0000
@@ -221,7 +221,7 @@
(anewarray constIndexShort) "/ 189
(arraylength) "/ 190
- (athrough) "/ 191
+ (athrow) "/ 191
(checkcast constIndexShort) "/ 192
(instanceof constIndexShort) "/ 193
(monitorenter) "/ 194
@@ -612,6 +612,6 @@
!JavaDecompiler class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.7 1996/04/30 23:24:29 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.8 1996/05/02 15:19:57 cg Exp $'
! !
JavaDecompiler initialize!
--- a/JavaUnresolvedClassConstant.st Thu May 02 15:18:31 1996 +0000
+++ b/JavaUnresolvedClassConstant.st Thu May 02 15:20:07 1996 +0000
@@ -29,7 +29,7 @@
!JavaUnresolvedClassConstant methodsFor:'resolving'!
resolve
- ^ Java at:fullName.
+ ^ Java classNamed:fullName.
"Created: 15.4.1996 / 15:51:42 / cg"
"Modified: 15.4.1996 / 16:26:05 / cg"
@@ -40,7 +40,7 @@
fullName := self class resolve:(aConstantTable at:index) from:aConstantTable.
- cls := Java at:fullName.
+ cls := Java classNamed:fullName.
cls notNil ifTrue:[
^ cls
].
@@ -55,5 +55,5 @@
!JavaUnresolvedClassConstant class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaUnresolvedClassConstant.st,v 1.5 1996/04/17 22:50:46 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaUnresolvedClassConstant.st,v 1.6 1996/05/02 15:19:02 cg Exp $'
! !