[SCM] master: Remove stray references to ExprAST.

cagney@sourceware.org cagney@sourceware.org
Fri Nov 16 03:27:00 GMT 2007


The branch, master has been updated
       via  d4080f5cc94e2364b34b9e30c9cba19070d30c98 (commit)
      from  59fba07fbfacb30f9ae2323677c5ae20b5a14eaf (commit)

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

- Log -----------------------------------------------------------------
commit d4080f5cc94e2364b34b9e30c9cba19070d30c98
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Nov 15 22:30:23 2007 -0500

    Remove stray references to ExprAST.
    
    frysk-common/ChangeLog
    2007-11-15  Andrew Cagney  <cagney@redhat.com>
    
    	* antlr-warnings.awk: Delete references to ExprAST.
    
    frysk-core/frysk/expr/ChangeLog
    2007-11-15  Andrew Cagney  <cagney@redhat.com>
    
    	* TestArithmetics.java (eval(String)): Do not set setASTNodeClass.
    	* TestVariables.java (eval(String)): Ditto.

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

Summary of changes:
 frysk-common/ChangeLog                     |    4 ++
 frysk-common/antlr-warnings.awk            |   49 ++++++++++++++++++++++------
 frysk-core/frysk/expr/ChangeLog            |    5 +++
 frysk-core/frysk/expr/TestArithmetics.java |    1 -
 frysk-core/frysk/expr/TestVariables.java   |    1 -
 5 files changed, 48 insertions(+), 12 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index df27d16..fe624dc 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-15  Andrew Cagney  <cagney@redhat.com>
+
+	* antlr-warnings.awk: Delete references to ExprAST.
+
 2007-11-14  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.rules (.g.antlred): Rename .g.antlered; use a tmp
diff --git a/frysk-common/antlr-warnings.awk b/frysk-common/antlr-warnings.awk
index 34137ea..f77e3c0 100644
--- a/frysk-common/antlr-warnings.awk
+++ b/frysk-common/antlr-warnings.awk
@@ -1,5 +1,44 @@
 #!/bin/awk
 
+# This file is part of the program FRYSK.
+#
+# Copyright 2007, Red Hat Inc.
+#
+# FRYSK is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# FRYSK is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with FRYSK; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# 
+# In addition, as a special exception, Red Hat, Inc. gives You the
+# additional right to link the code of FRYSK with code not covered
+# under the GNU General Public License ("Non-GPL Code") and to
+# distribute linked combinations including the two, subject to the
+# limitations in this paragraph. Non-GPL Code permitted under this
+# exception must only link to the code of FRYSK through those well
+# defined interfaces identified in the file named EXCEPTION found in
+# the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline
+# functions from the Approved Interfaces without causing the
+# resulting work to be covered by the GNU General Public
+# License. Only Red Hat, Inc. may make changes or additions to the
+# list of Approved Interfaces. You must obey the GNU General Public
+# License in all respects for all of the FRYSK code and other code
+# used in conjunction with FRYSK except the Non-GPL Code covered by
+# this exception. If you modify this file, you may extend this
+# exception to your version of the file, but you are not obligated to
+# do so. If you do not wish to provide this exception without
+# modification, you must delete this exception statement from your
+# version and license this file solely under the GPL without
+# exception.
+
 # This script spits out SED lines that edit out warnings in generated
 # code from antlr.  It needs to be run iteratively as often warnings
 # are masked.
@@ -89,16 +128,6 @@ prob ~ /The local variable .* is never read/ {
 	sed = sed_comment(code)
     } else if (code ~ /^AST [_[:alnum:]]*_AST_in = \(_t == ASTNULL) \? null : \(AST)_t;/) {
 	sed = sed_comment(code)
-    } else if (code ~ /^ExprAST [_[:alnum:]]*_AST_in = null;/) {
-	sed = sed_comment(code)
-    } else if (code ~ /^ExprAST [_[:alnum:]]*_AST = null;/) {
-	sed = sed_comment(code)
-    } else if (code ~ /^ExprAST [_[:alnum:]]*_AST = .ExprAST.*null;/) {
-	sed = sed_comment(code)
-    } else if (code ~ /^ExprAST [_[:alnum:]]*_AST_in = .ExprAST._t;/) {
-	sed = sed_comment(code)
-    } else if (code ~ /^ExprAST [_[:alnum:]]*_AST_in = \(_t == ASTNULL) \? null : .ExprAST._t;/) {
-	sed = sed_comment(code)
     } else if (code ~ /Token *[_[:alnum:]]* = null;/) {
 	sed = sed_comment(code)
     } else if (code ~ /Token _token = null;/) {
diff --git a/frysk-core/frysk/expr/ChangeLog b/frysk-core/frysk/expr/ChangeLog
index 8ec1bb0..4a7ee21 100644
--- a/frysk-core/frysk/expr/ChangeLog
+++ b/frysk-core/frysk/expr/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-15  Andrew Cagney  <cagney@redhat.com>
+
+	* TestArithmetics.java (eval(String)): Do not set setASTNodeClass.
+	* TestVariables.java (eval(String)): Ditto.
+
 2007-11-15  Teresa Thomas  <tthomas@redhat.com>
 	
 	* CExprEvaluator.g: Update.
diff --git a/frysk-core/frysk/expr/TestArithmetics.java b/frysk-core/frysk/expr/TestArithmetics.java
index 9861f96..5db7d88 100644
--- a/frysk-core/frysk/expr/TestArithmetics.java
+++ b/frysk-core/frysk/expr/TestArithmetics.java
@@ -55,7 +55,6 @@ public class TestArithmetics extends TestCase {
 	    input += (char) 3;
 	    CExprLexer lexer = new CExprLexer(new StringReader(input));
 	    CExprParser parser = new CExprParser(lexer);
-	    parser.setASTNodeClass("frysk.expr.ExprAST");
 	    parser.start();
 	    ExprSymTab symTab = new ScratchSymTab();
 	    CExprEvaluator exprEvaluator = new CExprEvaluator(symTab);
diff --git a/frysk-core/frysk/expr/TestVariables.java b/frysk-core/frysk/expr/TestVariables.java
index e7cf9e5..00015a6 100644
--- a/frysk-core/frysk/expr/TestVariables.java
+++ b/frysk-core/frysk/expr/TestVariables.java
@@ -54,7 +54,6 @@ public class TestVariables extends TestCase {
 	    input += (char) 3;
 	    CExprLexer lexer = new CExprLexer(new StringReader(input));
 	    CExprParser parser = new CExprParser(lexer);
-	    parser.setASTNodeClass("frysk.expr.ExprAST");
 	    parser.start();
 	    ExprSymTab symTab = new TestbedSymTab();
 	    CExprEvaluator exprEvaluator = new CExprEvaluator(symTab);


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



More information about the Frysk-cvs mailing list