vishapoberon/compiler
1
0
Fork 0
mirror of https://github.com/vishapoberon/compiler.git synced 2026-04-06 05:12:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include Int and Set type size in symbol fingerprint.

Browse source
This commit is contained in:
David Brown 2016-11-13 20:35:53 +00:00
parent 716240bdd6
commit bb143a6162
197 changed files with 297 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/compiler/Compiler.Mod
View file

@ -54,7 +54,12 @@ MODULE Compiler; (* J. Templ 3.2.95 *)
VAR adrinttyp: OPT.Struct;
BEGIN
OPT.sysptrtyp.size := OPM.AddressSize;
OPT.adrtyp.size := OPM.AddressSize;
OPT.sysptrtyp.idfp := OPT.sysptrtyp.form;
OPM.FPrint(OPT.sysptrtyp.idfp, OPT.sysptrtyp.size);
OPT.adrtyp.size := OPM.AddressSize;
OPT.adrtyp.idfp := OPT.adrtyp.form;
OPM.FPrint(OPT.adrtyp.idfp, OPT.adrtyp.size);
adrinttyp := OPT.IntType(OPM.AddressSize);
OPT.adrtyp.strobj := adrinttyp.strobj;

38
src/compiler/OPT.Mod
View file

@ -83,7 +83,7 @@ TYPE
allocated*: BOOLEAN;
pbused*, pvused*: BOOLEAN;
fpdone, idfpdone: BOOLEAN;
idfp, pbfp, pvfp: LONGINT;
idfp*, pbfp, pvfp: LONGINT;
BaseTyp*: Struct;
link*, strobj*: Object
END;
@ -515,21 +515,23 @@ END FPrintSign;
PROCEDURE IdFPrint*(typ: Struct); (* idfp codifies assignment compatibility *)
VAR btyp: Struct; strobj: Object; idfp: LONGINT; f, c: INTEGER;
BEGIN
IF ~typ^.idfpdone THEN
typ^.idfpdone := TRUE; (* may be recursive, temporary idfp is 0 in that case *)
idfp := 0; f := typ^.form; c := typ^.comp; OPM.FPrint(idfp, f); OPM.FPrint(idfp, c);
btyp := typ^.BaseTyp; strobj := typ^.strobj;
IF (strobj # NIL) & (strobj^.name # "") THEN
FPrintName(idfp, GlbMod[typ^.mno]^.name); FPrintName(idfp, strobj^.name)
END;
IF (f = Pointer) OR (c = Record) & (btyp # NIL) OR (c = DynArr) THEN
IdFPrint(btyp); OPM.FPrint(idfp, btyp^.idfp)
ELSIF c = Array THEN
IdFPrint(btyp); OPM.FPrint(idfp, btyp^.idfp); OPM.FPrint(idfp, typ^.n)
ELSIF f = ProcTyp THEN FPrintSign(idfp, btyp, typ^.link)
END;
typ^.idfp := idfp
END
IF ~typ^.idfpdone THEN
typ^.idfpdone := TRUE; (* may be recursive, temporary idfp is 0 in that case *)
idfp := 0;
f := typ^.form; OPM.FPrint(idfp, f); IF f IN {Int, Set} THEN OPM.FPrint(idfp, typ.size) END;
c := typ^.comp; OPM.FPrint(idfp, c);
btyp := typ^.BaseTyp; strobj := typ^.strobj;
IF (strobj # NIL) & (strobj^.name # "") THEN
FPrintName(idfp, GlbMod[typ^.mno]^.name); FPrintName(idfp, strobj^.name)
END;
IF (f = Pointer) OR (c = Record) & (btyp # NIL) OR (c = DynArr) THEN
IdFPrint(btyp); OPM.FPrint(idfp, btyp^.idfp)
ELSIF c = Array THEN
IdFPrint(btyp); OPM.FPrint(idfp, btyp^.idfp); OPM.FPrint(idfp, typ^.n)
ELSIF f = ProcTyp THEN FPrintSign(idfp, btyp, typ^.link)
END;
typ^.idfp := idfp
END
END IdFPrint;
PROCEDURE FPrintStr*(typ: Struct);
@ -1275,7 +1277,9 @@ END Import;
typ := NewStr(form, Basic); obj^.mode := Typ; obj^.typ := typ; obj^.vis := external;
typ^.strobj := obj; typ^.size := size; typ^.ref := form; typ^.allocated := TRUE;
typ^.pbfp := form; typ^.pvfp := form; typ^.fpdone := TRUE;
typ^.idfp := form; typ^.idfpdone := TRUE; res := typ
typ^.idfp := form; typ^.idfpdone := TRUE;
IF form IN {Int, Set} THEN OPM.FPrint(typ.idfp, typ.size) END;
res := typ
END EnterTyp;
PROCEDURE EnterTypeAlias(name: OPS.Name; VAR res: Object);