Changeset 3857 for devel-tools

Timestamp:

Jul 21, 2008, 5:27:15 PM (12 years ago)

Author:

yura

Message:

• Const declaration can go in any order. Recursion is error.

Location:

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

Files:

• ExprChecker.java (modified) (5 diffs)
• MsgCode.java (modified) (1 diff)

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/ExprChecker.java

@@ -1 +1 @@
 package org.refal.rfpdt.compiler;
+
+import java.util.HashSet;
 
 import org.refal.rfpdt.ast.AstAlt;
@@ -54 +56 @@
     }
 
-    private final class ConstChecker implements ExprVisitorWithEnv<ContainerWithVar> {
-        public void visit (AstCall astCall, ContainerWithVar e) {
+    private final class ConstChecker implements ExprVisitorWithEnv<Container> {
+        public void visit (AstCall astCall, Container e) {
             msgHandler.send(astCall.pos, MsgCode.UnexpectedFunctionCallInConst);
             e.noError = false;
         }
 
-        public void visit (AstCharSymbol astCharSymbol, ContainerWithVar e) {}
-
-        public void visit (AstExpr astExpr, ContainerWithVar e) {
-            ContainerWithVar e1 = new ContainerWithVar();
+        public void visit (AstCharSymbol astCharSymbol, Container e) {}
+
+        public void visit (AstExpr astExpr, Container e) {
+            Container e1 = new Container();
             for (AstTerm astTerm : astExpr.termList)
                 astTerm.accept(this, e1);
@@ -69 +71 @@
         }
 
-        public void visit (AstNumberSymbol astNumberSymbol, ContainerWithVar e) {}
-
-        public void visit (AstParen astParen, ContainerWithVar e) {
+        public void visit (AstNumberSymbol astNumberSymbol, Container e) {}
+
+        public void visit (AstParen astParen, Container e) {
             astParen.expr.accept(this, e);
         }
 
-        public void visit (AstRef astRef, ContainerWithVar e) {
+        public void visit (AstRef astRef, Container e) {
             if (astRef.decl == null)
                 e.noError = false;
-            else if (astRef.decl instanceof AstConstBinding && !((AstConstBinding) astRef.decl).expr.noError) {
-                msgHandler.send(astRef.name.pos, MsgCode.UncheckedConstInConst);
-                e.noError = false;
+            else if (astRef.decl instanceof AstConstBinding) {
+                AstConstBinding astConstBinding = (AstConstBinding) astRef.decl;
+                if (stackConstBinding.contains(astConstBinding)) {
+                    msgHandler.send(astRef.name.pos, MsgCode.RecursiveDefinitionInConst);
+                    e.noError = false;
+                } else {
+                    checkAstConstBinding(astConstBinding);
+                    e.noError &= astConstBinding.expr.noError;                    
+                }
             }
         }
 
-        public void visit (AstVar astVar, ContainerWithVar e) {
+        public void visit (AstVar astVar, Container e) {
             msgHandler.send(astVar.pos, MsgCode.UnexpectedVariableInConst);
             e.noError = false;
         }
 
-        public void visit (AstWordSymbol astWordSymbol, ContainerWithVar e) {}
+        public void visit (AstWordSymbol astWordSymbol, Container e) {}
     }
 
@@ -194 +202 @@
 
     private final MsgHandler msgHandler;
+    
+    private final HashSet<AstConstBinding> checkedConstBinding;
+    private HashSet<AstConstBinding> stackConstBinding;
 
     private ExprChecker (final MsgHandler msgHandler) {
         this.msgHandler = msgHandler;
-    }
-
-    private void checkConst (AstExpr astExpr) {
-        ContainerWithVar e = new ContainerWithVar();
+        this.checkedConstBinding = new HashSet<AstConstBinding>();
+    }
+
+    private void checkAstConstBinding (AstConstBinding astConstBinding) {
+        if (checkedConstBinding.contains(astConstBinding))
+            return;
+        stackConstBinding.add(astConstBinding);
+        AstExpr astExpr = astConstBinding.expr; 
+        Container e = new Container();
         astExpr.accept(new ConstChecker(), e);
         astExpr.noError = e.noError;
+        checkedConstBinding.add(astConstBinding); 
     }
 
@@ -226 +243 @@
 
     public void visit (AstConstBinding astConstBinding) {
-        checkConst(astConstBinding.expr);
+        stackConstBinding = new HashSet<AstConstBinding>();
+        checkAstConstBinding(astConstBinding);
     }
 

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/MsgCode.java

@@ -43 +43 @@
     TwoOccurrencesOfTheVariable_X_HaveDifferentTypes(Severity.Error,
             "Two occurrences of the variable %s have different types"), //
-    UncheckedConstInConst(Severity.Error, "Unchecked constant reference in constant expression"), //
+    RecursiveDefinitionInConst(Severity.Error, "Recursive definition of constant expression"), //
     UnexpectedEndOfComment(Severity.Error, "Unexpected end of comment"), // 
     UnexpectedEndOfWord(Severity.Error, "Word literal is not properly closed by a double-quote"), //