Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorcg
Thu, 27 Jun 1996 18:38:57 +0000
changeset 87 e9d58a151a63
parent 86 3090f19a5be1
child 88 8b66ed9a9a5d
*** empty log message ***
JavaFieldref.st file | annotate | diff | comparison | revisions
JavaMethodref.st file | annotate | diff | comparison | revisions
JavaRef.st file | annotate | diff | comparison | revisions 
--- a/JavaFieldref.st	Thu Jun 27 16:31:19 1996 +0000
+++ b/JavaFieldref.st	Thu Jun 27 18:38:57 1996 +0000
@@ -9,6 +9,9 @@
 !JavaFieldref methodsFor:'printing & storing'!
 
 displayString
+    class isNil ifTrue:[
+        ^ 'JavaFieldRef ( ** unknown class ** ''' , nameandType displayString , ''')'
+    ].
     ^ 'JavaFieldRef (' , class fullName , ' ' 
                         , '''' , nameandType name , '''' , nameandType signature , ')'
 ! !
@@ -28,15 +31,18 @@
 !
 
 offset
-    |nm sig|
+    |nm sig cls|
 
     offset notNil ifTrue:[^ offset].
 
     (class isMemberOf:JavaUnresolvedClassConstant) ifTrue:[
-        class := class resolve
+        cls := class resolve.
+        cls notNil ifTrue:[
+            class := cls
+        ].
     ].
     (class isMemberOf:JavaUnresolvedClassConstant) ifTrue:[
-        self halt.
+        self halt:'unresolved class'.
     ].
 
     nm := nameandType name asSymbol.
@@ -48,15 +54,18 @@
 !
 
 staticOffset
-    |nm sig mthd|
+    |nm sig mthd cls|
 
     offset notNil ifTrue:[^ offset].
 
     (class isMemberOf:JavaUnresolvedClassConstant) ifTrue:[
-        class := class resolve
+        cls := class resolve.
+        cls notNil ifTrue:[
+            class := cls
+        ]
     ].
     (class isMemberOf:JavaUnresolvedClassConstant) ifTrue:[
-        self halt.
+        self halt:'unresolved class'.
     ].
 
     nm := nameandType name asSymbol.
@@ -67,15 +76,18 @@
 !
 
 type
-    |sig|
+    |sig cls|
 
     type notNil ifTrue:[^ type].
 
     (class isMemberOf:JavaUnresolvedClassConstant) ifTrue:[
-        class := class resolve
+        cls := class resolve.
+        cls notNil ifTrue:[
+            class := cls
+        ]
     ].
     (class isMemberOf:JavaUnresolvedClassConstant) ifTrue:[
-        self halt.
+        self halt:'unresolved class'.
     ].
 
     sig := nameandType signature.
@@ -87,5 +99,5 @@
 !JavaFieldref  class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaFieldref.st,v 1.10 1996/06/27 14:24:23 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaFieldref.st,v 1.11 1996/06/27 18:38:11 cg Exp $'
 ! !
--- a/JavaMethodref.st	Thu Jun 27 16:31:19 1996 +0000
+++ b/JavaMethodref.st	Thu Jun 27 18:38:57 1996 +0000
@@ -33,15 +33,18 @@
 !JavaMethodref methodsFor:'resolving'!
 
 method
-    |nm sig mthd|
+    |nm sig mthd cls|
 
     method notNil ifTrue:[^ method].
 
     (class isMemberOf:JavaUnresolvedClassConstant) ifTrue:[
-        class := class resolve
+        cls := class resolve.
+        cls notNil ifTrue:[
+            class := cls
+        ]
     ].
     (class isMemberOf:JavaUnresolvedClassConstant) ifTrue:[
-        self halt.
+        self halt:'unresolved class'.
     ].
 
     sel isNil ifTrue:[
@@ -70,7 +73,7 @@
         cls := cls resolve
     ].
     (cls isMemberOf:JavaUnresolvedClassConstant) ifTrue:[
-        self halt.
+        self halt:'unresolved class'.
     ].
 
     sel isNil ifTrue:[
@@ -92,5 +95,5 @@
 !JavaMethodref  class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaMethodref.st,v 1.10 1996/06/25 19:56:26 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaMethodref.st,v 1.11 1996/06/27 18:38:57 cg Exp $'
 ! !
--- a/JavaRef.st	Thu Jun 27 16:31:19 1996 +0000
+++ b/JavaRef.st	Thu Jun 27 18:38:57 1996 +0000
@@ -6,7 +6,7 @@
 !
 
 
-!JavaRef class methodsFor:'instance creation'!
+!JavaRef  class methodsFor:'instance creation'!
 
 class:aJavaClass nameandType:nameAndType
     ^ self new class:aJavaClass nameandType:nameAndType
@@ -18,7 +18,9 @@
 
 class:aJavaClass nameandType:aJavanameAndType
      class := aJavaClass.
-     nameandType := aJavanameAndType
+     nameandType := aJavanameAndType.
+class isNil ifTrue:[self halt].
+
 
     "Modified: 15.4.1996 / 16:08:39 / cg"
     "Created: 15.4.1996 / 16:10:37 / cg"
@@ -36,8 +38,8 @@
     "Created: 15.4.1996 / 16:18:54 / cg"
 ! !
 
-!JavaRef class methodsFor:'documentation'!
+!JavaRef  class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaRef.st,v 1.5 1996/05/03 18:55:38 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaRef.st,v 1.6 1996/06/27 18:38:27 cg Exp $'
 ! !
hg/stx-libjava