[SCM] master: Delete frysk.expr.ExprAST.

cagney@sourceware.org cagney@sourceware.org
Thu Nov 15 17:06:00 GMT 2007


The branch, master has been updated
       via  baac24889bed4fb5c319c5f3db25d0ebf5f5f47f (commit)
      from  5f6f1885590d461c102fe24fee06a4917398a21c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit baac24889bed4fb5c319c5f3db25d0ebf5f5f47f
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Nov 15 11:50:13 2007 -0500

    Delete frysk.expr.ExprAST.
    
    frysk-core/frysk/debuginfo/ChangeLog
    2007-11-15  Andrew Cagney  <cagney@redhat.com>
    
    	* DebugInfo.java: Use AST not ExprAST.
    
    frysk-core/frysk/expr/ChangeLog
    2007-11-15  Andrew Cagney  <cagney@redhat.com>
    
    	* CExpr.g (options): Delete ASTLabelType.
    	* CExprEvaluator.g (options): Ditto.
    	* ExprAST.java: Delete.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/debuginfo/ChangeLog      |    4 ++++
 frysk-core/frysk/debuginfo/DebugInfo.java |   10 +++-------
 frysk-core/frysk/expr/CExpr.g             |    3 +--
 frysk-core/frysk/expr/CExprEvaluator.g    |    2 --
 frysk-core/frysk/expr/ChangeLog           |    6 ++++++
 frysk-core/frysk/expr/ExprAST.java        |   21 ---------------------
 6 files changed, 14 insertions(+), 32 deletions(-)
 delete mode 100644 frysk-core/frysk/expr/ExprAST.java

First 500 lines of diff:
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index 9f1cd01..425f352 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-15  Andrew Cagney  <cagney@redhat.com>
+
+	* DebugInfo.java: Use AST not ExprAST.
+
 2007-11-12  Andrew Cagney  <cagney@redhat.com>
 
 	* DebugInfoStackFactory.java (printStackTrace): Handle -ve
diff --git a/frysk-core/frysk/debuginfo/DebugInfo.java b/frysk-core/frysk/debuginfo/DebugInfo.java
index 6768379..34304af 100644
--- a/frysk-core/frysk/debuginfo/DebugInfo.java
+++ b/frysk-core/frysk/debuginfo/DebugInfo.java
@@ -38,11 +38,10 @@
 // exception.
 package frysk.debuginfo;
 
-import antlr.CommonAST;
+import antlr.collections.AST;
 import frysk.dwfl.DwflCache;
 import frysk.expr.CExprLexer;
 import frysk.expr.CExprParser;
-import frysk.expr.ExprAST;
 import frysk.expr.ExprSymTab;
 import frysk.expr.CExprEvaluator;
 import frysk.proc.Proc;
@@ -104,7 +103,6 @@ public class DebugInfo {
 	sInput += (char)3;
 	CExprLexer lexer = new CExprLexer(new StringReader(sInput));
 	CExprParser parser = new CExprParser(lexer);
-	parser.setASTNodeClass("frysk.expr.ExprAST");
 	try {
 	    parser.start();
 	} catch (antlr.RecognitionException ignore) {
@@ -218,7 +216,6 @@ public class DebugInfo {
     
 	CExprLexer lexer = new CExprLexer(new StringReader(sInput));
 	CExprParser parser = new CExprParser(lexer);
-	parser.setASTNodeClass("frysk.expr.ExprAST");
 	try {
 	    parser.start();
 	} catch (antlr.RecognitionException r) {
@@ -229,7 +226,7 @@ public class DebugInfo {
 	    throw new RuntimeException(t);
 	}
     
-	ExprAST exprAST = (ExprAST) parser.getAST();
+	AST exprAST = parser.getAST();
 	if (dumpTree)
 	    System.out.println("parse tree: " + exprAST.toStringTree());
 	CExprEvaluator cExprEvaluator;
@@ -264,7 +261,6 @@ public class DebugInfo {
     
 	CExprLexer lexer = new CExprLexer(new StringReader(sInput));
 	CExprParser parser = new CExprParser(lexer);
-	parser.setASTNodeClass("frysk.expr.ExprAST");
 	try {
 	    parser.start();
 	} catch (antlr.RecognitionException r) {
@@ -273,7 +269,7 @@ public class DebugInfo {
 	    throw new RuntimeException(t);
 	}
     
-	CommonAST t = (CommonAST) parser.getAST();
+	AST t = parser.getAST();
 	if (dump_tree)
 	    // Print the resulting tree out in LISP notation
 	    System.out.println("parse tree: " + t.toStringTree());
diff --git a/frysk-core/frysk/expr/CExpr.g b/frysk-core/frysk/expr/CExpr.g
index cad2c4f..8d7b373 100644
--- a/frysk-core/frysk/expr/CExpr.g
+++ b/frysk-core/frysk/expr/CExpr.g
@@ -86,7 +86,6 @@ class CExprParser extends Parser;
 options {
     defaultErrorHandler=false;
     buildAST=true;
-    ASTLabelType = "ExprAST";
     k=2;
 }
 
@@ -314,7 +313,7 @@ cast_expression!
     ;
   
 postfix_expression!
-    { ExprAST astPostExpr = null; 
+    { AST astPostExpr = null; 
     }   
     :(   sc_expr: scope_expression
          {  astPostExpr = #sc_expr; 
diff --git a/frysk-core/frysk/expr/CExprEvaluator.g b/frysk-core/frysk/expr/CExprEvaluator.g
index 2fb26a7..a4f9403 100644
--- a/frysk-core/frysk/expr/CExprEvaluator.g
+++ b/frysk-core/frysk/expr/CExprEvaluator.g
@@ -87,7 +87,6 @@ header
     import frysk.value.FloatingPointType;
     import frysk.value.Value;
     import frysk.expr.ExprSymTab;
-    import frysk.expr.ExprAST;
     import inua.eio.ByteOrder;
     import lib.dwfl.BaseTypes;
 }
@@ -96,7 +95,6 @@ class CExprEvaluator extends TreeParser;
 
 options {
     importVocab=CExprParser;
-    ASTLabelType = "ExprAST";
 }
 
 {
diff --git a/frysk-core/frysk/expr/ChangeLog b/frysk-core/frysk/expr/ChangeLog
index 2e0f515..c877379 100644
--- a/frysk-core/frysk/expr/ChangeLog
+++ b/frysk-core/frysk/expr/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-15  Andrew Cagney  <cagney@redhat.com>
+
+	* CExpr.g (options): Delete ASTLabelType.
+	* CExprEvaluator.g (options): Ditto.
+	* ExprAST.java: Delete.
+
 2007-11-14  Andrew Cagney  <cagney@redhat.com>
 
 	* CExprAnnotator.g: Delete.
diff --git a/frysk-core/frysk/expr/ExprAST.java b/frysk-core/frysk/expr/ExprAST.java
deleted file mode 100644
index 034654d..0000000
--- a/frysk-core/frysk/expr/ExprAST.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package frysk.expr;
-
-import antlr.CommonAST;
-
-import frysk.value.Type;
-
-public class ExprAST extends CommonAST {
-  Type exprType;
-  static final long serialVersionUID = 0;
-
-  public ExprAST() {
-  }
-
-public Type getExprType() {
-    return exprType;
-}
-
-public void setExprType(Type exprType) {
-    this.exprType = exprType;
-}
-}


hooks/post-receive
--
frysk system monitor/debugger



More information about the Frysk-cvs mailing list