--- a/JavaClassReader.st Thu May 16 14:52:21 1996 +0000
+++ b/JavaClassReader.st Sat Jun 01 14:25:51 1996 +0000
@@ -270,9 +270,9 @@
^ nil
].
msb := false.
- Verbose ifTrue:[Transcript showCr:'file is lsb'].
+ Verbose ifTrue:[Transcript showCR:'file is lsb'].
] ifTrue:[
- Verbose ifTrue:[Transcript showCr:'file is msb'].
+ Verbose ifTrue:[Transcript showCR:'file is msb'].
].
"/
@@ -285,7 +285,7 @@
Verbose ifTrue:[Transcript show:'version = ';
show:(majorVsn printString);
show:'.';
- showCr:(minorVsn printString)].
+ showCR:(minorVsn printString)].
"/
"/ get constant pool
@@ -391,7 +391,7 @@
aJavaClass setSourceFile:sourceFile.
- Verbose ifTrue:[Transcript show:'sourceFile: '; showCr:sourceFile].
+ Verbose ifTrue:[Transcript show:'sourceFile: '; showCR:sourceFile].
^ true
"
@@ -456,7 +456,7 @@
readAttributeFor:something
|attribute_name_index attribute_name attribute_length attribute_info|
- Verbose ifTrue:[Transcript show:'attrib at pos: '; showCr:inStream position].
+ Verbose ifTrue:[Transcript show:'attrib at pos: '; showCR:inStream position].
attribute_name_index := self nextU2.
@@ -471,14 +471,14 @@
attribute_name := constants at:attribute_name_index.
- Verbose ifTrue:[Transcript show:'attrib name: '; showCr:attribute_name].
+ Verbose ifTrue:[Transcript show:'attrib name: '; showCR:attribute_name].
(self readAttribute:attribute_name for:something) ifFalse:[
attribute_length := self nextU4.
attribute_info := ByteArray new:(attribute_length).
inStream nextBytes:attribute_length into:attribute_info startingAt:1.
- Verbose ifTrue:[Transcript show:'skipped '; show:attribute_name; showCr:'-attribute'].
+ Verbose ifTrue:[Transcript show:'skipped '; show:attribute_name; showCR:'-attribute'].
].
"
@@ -514,7 +514,7 @@
"/ get tag
"/
tag := self nextU1.
- Verbose ifTrue:[Transcript show:'tag = '; showCr:tag].
+ Verbose ifTrue:[Transcript show:'tag = '; showCR:tag].
constReader := #(
readConstant_Asciz "/ 1
@@ -548,13 +548,13 @@
"/ get constant pool
"/
constantPoolCount := self nextU2.
- Verbose ifTrue:[Transcript show:'constantPoolCount = '; showCr:constantPoolCount].
+ Verbose ifTrue:[Transcript show:'constantPoolCount = '; showCR:constantPoolCount].
constants := Array new:constantPoolCount-1.
constSlot := 1.
[constSlot < constantPoolCount] whileTrue:[
- Verbose ifTrue:[Transcript show:'const: '; showCr:constSlot].
+ Verbose ifTrue:[Transcript show:'const: '; showCR:constSlot].
const := self readConstant.
constants at:constSlot put:const.
constNeeds2Slots ifTrue:[
@@ -590,7 +590,7 @@
string := String new:len.
inStream nextBytes:len into:string startingAt:1.
- Verbose ifTrue:[Transcript show:'asciz; string= '; showCr:string].
+ Verbose ifTrue:[Transcript show:'asciz; string= '; showCR:string].
^ string
@@ -608,7 +608,7 @@
name_index := self nextU2.
- Verbose ifTrue:[Transcript show:'class; index= '; showCr:name_index].
+ Verbose ifTrue:[Transcript show:'class; index= '; showCR:name_index].
name := constants at:name_index.
name notNil ifTrue:[
@@ -656,7 +656,7 @@
constNeeds2Slots := true.
- Verbose ifTrue:[Transcript show:'double; value= '; showCr:aFloat].
+ Verbose ifTrue:[Transcript show:'double; value= '; showCR:aFloat].
^ aFloat
"
@@ -674,8 +674,8 @@
class_index := self nextU2.
name_and_type_index := self nextU2.
- Verbose ifTrue:[Transcript show:'fieldref; classindex= '; showCr:class_index].
- Verbose ifTrue:[Transcript show:'fieldref; name&typeindex= '; showCr:name_and_type_index].
+ Verbose ifTrue:[Transcript show:'fieldref; classindex= '; showCR:class_index].
+ Verbose ifTrue:[Transcript show:'fieldref; name&typeindex= '; showCR:name_and_type_index].
^ JavaUnresolvedFieldrefConstant
classIndex:class_index
@@ -707,7 +707,7 @@
aFloat basicAt:4 put:((high bitShift:-24) bitAnd:16rFF).
].
- Verbose ifTrue:[Transcript show:'float; value= '; showCr:aFloat].
+ Verbose ifTrue:[Transcript show:'float; value= '; showCR:aFloat].
^ aFloat
"
@@ -724,7 +724,7 @@
value := self nextS4.
- Verbose ifTrue:[Transcript show:'integer; value= '; showCr:value].
+ Verbose ifTrue:[Transcript show:'integer; value= '; showCR:value].
^ value
@@ -743,8 +743,8 @@
class_index := self nextU2.
name_and_type_index := self nextU2.
- Verbose ifTrue:[Transcript show:'methodref; classindex= '; showCr:class_index].
- Verbose ifTrue:[Transcript show:'methodref; name&typeindex= '; showCr:name_and_type_index].
+ Verbose ifTrue:[Transcript show:'methodref; classindex= '; showCR:class_index].
+ Verbose ifTrue:[Transcript show:'methodref; name&typeindex= '; showCR:name_and_type_index].
^ JavaUnresolvedInterfaceMethodrefConstant
classIndex:class_index
@@ -770,7 +770,7 @@
].
constNeeds2Slots := true.
- Verbose ifTrue:[Transcript show:'long; value= '; showCr:value].
+ Verbose ifTrue:[Transcript show:'long; value= '; showCR:value].
^ value
"
@@ -788,8 +788,8 @@
class_index := self nextU2.
name_and_type_index := self nextU2.
- Verbose ifTrue:[Transcript show:'methodref; classindex= '; showCr:class_index].
- Verbose ifTrue:[Transcript show:'methodref; name&typeindex= '; showCr:name_and_type_index].
+ Verbose ifTrue:[Transcript show:'methodref; classindex= '; showCR:class_index].
+ Verbose ifTrue:[Transcript show:'methodref; name&typeindex= '; showCR:name_and_type_index].
^ JavaUnresolvedMethodrefConstant
classIndex:class_index
@@ -809,8 +809,8 @@
name_index := self nextU2.
signature_index := self nextU2.
- Verbose ifTrue:[Transcript show:'methodref; nameindex= '; showCr:name_index].
- Verbose ifTrue:[Transcript show:'methodref; signatureindex= '; showCr:signature_index].
+ Verbose ifTrue:[Transcript show:'methodref; nameindex= '; showCR:name_index].
+ Verbose ifTrue:[Transcript show:'methodref; signatureindex= '; showCR:signature_index].
^ JavaUnresolvedNameandTypeConstant
nameIndex:name_index
@@ -829,7 +829,7 @@
string_index := self nextU2.
- Verbose ifTrue:[Transcript show:'string; index= '; showCr:string_index].
+ Verbose ifTrue:[Transcript show:'string; index= '; showCR:string_index].
^ JavaUnresolvedStringConstant index:string_index
@@ -854,7 +854,7 @@
aField constantValue:constantValue.
- Verbose ifTrue:[Transcript show:'constantValue: '; showCr:constantValue].
+ Verbose ifTrue:[Transcript show:'constantValue: '; showCR:constantValue].
^ true
"
@@ -901,12 +901,12 @@
"/ get fieldInfos
"/
nFields := self nextU2.
- Verbose ifTrue:[Transcript show:'fieldsCount = '; showCr:nFields].
+ Verbose ifTrue:[Transcript show:'fieldsCount = '; showCR:nFields].
fields := Array new:nFields.
1 to:nFields do:[:i |
- Verbose ifTrue:[Transcript show:'field: '; showCr:i].
+ Verbose ifTrue:[Transcript show:'field: '; showCR:i].
fields at:i put:(self readFieldInfofield)
].
^ fields
@@ -928,12 +928,12 @@
"/ get interfaces
"/
interfacesCount := self nextU2.
- Verbose ifTrue:[Transcript show:'interfacesCount = '; showCr:interfacesCount].
+ Verbose ifTrue:[Transcript show:'interfacesCount = '; showCR:interfacesCount].
interfaces := Array new:interfacesCount.
1 to:interfacesCount do:[:i |
- Verbose ifTrue:[Transcript show:'interface: '; showCr:i].
+ Verbose ifTrue:[Transcript show:'interface: '; showCR:i].
interface = self nextU2.
interfaces at:i put:interface.
@@ -957,33 +957,33 @@
attribute_length := self nextU4.
- Verbose ifTrue:[Transcript show:'attribute_length: 0x'; showCr:(attribute_length printStringRadix:16)].
+ Verbose ifTrue:[Transcript show:'attribute_length: 0x'; showCR:(attribute_length printStringRadix:16)].
majorVsn > 2 ifTrue:[
unknown1 := self nextU1.
max_stack := self nextU1.
max_locals := self nextU2.
unknown2 := self nextU2.
- Verbose ifTrue:[Transcript show:'?1: '; showCr:unknown1].
- Verbose ifTrue:[Transcript show:'?2: '; showCr:unknown2].
+ Verbose ifTrue:[Transcript show:'?1: '; showCR:unknown1].
+ Verbose ifTrue:[Transcript show:'?2: '; showCR:unknown2].
] ifFalse:[
max_stack := self nextU1.
max_locals := self nextU1.
].
code_length := self nextU2.
- Verbose ifTrue:[Transcript show:'code_length: '; showCr:(code_length printStringRadix:16)].
- Verbose ifTrue:[Transcript show:'code at pos: '; showCr:inStream position].
+ Verbose ifTrue:[Transcript show:'code_length: '; showCR:(code_length printStringRadix:16)].
+ Verbose ifTrue:[Transcript show:'code at pos: '; showCR:inStream position].
code := ByteArray new:code_length.
inStream nextBytes:code_length into:code startingAt:1.
- Verbose ifTrue:[Transcript show:'method code:'; showCr:code.].
+ Verbose ifTrue:[Transcript show:'method code:'; showCR:code.].
exception_table_length := self nextU2.
- Verbose ifTrue:[Transcript show:'exception_table_length: '; showCr:(exception_table_length printStringRadix:16)].
+ Verbose ifTrue:[Transcript show:'exception_table_length: '; showCR:(exception_table_length printStringRadix:16)].
exception_table_length ~~ 0 ifTrue:[
- Verbose ifTrue:[Transcript show:'exceptionTable length:'; showCr:exception_table_length.].
+ Verbose ifTrue:[Transcript show:'exceptionTable length:'; showCR:exception_table_length.].
exception_table := Array new:exception_table_length.
1 to:exception_table_length do:[:i |
@@ -1038,7 +1038,7 @@
].
].
- Verbose ifTrue:[Transcript showCr:'method has a lineNumberTable'].
+ Verbose ifTrue:[Transcript showCR:'method has a lineNumberTable'].
aJavaMethod setLineNumberTable:line_number_table.
^ true
@@ -1080,7 +1080,7 @@
].
].
- Verbose ifTrue:[Transcript showCr:'method has a localvariableTable'].
+ Verbose ifTrue:[Transcript showCR:'method has a localvariableTable'].
aJavaMethod setLocalVariableTable:local_variable_table.
^ true
@@ -1107,8 +1107,8 @@
name := constants at:name_index.
signature := constants at:signature_index.
- Verbose ifTrue:[Transcript show:'method name:'; showCr:name.
- Transcript show:'signature:'; showCr:signature.].
+ Verbose ifTrue:[Transcript show:'method name:'; showCR:name.
+ Transcript show:'signature:'; showCR:signature.].
m := JavaMethod new.
m setAccessFlags:access_flags.
@@ -1136,10 +1136,10 @@
"/ get methods
"/
methodsCount := self nextU2.
- Verbose ifTrue:[Transcript show:'methodsCount = '; showCr:methodsCount].
+ Verbose ifTrue:[Transcript show:'methodsCount = '; showCR:methodsCount].
1 to:methodsCount do:[:i |
- Verbose ifTrue:[Transcript show:'method: '; showCr:i].
+ Verbose ifTrue:[Transcript show:'method: '; showCR:i].
method := self readMethodFor:aJavaClass
].
@@ -1180,6 +1180,6 @@
!JavaClassReader class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClassReader.st,v 1.20 1996/05/16 14:52:21 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClassReader.st,v 1.21 1996/06/01 14:25:51 cg Exp $'
! !
JavaClassReader initialize!
--- a/JavaDecompiler.st Thu May 16 14:52:21 1996 +0000
+++ b/JavaDecompiler.st Sat Jun 01 14:25:51 1996 +0000
@@ -334,8 +334,8 @@
who notNil ifTrue:[
classToCompileFor := who first.
aStream cr.
-"/ aStream showCr:'decompiling ' , classToCompileFor name , '>>' , (who at:2) , ':'.
- aStream showCr:'decompiling ' , aJavaMethod displayString , ':'.
+"/ aStream showCR:'decompiling ' , classToCompileFor name , '>>' , (who at:2) , ':'.
+ aStream showCR:'decompiling ' , aJavaMethod displayString , ':'.
aStream cr.
].
@@ -618,6 +618,6 @@
!JavaDecompiler class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.14 1996/05/06 14:21:57 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.15 1996/06/01 14:25:22 cg Exp $'
! !
JavaDecompiler initialize!