hg/stx-goodies-petitparser: comparison compiler/PPCCodeGen.st

equal deleted inserted replaced

-:1e45d3c96ec5
+:b5316ef15274
 "{ NameSpace: Smalltalk }"
 Object subclass:#PPCCodeGen
 	instanceVariableNames:'compilerStack compiledParser methodCache currentMethod constants
-		returnVariable arguments idCache'
+		returnVariable arguments idGen'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'PetitCompiler-Compiler-Codegen'
 !
 currentReturnVariable
 ^ currentMethod returnVariable
 !
+idGen
+^ idGen
+!
+idGen: anObject
+idGen := anObject
+!
 ids
-^ idCache keys
+^ idGen ids
 !
 methodCategory
 ^ 'generated'
 !
 currentMethod code: aStringOrBlockOrRBParseNode
 "Created: / 01-06-2015 / 23:49:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+codeAssert: aCode
+self add: 'self assert: (', aCode, ').'.
+!
 codeAssign: code to: variable
 self assert: variable isNil not.
 "TODO JK: Hack alert, whatever is magic constant!!"
 (variable == #whatever) ifFalse: [
 tmpVarirable := returnVariable.
 returnVariable := aString.
 method := [
 aBlock value
 ] ensure:[ returnVariable := tmpVarirable ].
+self assert: (method isKindOf: PPCMethod).
 method isInline ifTrue:[
 self callOnLine:method
 ] ifFalse:[
 self codeEvaluateAndAssign:(method call) to:aString.
 ]
 currentMethod codeBlock: contents
 "Created: / 01-06-2015 / 22:35:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+codeCall: aMethod
+self assert: (aMethod isKindOf: PPCMethod).
+self add: aMethod call.
+!
 codeClearError
 self add: 'self clearError.'.
 !
 codeComment: string
 "TODO JK: Hack alert, whatever is magic constant!!"
 (variable == #whatever) ifFalse: [
 "Do not assign, if somebody does not care!!"
 self add: variable, ' ', selector,' ', argument.
-		] ifTrue: [
+	] ifTrue: [
 "In case argument has a side effect"
-				self add: argument
+		self add: argument
 ]
 !
 codeEvaluateAndAssign: argument to: variable
 self assert: variable isNil not.
 (variable == #whatever) ifFalse: [
 "Do not assign, if somebody does not care!!"
 self add: variable ,' := ', argument.
 ] ifTrue: [
 "In case an argument has a side effect"
-		self add: argument.
+self add: argument.
 ]
 !
 codeHalt
 self add: 'self halt. '
 !
 codeIf: condition then: then else: else
 currentMethod
 add: '(';
-code: condition;
+codeOnLine: condition;
 addOnLine: ')'.
 then notNil ifTrue:[
 currentMethod
-addOnLine:' ifTrue:';
+addOnLine:' ifTrue: ';
 codeBlock: then.
 ].
 else notNil ifTrue:[
 currentMethod
-addOnLine:' ifFalse:';
+addOnLine:' ifFalse: ';
 codeBlock: else.
 ].
 self codeDot.
 "Created: / 01-06-2015 / 22:43:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Created: / 23-04-2015 / 18:01:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 23-04-2015 / 20:51:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+codeOnLIne:aStringOrBlockOrRBParseNode
+currentMethod codeOnLine: aStringOrBlockOrRBParseNode
+"Created: / 01-06-2015 / 23:49:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+codeParsedValueOf: aBlock
+| tmpVarirable  method |
+self assert: aBlock isBlock.
+tmpVarirable := returnVariable.
+returnVariable := #whatever.
+method := [
+aBlock value
+] ensure:[ returnVariable := tmpVarirable ].
+self assert: returnVariable == tmpVarirable.
+self assert: (method isKindOf: PPCMethod).
+self codeCall: method.
+!
 codeProfileStart
 self add: 'context methodInvoked: #', currentMethod methodName, '.'
 "Created: / 01-06-2015 / 21:17:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 "Created: / 01-06-2015 / 21:19:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 codeReturn
 currentMethod isInline ifTrue: [
-		"If inlined, the return variable already holds the value"
+				"If inlined, the return variable already holds the value"
-	] ifFalse: [
+		] ifFalse: [
-		arguments profile ifTrue:[
+				arguments profile ifTrue:[
-			self codeProfileStop.
+						self codeProfileStop.
-		].
+				].
-		self add: '^ ', currentMethod returnVariable
+				self add: '^ ', currentMethod returnVariable
-	].
+		].
-	"Created: / 23-04-2015 / 18:01:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+		"Created: / 23-04-2015 / 18:01:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-	"Modified: / 01-06-2015 / 21:49:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+		"Modified: / 01-06-2015 / 21:49:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 codeReturn: code
 " - returns whatever is in code OR
 - assigns whatever is in code into the returnVariable"
 "Created: / 23-04-2015 / 18:01:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 01-06-2015 / 21:48:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+codeReturnParsedValueOf: aBlock
