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

equal deleted inserted replaced

-:e829f3860745
+:d86e2db09346
 	instanceVariableNames:'compiler'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'PetitCompiler-Visitors'
 !
 !PPCCodeGenerator class methodsFor:'as yet unclassified'!
 new
 ^ self basicNew
 ].
 ].
 "Block return value is return value of last statement.
 So if the method is not inline, make last statement a return.
 if the method is inline, make it assignment to retvalVar."
-compiler currentMethod isInline ifTrue:[
+blockBody statements notEmpty ifTrue:["Care for empty blocks - [:t | ] !!"
-|  assignment |
+compiler currentMethod isInline ifTrue:[
+|  assignment |
-assignment := RBAssignmentNode variable: (RBVariableNode named: self retvalVar) value:  blockBody statements last.
-blockBody replaceNode: blockBody statements last withNode: assignment.
+assignment := RBAssignmentNode variable: (RBVariableNode named: self retvalVar) value:  blockBody statements last.
-] ifFalse:[
+blockBody replaceNode: blockBody statements last withNode: assignment.
-| return |
+] ifFalse:[
+| return |
-return := RBReturnNode value: blockBody statements last.
-blockBody replaceNode: blockBody statements last withNode: return.
+return := RBReturnNode value: blockBody statements last.
+blockBody replaceNode: blockBody statements last withNode: return.
+].
 ].
 compiler codeStoreValueOf: [ self visit: node child ] intoVariable: self retvalVar.
 compiler codeIf: 'error' then: [
 compiler codeReturn: 'failure'.
 ] else: [
 compiler code: blockBody.
 ]
-"Modified: / 01-06-2015 / 23:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 15-06-2015 / 17:08:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 visitAndNode: node
 | mementoVar |
 compiler dedent.
 compiler add: 'error := ', self retvalVar, ' isPetitFailure.'.
 compiler codeReturn.
 ! !
+!PPCCodeGenerator class methodsFor:'documentation'!
+version_HG
+^ '$Changeset: <not expanded> $'
+! !

changeset 485	d86e2db09346
parent 484	e829f3860745
child 486	0dd7eb52b5a1