Changeset 3370
- Timestamp:
- Jun 27, 2013, 5:29:25 PM (6 years ago)
- Location:
- proto/pabloj/trunk/src/toolchain
- Files:
-
- 1 deleted
- 6 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
proto/pabloj/trunk/src/toolchain/pabloB/codeGenerator/visitors/Unparser.java
r3368 r3370 306 306 resultVar.append(")"); 307 307 308 code.setResultVarName(resultVar.toString()); // Function invocation as an expression309 310 code.addFormattedLine("%s;", resultVar.toString()); // Function invocation as a statement308 code.setResultVarName(resultVar.toString()); // function invocation as an expression 309 310 code.addFormattedLine("%s;", resultVar.toString()); // function invocation as a statement 311 311 312 312 return code; … … 322 322 public CodeStore visitLeave(IdisaFuncCallNode node, List<CodeStore> childResults) { 323 323 CodeStore code = new CodeStore(); 324 325 System.out.println(node);326 324 327 325 String idisaFullyQualifiedName = childResults.get(0).getResultVarName(); -
proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2PabloB/CarryIntroXFormer.java
r3364 r3370 61 61 public class CarryIntroXFormer { 62 62 63 private static boolean isTempified = false;63 // private static boolean isTempified = false; 64 64 65 65 private static ASTNode TempifyOnce(ASTNode ASTree) { 66 if(!isTempified) {67 isTempified = true;68 return TempifyCarrySetBuiltinCalls.apply(ASTree);69 }66 // if(!isTempified) { 67 // isTempified = true; 68 // return TempifyCarrySetBuiltinCalls.apply(ASTree); 69 // } 70 70 return ASTree; 71 71 } … … 74 74 75 75 ASTNode xTree = apply(root, builtinEncoder, carrySetEncoder, finalBlockMode, true, 0); 76 isTempified = false;76 // isTempified = false; 77 77 return xTree; 78 78 } … … 198 198 public void visitLeave(FuncCallNode node) { 199 199 if(BuiltinCallUtil.isCarryNone(node)) { 200 PabloSBuiltin builtin = BuiltinCallUtil.builtin(node); 201 Counter counter = selectCounter(builtin, carryCounter, advanceNCounter); 202 PabloSBuiltinTranslator translator = builtin.getTranslator(); 203 translator.translate(builtin, node, counter, context); 200 if(!BuiltinCallUtil.isAssertZero(node)) { 201 202 PabloSBuiltin builtin = BuiltinCallUtil.builtin(node); 203 204 205 206 Counter counter = selectCounter(builtin, carryCounter, advanceNCounter); 207 PabloSBuiltinTranslator translator = builtin.getTranslator(); 208 209 210 211 translator.translate(builtin, node, counter, context); 212 } 204 213 } 205 214 } -
proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2PabloB/PabloS2PabloBController.java
r3368 r3370 36 36 37 37 pabloS.ast.ASTNode decoratedTree = ASTree.deepCopy(); 38 decoratedTree = SurroundAssert0sWithIfs.apply(decoratedTree, builtinEncoder); 38 39 //decoratedTree = SurroundAssert0sWithIfs.apply(decoratedTree, builtinEncoder); 40 39 41 decoratedTree = CarryIntroXFormer.apply(decoratedTree, builtinEncoder, carrySetEncoder, finalBlockMode); 42 40 43 //decoratedTree = SurroundConditionsWithBitBlockAny.apply(decoratedTree); 41 44 //decoratedTree = BitwiseBoolean2IDISA.apply(decoratedTree); -
proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2PabloB/PabloS2PabloBXFormer.java
r3369 r3370 282 282 283 283 String assert0CallName = builtinEncoder.getName(PabloSBuiltin.ASSERT_ZERO); 284 pabloB.ast.ASTNode errorStream = childResults.get(1). deepCopy();285 pabloB.ast.ASTNode errorMsg = childResults.get( 2).deepCopy();284 pabloB.ast.ASTNode errorStream = childResults.get(1).child(0).deepCopy(); 285 pabloB.ast.ASTNode errorMsg = childResults.get(1).child(1).deepCopy(); 286 286 287 287 pabloB.ast.ASTNode assert0Call = Generators.makeFuncCallNode(locator, … … 291 291 292 292 BlockStmtNode blockStmt = Generators.makeBlockStmtNode(locator, assert0Call); 293 pabloB.ast.ASTNode replacement= Generators.makeIfStmtNode(locator,293 IfStmtNode replacement = Generators.makeIfStmtNode(locator, 294 294 errorStream.deepCopy(), 295 295 blockStmt); 296 297 surroundConditionWithBitBlockAny(replacement, Accessors.condition(replacement)); 298 296 299 return replacement; 297 300 } -
proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2pabloS/PabloS2SPabloController.java
r3363 r3370 16 16 decoratedTree = ExpandAugmentedAssignments.apply(decoratedTree); 17 17 decoratedTree = CombineAdvances.apply(decoratedTree); 18 decoratedTree = TempifyCarrySetBuiltinCalls.apply(decoratedTree); 18 19 return decoratedTree; 19 20 } -
proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2pabloS/SurroundAssert0sWithIfs.java
r3363 r3370 58 58 59 59 node.updateSelf(ifStmt); 60 61 System.out.println(node); 62 System.exit(1); 60 63 } 61 64 } -
proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2pabloS/TempifyCarrySetBuiltinCalls.java
r3367 r3370 42 42 * 43 43 */ 44 package toolchain.pabloS.transformer.visitors.pabloS2 PabloB;44 package toolchain.pabloS.transformer.visitors.pabloS2pabloS; 45 45 46 46 import java.util.LinkedHashMap; … … 57 57 import static toolchain.util.MapUtil.*; 58 58 59 import toolchain.pabloS.transformer.visitors.pabloS2pabloS.SplitVarDeclInits;60 59 public class TempifyCarrySetBuiltinCalls { 61 60
Note: See TracChangeset
for help on using the changeset viewer.