diff options
| author | Gaius Mulley <gaiusmod2@gmail.com> | 2022-12-05 17:43:07 +0000 |
|---|---|---|
| committer | Gaius Mulley <gaiusmod2@gmail.com> | 2022-12-05 17:43:07 +0000 |
| commit | 60035bdefe5241548b41c3ac236b1c9feb9bf182 (patch) | |
| tree | 183305809b79eac92e95a5e17305a97c94b16ecc /gcc | |
| parent | 14e295ecf043c7bdf26cca3aa6af104382324aeb (diff) | |
| download | gcc-60035bdefe5241548b41c3ac236b1c9feb9bf182.zip gcc-60035bdefe5241548b41c3ac236b1c9feb9bf182.tar.gz gcc-60035bdefe5241548b41c3ac236b1c9feb9bf182.tar.bz2 | |
Tidy up removing unused procedure, add missing include and error token.
Some minor tidy ups which remove an unused procedure, add a missing
include header file and use a different token for the production of
error messages.
libgm2/ChangeLog:
* libgm2/libm2min/libc.c: Add include stdlib.h.
gcc/m2/ChangeLog:
* gm2-compiler/M2Quads.mod (CheckInCompatible): Removed usused
procedure. (CheckVariableOrConstantOrProcedure) use destok when
generating an error about the designator.
* gm2-compiler/PHBuild.bnf (ModuleDeclaration): Remove unused
variable endt.
Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/m2/gm2-compiler/M2Quads.mod | 24 | ||||
| -rw-r--r-- | gcc/m2/gm2-compiler/PHBuild.bnf | 3 |
2 files changed, 2 insertions, 25 deletions
diff --git a/gcc/m2/gm2-compiler/M2Quads.mod b/gcc/m2/gm2-compiler/M2Quads.mod index 88a7e7a..cbd4a97 100644 --- a/gcc/m2/gm2-compiler/M2Quads.mod +++ b/gcc/m2/gm2-compiler/M2Quads.mod @@ -3552,7 +3552,7 @@ BEGIN ((DesT#NulSym) AND (NOT IsProcType(DesT))) AND ((DesL#NulSym) AND (NOT IsProcType(DesL))) THEN - MetaErrorT1 (combinedtok, + MetaErrorT1 (destok, 'incorrectly assigning a procedure to a designator {%1Ead} (designator is not a procedure type, {%1ast})', Des) ELSIF IsProcedure (Exp) AND IsProcedureNested (Exp) THEN @@ -12766,28 +12766,6 @@ END CheckVariableOrConstantOrProcedure ; (* - CheckInCompatible - checks to see that t1 IN t2 is type legal. -*) - -PROCEDURE CheckInCompatible (Op: Name; t1, t2: CARDINAL) : CARDINAL ; -BEGIN - IF Op = InTok - THEN - t2 := SkipType (t2) ; - IF IsSet (t2) - THEN - RETURN GetSType (t2) - ELSE - MetaError1 ('expect a set type as the right hand operand to the {%kIN} operator, the type attempting to be used with the {%kIN} is {%1Ead}', t2) ; - RETURN t1 - END - ELSE - RETURN t2 - END -END CheckInCompatible ; - - -(* BuildRelOp - Builds a relative operation from the quad stack. The Stack is expected to contain: diff --git a/gcc/m2/gm2-compiler/PHBuild.bnf b/gcc/m2/gm2-compiler/PHBuild.bnf index ad4777c..7cb9742 100644 --- a/gcc/m2/gm2-compiler/PHBuild.bnf +++ b/gcc/m2/gm2-compiler/PHBuild.bnf @@ -1188,7 +1188,7 @@ DefOptArg := "[" Ident ":" FormalType "=" SilentConstExpression "]" =: FormalType := { "ARRAY" "OF" } Qualident =: -ModuleDeclaration := % VAR begint, endt: CARDINAL ; % +ModuleDeclaration := % VAR begint: CARDINAL ; % % begint := GetTokenNo () % "MODULE" % M2Error.DefaultInnerModule % % PushAutoOn % @@ -1201,7 +1201,6 @@ ModuleDeclaration := % VAR } [ Export ] Block % PushAutoOn % - % endt := GetTokenNo () -1 % Ident % EndBuildInnerModule % % PopAuto ; PopAuto ; PopAuto % =: |