Changeset 3856

Timestamp:

Jul 18, 2008, 11:49:13 PM (12 years ago)

Author:

yura

Message:

• Constant expression checker is added (if next expression has reference to previous then error - must be corrected).

Location:

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

Files:

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

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

@@ -54 +54 @@
     }
 
+    private final class ConstChecker implements ExprVisitorWithEnv<ContainerWithVar> {
+        public void visit (AstCall astCall, ContainerWithVar 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();
+            for (AstTerm astTerm : astExpr.termList)
+                astTerm.accept(this, e1);
+            e.noError &= e1.noError;
+        }
+
+        public void visit (AstNumberSymbol astNumberSymbol, ContainerWithVar e) {}
+
+        public void visit (AstParen astParen, ContainerWithVar e) {
+            astParen.expr.accept(this, e);
+        }
+
+        public void visit (AstRef astRef, ContainerWithVar 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;
+            }
+        }
+
+        public void visit (AstVar astVar, ContainerWithVar e) {
+            msgHandler.send(astVar.pos, MsgCode.UnexpectedVariableInConst);
+            e.noError = false;
+        }
+
+        public void visit (AstWordSymbol astWordSymbol, ContainerWithVar e) {}
+    }
+
     private final class FormatChecker implements ExprVisitorWithEnv<ContainerWithVar> {
         public void visit (AstCall astCall, ContainerWithVar e) {
@@ -161 +199 @@
     }
 
+    private void checkConst (AstExpr astExpr) {
+        ContainerWithVar e = new ContainerWithVar();
+        astExpr.accept(new ConstChecker(), e);
+        astExpr.noError = e.noError;
+    }
+
     private void checkFormat (AstExpr astExpr) {
         ContainerWithVar e = new ContainerWithVar();
@@ -182 +226 @@
 
     public void visit (AstConstBinding astConstBinding) {
-        checkFormat(astConstBinding.expr);
+        checkConst(astConstBinding.expr);
     }
 

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"), //
     UnexpectedEndOfComment(Severity.Error, "Unexpected end of comment"), // 
     UnexpectedEndOfWord(Severity.Error, "Word literal is not properly closed by a double-quote"), //
     UnexpectedEndOfCharacters(Severity.Error, "Characters literal is not properly closed by a single-quote"), //
+    UnexpectedFunctionCallInConst(Severity.Error, "Unexpected function call in constant expression"), //
     UnexpectedFunctionCallInFormat(Severity.Error, "Unexpected function call in format"), //
     UnexpectedFunctionCallInPattern(Severity.Error, "Unexpected function call in pattern"), //
     UnexpectedToken(Severity.Error, "Unexpected token %s"), //
+    UnexpectedVariableInConst(Severity.Error, "Unexpected variable in constant expression"), //
     // UnexpectedEOFInCharacterString(Severity.Error, "Unexpected EOF in character string"), //
     // UnexpectedEOFInWord(Severity.Error, "Unexpected EOF in word"), //