+| tmpVarirable  method |
+self assert:aBlock isBlock.
+tmpVarirable := returnVariable.
+method := aBlock value.
+self assert: returnVariable == tmpVarirable.
+self assert: (method isKindOf: PPCMethod).
+method isInline ifTrue:[
+self callOnLine:method.
+self codeReturn: returnVariable.
+] ifFalse:[
+self codeReturn: method call.
+]
+"Created: / 23-04-2015 / 18:21:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 codeStoreValueOf: aBlock intoVariable: aString
 | tmpVarirable method |
 self assert: aBlock isBlock.
 self assert: aString isNil not.
 ^toUse
 "Modified: / 10-05-2015 / 07:29:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
-idFor: object
+idFor: anObject
-self assert: (object canHavePPCId).
+^ idGen idFor: anObject
-^ self idFor: object prefixed: object prefix suffixed: object suffix
+!
+idFor: anObject defaultName: defaultName
+^ idGen idFor: anObject defaultName: defaultName
 !
 idFor: object prefixed: prefix
 ^ self idFor: object prefixed: prefix suffixed: ''
 !
 idFor: object prefixed: prefix suffixed: suffix
+self error: 'Should no longer be used'.
+"
 | name id |
 ^ idCache at: object ifAbsentPut: [
 ((object canHavePPCId) and: [object name isNotNil]) ifTrue: [
-"Do not use prefix, if there is a name"
+""Do not use prefix, if there is a name""
 name := self asSelector: (object name asString).
 id := (name, suffix) asSymbol.
-"Make sure, that the generated ID is uniqe!!"
+""Make sure, that the generated ID is uniqe!!""
 (idCache includes: id) ifTrue: [
 (id, '_', idCache size asString) asSymbol
 ] ifFalse: [
 id
 ]
 ] ifFalse: [
 (prefix, '_', (idCache size asString), suffix) asSymbol
 ]
 ]
+"
+"Modified: / 17-08-2015 / 12:00:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 idFor: object suffixed: suffix
 self assert: (object isKindOf: PPCNode) description: 'Shold use PPCNode for ids'.
 ^ self idFor: object prefixed: object prefix suffixed: suffix effect: #none
+!
+numberIdFor: object
+^ idGen numericIdFor: object
 ! !
 !PPCCodeGen methodsFor:'initialization'!
 copy: parser
 super initialize.
 compilerStack := Stack new.
 methodCache := IdentityDictionary new.
 constants := Dictionary new.
-idCache := IdentityDictionary new.
+idGen := PPCIdGenerator new.
 ! !
 !PPCCodeGen methodsFor:'profiling'!
 profileTokenRead: tokenName
 ^ methodCache at: id ifPresent: block
 !
 checkCache: id
 | method  |
+self flag: 'deprecated?'.
-"self halt: 'deprecated?'."
 "Check if method is hand written"
 method := compiledParser ifNotNil: [ compiledParser compiledMethodAt: id ifAbsent: [ nil ] ].
 method ifNotNil: [ ^ PPCCompiledMethod new id: id; yourself ].
 "Modified: / 01-06-2015 / 21:37:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 stopMethod
 self cache: currentMethod methodName as: currentMethod.
 	"arguments profile ifTrue: [ Transcript show: currentMethod code; cr. ]."
 	^ self pop.
 	"Modified: / 01-06-2015 / 21:38:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !

changeset 515	b5316ef15274
parent 502	1e45d3c96ec5
child 524	f6f68d32de73