Changeset 3457 for devel-tools/trunk

Timestamp:

Feb 29, 2008, 7:41:54 PM (13 years ago)

Author:

yura

Message:

• Woring Alpha version of debugger - lines are in AST.

Location:

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/core/builder

Files:

• CallListGenerator.java (deleted)
• RefalASGenerator.java (modified) (8 diffs)
• RfpBuilder.java (modified) (1 diff)

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/core/builder/RefalASGenerator.java

@@ -1 +1 @@
 package org.refal.plus.rfpdt.core.builder;
+
+import java.math.BigInteger;
 
 import org.refal.plus.Expr;
@@ -69 +71 @@
     private static final String FAIL = "FAIL";
     private static final String ERROR = "ERROR";
-    //private static final String LINENUMBER = "LINENUMBER";
+    private static final String LINENUMBER = "LINENUMBER";
 
     private static Expr makeName (String name) {
@@ -78 +80 @@
         return new Expr(concat.yield());
     }
-    
+
     private static void addLineNumber (AstNode astNode, Expr.Concatenator e) {
-    // Expr.Concatenator items = Expr.getConcatenator(2);
-    // items.toRight(LINENUMBER);
-    // items.toRight(BigInteger.valueOf(astNode.pos.line));
-    // e.toRight((Comparable<?>) items.yield());
+        Expr.Concatenator items = Expr.getConcatenator(2);
+        items.toRight(LINENUMBER);
+        items.toRight(BigInteger.valueOf(astNode.pos.line));
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -201 +203 @@
 
     public void visit (AstAlt astAlt, Expr.Concatenator e) {
-        addLineNumber(astAlt, e);
+        //addLineNumber(astAlt, e);
         Expr.Concatenator items = Expr.getConcatenator();
         items.toRight(astAlt.failMode.select(ALT_Q, ALT));
@@ -242 +244 @@
 
     public void visit (AstFormat astFormat, Expr.Concatenator e) {
-        addLineNumber(astFormat, e);
+        //addLineNumber(astFormat, e);
         Expr.Concatenator format = Expr.getConcatenator();
         format.toRight(FORMAT);
@@ -250 +252 @@
 
     public void visit (AstIter astIter, Expr.Concatenator e) {
-        addLineNumber(astIter, e);
+        //addLineNumber(astIter, e);
         Expr.Concatenator iter = Expr.getConcatenator();
         iter.toRight(ITER);
@@ -273 +275 @@
 
     public void visit (AstPattern astPattern, Expr.Concatenator e) {
-        addLineNumber(astPattern, e);
+        //addLineNumber(astPattern, e);
         Expr.Concatenator items = Expr.getConcatenator();
         items.toRight(astPattern.dir.select(LEFT, RIGHT));
@@ -289 +291 @@
 
     public void visit (AstSentence astSentence, Expr.Concatenator e) {
-        addLineNumber(astSentence, e);
+        //addLineNumber(astSentence, e);
         for (AstStatement statement : astSentence.statementList)
             statement.accept(this, e);

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/core/builder/RfpBuilder.java

@@ -264 +264 @@
         try {
             Expr ast = RefalASGenerator.generateAS(astImplem);
-            Expr list = CallListGenerator.generateAS(astImplem);
             Result res = new Result();
-            org.refal.plus.compiler.rfpc.CompileASToJBC2(ast, list, res);
+            org.refal.plus.compiler.rfpc.CompileASToJBC(ast, res);
             for (Comparable<?> p : res.getExpr()) {
                 Expr e = (Expr) p;