Browse Source

- Since it was buggy, removed the impossibility of using propositions outside formal annotation.

git-svn-id: branches/tue@4842 -
TUeSET 19 years ago
parent
commit
ecffedae99
2 changed files with 1 additions and 11 deletions
  1. 1 7
      compiler/pexpr.pas
  2. 0 4
      compiler/scanner.pas

+ 1 - 7
compiler/pexpr.pas

@@ -1275,13 +1275,7 @@ implementation
 
 
                 propositionsym:
                 propositionsym:
                   begin
                   begin
-                    if (current_scanner.in_formal_annotation) then
-                      p1:=tpropositionsym(srsym).expr.getcopy
-                    else
-                      begin
-                        p1:=cerrornode.create;
-                        Message(parser_e_illegal_expression);
-                      end;
+                    p1:=tpropositionsym(srsym).expr.getcopy
                   end;
                   end;
 
 
                 globalvarsym,
                 globalvarsym,

+ 0 - 4
compiler/scanner.pas

@@ -89,7 +89,6 @@ interface
           ignoredirectives : tstringlist; { ignore directives, used to give warnings only once }
           ignoredirectives : tstringlist; { ignore directives, used to give warnings only once }
           preprocstack   : tpreprocstack;
           preprocstack   : tpreprocstack;
           in_asm_string  : boolean;
           in_asm_string  : boolean;
-          in_formal_annotation : boolean;
 
 
           preproc_pattern : string;
           preproc_pattern : string;
           preproc_token   : ttoken;
           preproc_token   : ttoken;
@@ -1688,7 +1687,6 @@ In case not, the value returned can be arbitrary.
         lastasmgetchar:=#0;
         lastasmgetchar:=#0;
         ignoredirectives:=TStringList.Create;
         ignoredirectives:=TStringList.Create;
         in_asm_string:=false;
         in_asm_string:=false;
-        in_formal_annotation:=false;
       end;
       end;
 
 
 
 
@@ -2745,7 +2743,6 @@ In case not, the value returned can be arbitrary.
               dec_comment_level;
               dec_comment_level;
               readchar;
               readchar;
               nexttoken:=_OPEN_FORMAL;
               nexttoken:=_OPEN_FORMAL;
-              in_formal_annotation:=true;
               exit;
               exit;
             end;
             end;
          end;
          end;
@@ -3002,7 +2999,6 @@ In case not, the value returned can be arbitrary.
                   begin
                   begin
                     readchar;
                     readchar;
                     token:=_CLOSE_FORMAL;
                     token:=_CLOSE_FORMAL;
-                    in_formal_annotation:=false;
                     goto exit_label;
                     goto exit_label;
                   end
                   end
                  else
                  else