From 159f5a3d80d05fdc68aee23ff2fffb2d51661a65 Mon Sep 17 00:00:00 2001 From: David Brown Date: Thu, 1 Sep 2016 12:04:17 +0100 Subject: [PATCH] Update bootstrap source and snapshot binaries --- bootstrap/unix-44/Configuration.c | 4 +- bootstrap/unix-44/Configuration.h | 2 +- bootstrap/unix-44/Console.c | 2 +- bootstrap/unix-44/Console.h | 2 +- bootstrap/unix-44/Files.c | 2 +- bootstrap/unix-44/Files.h | 2 +- bootstrap/unix-44/Heap.c | 2 +- bootstrap/unix-44/Heap.h | 2 +- bootstrap/unix-44/Modules.c | 2 +- bootstrap/unix-44/Modules.h | 2 +- bootstrap/unix-44/OPB.c | 366 +++++++++++----------- bootstrap/unix-44/OPB.h | 2 +- bootstrap/unix-44/OPC.c | 68 ++-- bootstrap/unix-44/OPC.h | 2 +- bootstrap/unix-44/OPM.c | 2 +- bootstrap/unix-44/OPM.h | 2 +- bootstrap/unix-44/OPP.c | 52 +-- bootstrap/unix-44/OPP.h | 2 +- bootstrap/unix-44/OPS.c | 2 +- bootstrap/unix-44/OPS.h | 2 +- bootstrap/unix-44/OPT.c | 132 ++++---- bootstrap/unix-44/OPT.h | 2 +- bootstrap/unix-44/OPV.c | 74 ++--- bootstrap/unix-44/OPV.h | 2 +- bootstrap/unix-44/Platform.c | 2 +- bootstrap/unix-44/Platform.h | 2 +- bootstrap/unix-44/Reals.c | 2 +- bootstrap/unix-44/Reals.h | 2 +- bootstrap/unix-44/Strings.c | 2 +- bootstrap/unix-44/Strings.h | 2 +- bootstrap/unix-44/Texts.c | 2 +- bootstrap/unix-44/Texts.h | 2 +- bootstrap/unix-44/Vishap.c | 2 +- bootstrap/unix-44/errors.c | 2 +- bootstrap/unix-44/errors.h | 2 +- bootstrap/unix-44/extTools.c | 2 +- bootstrap/unix-44/extTools.h | 2 +- bootstrap/unix-44/vt100.c | 2 +- bootstrap/unix-44/vt100.h | 2 +- bootstrap/unix-48/Configuration.c | 4 +- bootstrap/unix-48/Configuration.h | 2 +- bootstrap/unix-48/Console.c | 2 +- bootstrap/unix-48/Console.h | 2 +- bootstrap/unix-48/Files.c | 2 +- bootstrap/unix-48/Files.h | 2 +- bootstrap/unix-48/Heap.c | 2 +- bootstrap/unix-48/Heap.h | 2 +- bootstrap/unix-48/Modules.c | 2 +- bootstrap/unix-48/Modules.h | 2 +- bootstrap/unix-48/OPB.c | 366 +++++++++++----------- bootstrap/unix-48/OPB.h | 2 +- bootstrap/unix-48/OPC.c | 68 ++-- bootstrap/unix-48/OPC.h | 2 +- bootstrap/unix-48/OPM.c | 2 +- bootstrap/unix-48/OPM.h | 2 +- bootstrap/unix-48/OPP.c | 52 +-- bootstrap/unix-48/OPP.h | 2 +- bootstrap/unix-48/OPS.c | 2 +- bootstrap/unix-48/OPS.h | 2 +- bootstrap/unix-48/OPT.c | 132 ++++---- bootstrap/unix-48/OPT.h | 2 +- bootstrap/unix-48/OPV.c | 74 ++--- bootstrap/unix-48/OPV.h | 2 +- bootstrap/unix-48/Platform.c | 2 +- bootstrap/unix-48/Platform.h | 2 +- bootstrap/unix-48/Reals.c | 2 +- bootstrap/unix-48/Reals.h | 2 +- bootstrap/unix-48/Strings.c | 2 +- bootstrap/unix-48/Strings.h | 2 +- bootstrap/unix-48/Texts.c | 2 +- bootstrap/unix-48/Texts.h | 2 +- bootstrap/unix-48/Vishap.c | 2 +- bootstrap/unix-48/errors.c | 2 +- bootstrap/unix-48/errors.h | 2 +- bootstrap/unix-48/extTools.c | 2 +- bootstrap/unix-48/extTools.h | 2 +- bootstrap/unix-48/vt100.c | 2 +- bootstrap/unix-48/vt100.h | 2 +- bootstrap/unix-88/Configuration.c | 4 +- bootstrap/unix-88/Configuration.h | 2 +- bootstrap/unix-88/Console.c | 2 +- bootstrap/unix-88/Console.h | 2 +- bootstrap/unix-88/Files.c | 2 +- bootstrap/unix-88/Files.h | 2 +- bootstrap/unix-88/Heap.c | 2 +- bootstrap/unix-88/Heap.h | 2 +- bootstrap/unix-88/Modules.c | 2 +- bootstrap/unix-88/Modules.h | 2 +- bootstrap/unix-88/OPB.c | 366 +++++++++++----------- bootstrap/unix-88/OPB.h | 2 +- bootstrap/unix-88/OPC.c | 68 ++-- bootstrap/unix-88/OPC.h | 2 +- bootstrap/unix-88/OPM.c | 2 +- bootstrap/unix-88/OPM.h | 2 +- bootstrap/unix-88/OPP.c | 52 +-- bootstrap/unix-88/OPP.h | 2 +- bootstrap/unix-88/OPS.c | 2 +- bootstrap/unix-88/OPS.h | 2 +- bootstrap/unix-88/OPT.c | 132 ++++---- bootstrap/unix-88/OPT.h | 2 +- bootstrap/unix-88/OPV.c | 74 ++--- bootstrap/unix-88/OPV.h | 2 +- bootstrap/unix-88/Platform.c | 2 +- bootstrap/unix-88/Platform.h | 2 +- bootstrap/unix-88/Reals.c | 2 +- bootstrap/unix-88/Reals.h | 2 +- bootstrap/unix-88/Strings.c | 2 +- bootstrap/unix-88/Strings.h | 2 +- bootstrap/unix-88/Texts.c | 2 +- bootstrap/unix-88/Texts.h | 2 +- bootstrap/unix-88/Vishap.c | 2 +- bootstrap/unix-88/errors.c | 2 +- bootstrap/unix-88/errors.h | 2 +- bootstrap/unix-88/extTools.c | 2 +- bootstrap/unix-88/extTools.h | 2 +- bootstrap/unix-88/vt100.c | 2 +- bootstrap/unix-88/vt100.h | 2 +- bootstrap/windows-48/Configuration.c | 4 +- bootstrap/windows-48/Configuration.h | 2 +- bootstrap/windows-48/Console.c | 2 +- bootstrap/windows-48/Console.h | 2 +- bootstrap/windows-48/Files.c | 2 +- bootstrap/windows-48/Files.h | 2 +- bootstrap/windows-48/Heap.c | 2 +- bootstrap/windows-48/Heap.h | 2 +- bootstrap/windows-48/Modules.c | 2 +- bootstrap/windows-48/Modules.h | 2 +- bootstrap/windows-48/OPB.c | 366 +++++++++++----------- bootstrap/windows-48/OPB.h | 2 +- bootstrap/windows-48/OPC.c | 68 ++-- bootstrap/windows-48/OPC.h | 2 +- bootstrap/windows-48/OPM.c | 2 +- bootstrap/windows-48/OPM.h | 2 +- bootstrap/windows-48/OPP.c | 52 +-- bootstrap/windows-48/OPP.h | 2 +- bootstrap/windows-48/OPS.c | 2 +- bootstrap/windows-48/OPS.h | 2 +- bootstrap/windows-48/OPT.c | 132 ++++---- bootstrap/windows-48/OPT.h | 2 +- bootstrap/windows-48/OPV.c | 74 ++--- bootstrap/windows-48/OPV.h | 2 +- bootstrap/windows-48/Platform.c | 2 +- bootstrap/windows-48/Platform.h | 2 +- bootstrap/windows-48/Reals.c | 2 +- bootstrap/windows-48/Reals.h | 2 +- bootstrap/windows-48/Strings.c | 2 +- bootstrap/windows-48/Strings.h | 2 +- bootstrap/windows-48/Texts.c | 2 +- bootstrap/windows-48/Texts.h | 2 +- bootstrap/windows-48/Vishap.c | 2 +- bootstrap/windows-48/errors.c | 2 +- bootstrap/windows-48/errors.h | 2 +- bootstrap/windows-48/extTools.c | 2 +- bootstrap/windows-48/extTools.h | 2 +- bootstrap/windows-48/vt100.c | 2 +- bootstrap/windows-48/vt100.h | 2 +- bootstrap/windows-88/Configuration.c | 4 +- bootstrap/windows-88/Configuration.h | 2 +- bootstrap/windows-88/Console.c | 2 +- bootstrap/windows-88/Console.h | 2 +- bootstrap/windows-88/Files.c | 2 +- bootstrap/windows-88/Files.h | 2 +- bootstrap/windows-88/Heap.c | 2 +- bootstrap/windows-88/Heap.h | 2 +- bootstrap/windows-88/Modules.c | 2 +- bootstrap/windows-88/Modules.h | 2 +- bootstrap/windows-88/OPB.c | 366 +++++++++++----------- bootstrap/windows-88/OPB.h | 2 +- bootstrap/windows-88/OPC.c | 68 ++-- bootstrap/windows-88/OPC.h | 2 +- bootstrap/windows-88/OPM.c | 2 +- bootstrap/windows-88/OPM.h | 2 +- bootstrap/windows-88/OPP.c | 52 +-- bootstrap/windows-88/OPP.h | 2 +- bootstrap/windows-88/OPS.c | 2 +- bootstrap/windows-88/OPS.h | 2 +- bootstrap/windows-88/OPT.c | 132 ++++---- bootstrap/windows-88/OPT.h | 2 +- bootstrap/windows-88/OPV.c | 74 ++--- bootstrap/windows-88/OPV.h | 2 +- bootstrap/windows-88/Platform.c | 2 +- bootstrap/windows-88/Platform.h | 2 +- bootstrap/windows-88/Reals.c | 2 +- bootstrap/windows-88/Reals.h | 2 +- bootstrap/windows-88/Strings.c | 2 +- bootstrap/windows-88/Strings.h | 2 +- bootstrap/windows-88/Texts.c | 2 +- bootstrap/windows-88/Texts.h | 2 +- bootstrap/windows-88/Vishap.c | 2 +- bootstrap/windows-88/errors.c | 2 +- bootstrap/windows-88/errors.h | 2 +- bootstrap/windows-88/extTools.c | 2 +- bootstrap/windows-88/extTools.h | 2 +- bootstrap/windows-88/vt100.c | 2 +- bootstrap/windows-88/vt100.h | 2 +- src/test/confidence/planned-binary-change | 2 +- 196 files changed, 1906 insertions(+), 1906 deletions(-) diff --git a/bootstrap/unix-44/Configuration.c b/bootstrap/unix-44/Configuration.c index eed3c4f0..fb7df026 100644 --- a/bootstrap/unix-44/Configuration.c +++ b/bootstrap/unix-44/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" @@ -13,6 +13,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/08/31] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/01] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/unix-44/Configuration.h b/bootstrap/unix-44/Configuration.h index 90696149..61b33bc5 100644 --- a/bootstrap/unix-44/Configuration.h +++ b/bootstrap/unix-44/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/unix-44/Console.c b/bootstrap/unix-44/Console.c index 124f7163..816df1b9 100644 --- a/bootstrap/unix-44/Console.c +++ b/bootstrap/unix-44/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Platform.h" diff --git a/bootstrap/unix-44/Console.h b/bootstrap/unix-44/Console.h index fad0f676..2c01265d 100644 --- a/bootstrap/unix-44/Console.h +++ b/bootstrap/unix-44/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/unix-44/Files.c b/bootstrap/unix-44/Files.c index a6db1a11..bd3e3fd5 100644 --- a/bootstrap/unix-44/Files.c +++ b/bootstrap/unix-44/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "Console.h" diff --git a/bootstrap/unix-44/Files.h b/bootstrap/unix-44/Files.h index 61089cbd..985572ec 100644 --- a/bootstrap/unix-44/Files.h +++ b/bootstrap/unix-44/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/unix-44/Heap.c b/bootstrap/unix-44/Heap.c index f35765c6..50d17d87 100644 --- a/bootstrap/unix-44/Heap.c +++ b/bootstrap/unix-44/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #include "SYSTEM.h" struct Heap__1 { diff --git a/bootstrap/unix-44/Heap.h b/bootstrap/unix-44/Heap.h index 4d5c5b4e..a4e30a5e 100644 --- a/bootstrap/unix-44/Heap.h +++ b/bootstrap/unix-44/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/unix-44/Modules.c b/bootstrap/unix-44/Modules.c index 9f39f448..52abc5b8 100644 --- a/bootstrap/unix-44/Modules.c +++ b/bootstrap/unix-44/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Console.h" #include "Heap.h" diff --git a/bootstrap/unix-44/Modules.h b/bootstrap/unix-44/Modules.h index 1707868f..6bee52c7 100644 --- a/bootstrap/unix-44/Modules.h +++ b/bootstrap/unix-44/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/unix-44/OPB.c b/bootstrap/unix-44/OPB.c index e6e966a6..a3322969 100644 --- a/bootstrap/unix-44/OPB.c +++ b/bootstrap/unix-44/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPM.h" #include "OPS.h" @@ -317,7 +317,7 @@ void OPB_DeRef (OPT_Node *x) typ = (*x)->typ; if ((*x)->class >= 7) { OPB_err(78); - } else if (typ->form == 13) { + } else if (typ->form == 11) { if (typ == OPT_sysptrtyp) { OPB_err(57); } @@ -340,7 +340,7 @@ void OPB_Index (OPT_Node *x, OPT_Node y) f = y->typ->form; if ((*x)->class >= 7) { OPB_err(79); - } else if (f != 5 || __IN(y->class, 0x0300)) { + } else if (f != 4 || __IN(y->class, 0x0300)) { OPB_err(80); y->typ = OPT_inttyp; } @@ -437,10 +437,10 @@ void OPB_TypTest (OPT_Node *x, OPT_Object obj, BOOLEAN guard) TypTest__57_s = &_s; if (OPB_NotVar(*x)) { OPB_err(112); - } else if ((*x)->typ->form == 13) { + } else if ((*x)->typ->form == 11) { if (((*x)->typ->BaseTyp->comp != 4 && (*x)->typ != OPT_sysptrtyp)) { OPB_err(85); - } else if (obj->typ->form == 13) { + } else if (obj->typ->form == 11) { GTT__58((*x)->typ->BaseTyp, obj->typ->BaseTyp); } else { OPB_err(86); @@ -465,7 +465,7 @@ void OPB_In (OPT_Node *x, OPT_Node y) f = (*x)->typ->form; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if ((f == 5 && y->typ->form == 9)) { + } else if ((f == 4 && y->typ->form == 7)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (k < 0 || k > OPM_MaxSet) { @@ -504,7 +504,7 @@ static LONGINT OPB_log (LONGINT x) static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) { LONGREAL min, max, r; - if (f == 7) { + if (f == 5) { min = OPM_MinReal; max = OPM_MaxReal; } else { @@ -515,7 +515,7 @@ static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) if (r > max || r < min) { OPB_err(nr); x->realval = (LONGREAL)1; - } else if (f == 7) { + } else if (f == 5) { x->realval = x->realval; } x->intval = -1; @@ -567,21 +567,21 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 6: - if (!__IN(f, 0x01a0)) { + if (!__IN(f, 0x70)) { OPB_err(96); } break; case 7: - if (__IN(f, 0x03a0)) { + if (__IN(f, 0xf0)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-2147483647-1)) { OPB_err(203); } else { z->conval->intval = -z->conval->intval; OPB_SetIntType(z); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { z->conval->realval = -z->conval->realval; } else { z->conval->setval = ~z->conval->setval; @@ -595,9 +595,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 21: - if (__IN(f, 0x01a0)) { + if (__IN(f, 0x70)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-2147483647-1)) { OPB_err(203); } else { @@ -629,7 +629,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 23: - if (f == 5) { + if (f == 4) { if (z->class == 7) { z->conval->intval = OPB_BoolToInt(__ODD(z->conval->intval)); z->obj = NIL; @@ -644,9 +644,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) case 24: if ((((z->class == 7 && f == 3)) && z->conval->intval >= 32)) { OPB_CharToString(z); - f = 10; + f = 8; } - if (z->class < 7 || f == 10) { + if (z->class < 7 || f == 8) { z = NewOp__29(op, typ, z); } else { OPB_err(127); @@ -654,7 +654,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) z->typ = OPT_linttyp; break; case 25: - if ((f == 5 && z->class == 7)) { + if ((f == 4 && z->class == 7)) { if ((0 <= z->conval->intval && z->conval->intval <= -1)) { z = NewOp__29(op, typ, z); } else { @@ -681,7 +681,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) INTEGER g; OPT_Struct p = NIL, q = NIL, t = NIL; g = y->typ->form; - if (g == 13) { + if (g == 11) { p = x->typ->BaseTyp; q = y->typ->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -699,7 +699,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) } else { OPB_err(100); } - } else if (g != 11) { + } else if (g != 9) { OPB_err(100); } } @@ -716,7 +716,7 @@ void OPB_CheckParameters (OPT_Object fp, OPT_Object ap, BOOLEAN checkNames) at = at->BaseTyp; } if (ft != at) { - if ((ft->form == 14 && at->form == 14)) { + if ((ft->form == 12 && at->form == 12)) { if (ft->BaseTyp == at->BaseTyp) { OPB_CheckParameters(ft->link, at->link, 0); } else { @@ -777,7 +777,7 @@ static INTEGER ConstCmp__14 (void) case 0: res = 9; break; - case 1: case 3: case 4: case 5: + case 1: case 3: case 4: if ((*ConstOp__13_s->xval)->intval < (*ConstOp__13_s->yval)->intval) { res = 11; } else if ((*ConstOp__13_s->xval)->intval > (*ConstOp__13_s->yval)->intval) { @@ -786,7 +786,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 7: case 8: + case 5: case 6: if ((*ConstOp__13_s->xval)->realval < (*ConstOp__13_s->yval)->realval) { res = 11; } else if ((*ConstOp__13_s->xval)->realval > (*ConstOp__13_s->yval)->realval) { @@ -802,14 +802,14 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 9: + case 7: if ((*ConstOp__13_s->xval)->setval != (*ConstOp__13_s->yval)->setval) { res = 10; } else { res = 9; } break; - case 10: + case 8: if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) < 0) { res = 11; } else if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) > 0) { @@ -818,7 +818,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 11: case 13: case 14: + case 9: case 11: case 12: if ((*ConstOp__13_s->xval)->intval != (*ConstOp__13_s->yval)->intval) { res = 10; } else { @@ -856,7 +856,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) if (f != g) { switch (f) { case 3: - if (g == 10) { + if (g == 8) { OPB_CharToString(x); } else { OPB_err(100); @@ -864,17 +864,17 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 5: - if (g == 5) { + case 4: + if (g == 4) { if (x->typ->size <= y->typ->size) { x->typ = y->typ; } else { x->typ = OPT_IntType(x->typ->size); } - } else if (g == 7) { + } else if (g == 5) { x->typ = OPT_realtyp; xval->realval = xval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; xval->realval = xval->intval; } else { @@ -883,11 +883,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 7: - if (g == 5) { + case 5: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; } else { OPB_err(100); @@ -895,11 +895,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 8: - if (g == 5) { + case 6: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 7) { + } else if (g == 5) { y->typ = OPT_lrltyp; } else { OPB_err(100); @@ -907,26 +907,26 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 10: + case 8: if (g == 3) { OPB_CharToString(y); - g = 10; + g = 8; } else { OPB_err(100); y->typ = x->typ; __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 11: - if (!__IN(g, 0x6000)) { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; - case 13: + case 11: OPB_CheckPtr(x, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; @@ -940,7 +940,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } switch (op) { case 1: - if (f == 5) { + if (f == 4) { xv = xval->intval; yv = yval->intval; if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(2147483647, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-2147483647-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-2147483647-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-2147483647-1))) && yv != (-2147483647-1))) && -xv <= __DIV(2147483647, -yv))) { @@ -949,7 +949,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) <= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 / (LONGREAL)__ABS(yval->realval)) { xval->realval = xval->realval * yval->realval; @@ -957,23 +957,23 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & yval->setval); } else if (f != 0) { OPB_err(101); } break; case 2: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->realval = xval->intval / (REAL)yval->intval; - OPB_CheckRealType(7, 205, xval); + OPB_CheckRealType(5, 205, xval); } else { OPB_err(205); xval->realval = (LONGREAL)1; } x->typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) >= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 * __ABS(yval->realval)) { xval->realval = xval->realval / yval->realval; @@ -981,14 +981,14 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(205); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval ^ yval->setval; } else if (f != 0) { OPB_err(102); } break; case 3: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = __DIV(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1000,7 +1000,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = (int)__MOD(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1019,7 +1019,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 6: - if (f == 5) { + if (f == 4) { temp = (yval->intval >= 0 && xval->intval <= 2147483647 - yval->intval); if (temp || (yval->intval < 0 && xval->intval >= (-2147483647-1) - yval->intval)) { xval->intval += yval->intval; @@ -1027,7 +1027,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 - yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 - yval->realval)) { xval->realval = xval->realval + yval->realval; @@ -1035,21 +1035,21 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval | yval->setval; } else if (f != 0) { OPB_err(105); } break; case 7: - if (f == 5) { + if (f == 4) { if ((yval->intval >= 0 && xval->intval >= (-2147483647-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 2147483647 + yval->intval)) { xval->intval -= yval->intval; OPB_SetIntType(x); } else { OPB_err(207); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 + yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 + yval->realval)) { xval->realval = xval->realval - yval->realval; @@ -1057,7 +1057,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(207); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & ~yval->setval); } else if (f != 0) { OPB_err(106); @@ -1077,28 +1077,28 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) xval->intval = OPB_BoolToInt(ConstCmp__14() != 9); break; case 11: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 11); } break; case 12: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 13); } break; case 13: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 13); } break; case 14: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 11); @@ -1122,8 +1122,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) f = (*x)->typ->form; g = typ->form; if ((*x)->class == 7) { - if (f == 5) { - if (g == 5) { + if (f == 4) { + if (g == 4) { if (f > g) { OPB_SetIntType(*x); if ((*x)->typ->size > typ->size) { @@ -1131,7 +1131,7 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) (*x)->conval->intval = 1; } } - } else if (__IN(g, 0x0180)) { + } else if (__IN(g, 0x60)) { (*x)->conval->realval = (*x)->conval->intval; (*x)->conval->intval = -1; } else { @@ -1140,8 +1140,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) OPB_err(220); } } - } else if (__IN(f, 0x0180)) { - if (__IN(g, 0x0180)) { + } else if (__IN(f, 0x60)) { + if (__IN(g, 0x60)) { OPB_CheckRealType(g, 203, (*x)->conval); } else { r = (*x)->conval->realval; @@ -1190,25 +1190,25 @@ static BOOLEAN strings__41 (OPT_Node *x, OPT_Node *y) { BOOLEAN _o_result; BOOLEAN ok, xCharArr, yCharArr; - xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 10; - yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 10; + xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 8; + yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 8; if ((((xCharArr && *Op__38_s->g == 3)) && (*y)->class == 7)) { OPB_CharToString(*y); - *Op__38_s->g = 10; + *Op__38_s->g = 8; yCharArr = 1; } if ((((yCharArr && *Op__38_s->f == 3)) && (*x)->class == 7)) { OPB_CharToString(*x); - *Op__38_s->f = 10; + *Op__38_s->f = 8; xCharArr = 1; } ok = (xCharArr && yCharArr); if (ok) { - if ((*Op__38_s->f == 10 && (*x)->conval->intval2 == 1)) { + if ((*Op__38_s->f == 8 && (*x)->conval->intval2 == 1)) { (*x)->typ = OPT_chartyp; (*x)->conval->intval = 0; OPB_Index(&*y, OPB_NewIntConst(0)); - } else if ((*Op__38_s->g == 10 && (*y)->conval->intval2 == 1)) { + } else if ((*Op__38_s->g == 8 && (*y)->conval->intval2 == 1)) { (*y)->typ = OPT_chartyp; (*y)->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); @@ -1247,49 +1247,49 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) OPB_err(100); } break; + case 4: + if ((g == 4 && y->typ->size < z->typ->size)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x70)) { + OPB_Convert(&z, y->typ); + } else { + OPB_err(100); + } + break; case 5: - if ((g == 5 && y->typ->size < z->typ->size)) { + if (g == 4) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x01a0)) { + } else if (__IN(g, 0x60)) { OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 7: - if (g == 5) { + case 6: + if (__IN(g, 0x70)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x60)) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 8: - if (__IN(g, 0x01a0)) { - OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&y, z->typ); - } else { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; case 11: - if (!__IN(g, 0x6000)) { - OPB_err(100); - } - break; - case 13: OPB_CheckPtr(z, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; - case 10: + case 8: break; - case 15: + case 13: if (z->typ->comp == 4) { OPB_err(100); } @@ -1305,7 +1305,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) switch (op) { case 1: do_ = 1; - if (f == 5) { + if (f == 4) { if (z->class == 7) { val = z->conval->intval; if (val == 1) { @@ -1336,7 +1336,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) y->obj = NIL; } } - } else if (!__IN(f, 0x0381)) { + } else if (!__IN(f, 0xe1)) { OPB_err(105); typ = OPT_undftyp; } @@ -1345,18 +1345,18 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 2: - if (f == 5) { + if (f == 4) { if ((y->class == 7 && y->conval->intval == 0)) { OPB_err(205); } OPB_Convert(&z, OPT_realtyp); OPB_Convert(&y, OPT_realtyp); typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { if ((y->class == 7 && y->conval->realval == (LONGREAL)0)) { OPB_err(205); } - } else if ((f != 9 && f != 0)) { + } else if ((f != 7 && f != 0)) { OPB_err(102); typ = OPT_undftyp; } @@ -1364,7 +1364,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) break; case 3: do_ = 1; - if (f == 5) { + if (f == 4) { if (y->class == 7) { val = y->conval->intval; if (val == 0) { @@ -1387,7 +1387,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (y->class == 7) { if (y->conval->intval == 0) { OPB_err(205); @@ -1419,12 +1419,12 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 6: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(105); typ = OPT_undftyp; } do_ = 1; - if (f == 5) { + if (f == 4) { if ((z->class == 7 && z->conval->intval == 0)) { do_ = 0; z = y; @@ -1438,11 +1438,11 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 7: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(106); typ = OPT_undftyp; } - if ((f != 5 || y->class != 7) || y->conval->intval != 0) { + if ((f != 4 || y->class != 7) || y->conval->intval != 0) { NewOp__39(op, typ, &z, y); } break; @@ -1462,7 +1462,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 9: case 10: - if (__IN(f, 0x6bff) || strings__41(&z, &y)) { + if (__IN(f, 0x1aff) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPB_err(107); @@ -1471,7 +1471,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) NewOp__39(op, typ, &z, y); break; case 11: case 12: case 13: case 14: - if (__IN(f, 0x01f9) || strings__41(&z, &y)) { + if (__IN(f, 0x79) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPM_LogWLn(); @@ -1498,7 +1498,7 @@ void OPB_SetRange (OPT_Node *x, OPT_Node y) LONGINT k, l; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if (((*x)->typ->form == 5 && y->typ->form == 5)) { + } else if (((*x)->typ->form == 4 && y->typ->form == 4)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (0 > k || k > OPM_MaxSet) { @@ -1533,7 +1533,7 @@ void OPB_SetElem (OPT_Node *x) LONGINT k; if ((*x)->class == 8 || (*x)->class == 9) { OPB_err(126); - } else if ((*x)->typ->form != 5) { + } else if ((*x)->typ->form != 4) { OPB_err(93); } else if ((*x)->class == 7) { k = (*x)->conval->intval; @@ -1576,40 +1576,40 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWNum(ynode->typ->size, 0); OPM_LogWLn(); } - if (ynode->class == 8 || (ynode->class == 9 && f != 14)) { + if (ynode->class == 8 || (ynode->class == 9 && f != 12)) { OPB_err(126); } switch (f) { - case 0: case 10: + case 0: case 8: break; case 1: - if (!((__IN(g, 0x2a) && y->size == 1))) { + if (!((__IN(g, 0x1a) && y->size == 1))) { OPB_err(113); } break; - case 2: case 3: case 9: + case 2: case 3: case 7: if (g != f) { OPB_err(113); } break; + case 4: + if (g != 4 || x->size < y->size) { + OPB_err(113); + } + break; case 5: - if (g != 5 || x->size < y->size) { + if (!__IN(g, 0x30)) { OPB_err(113); } break; - case 7: - if (!__IN(g, 0xe0)) { + case 6: + if (!__IN(g, 0x70)) { OPB_err(113); } break; - case 8: - if (!__IN(g, 0x01e0)) { - OPB_err(113); - } - break; - case 13: - if ((x == y || g == 11) || (x == OPT_sysptrtyp && g == 13)) { - } else if (g == 13) { + case 11: + if ((x == y || g == 9) || (x == OPT_sysptrtyp && g == 11)) { + } else if (g == 11) { p = x->BaseTyp; q = y->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -1626,28 +1626,28 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPB_err(113); } break; - case 14: + case 12: if (ynode->class == 9) { OPB_CheckProc(x, ynode->obj); - } else if (x == y || g == 11) { + } else if (x == y || g == 9) { } else { OPB_err(113); } break; - case 12: case 11: + case 10: case 9: OPB_err(113); break; - case 15: + case 13: x->pvused = 1; if (x->comp == 2) { if ((ynode->class == 7 && g == 3)) { OPB_CharToString(ynode); y = ynode->typ; - g = 10; + g = 8; } if (x == y) { } else if (x->BaseTyp == OPT_chartyp) { - if (g == 10) { + if (g == 8) { if (ynode->conval->intval2 > x->n) { OPB_err(114); } @@ -1686,7 +1686,7 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWLn(); break; } - if ((((((ynode->class == 7 && g < f)) && __IN(g, 0xe0))) && __IN(f, 0x01e0))) { + if ((((((ynode->class == 7 && g < f)) && __IN(g, 0x30))) && __IN(f, 0x70))) { OPB_Convert(&ynode, x); } } @@ -1704,7 +1704,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) f = x->typ->form; switch (fctno) { case 0: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); } else { @@ -1719,7 +1719,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) typ = OPT_notyp; if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { if (x->readonly) { OPB_err(76); } @@ -1757,7 +1757,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 5: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { OPB_Convert(&x, OPT_linttyp); } else { OPB_err(111); @@ -1777,17 +1777,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(0); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMinimum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(0); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MinReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MinLReal, OPT_lrltyp); break; default: @@ -1808,17 +1808,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(255); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMaximum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(OPM_MaxSet); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MaxReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MaxLReal, OPT_lrltyp); break; default: @@ -1832,7 +1832,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 9: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x21)) { + } else if (__IN(f, 0x11)) { OPB_Convert(&x, OPT_chartyp); } else { OPB_err(111); @@ -1842,14 +1842,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 10: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, -1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 8) { + } else if (f == 6) { OPB_Convert(&x, OPT_realtyp); } else { OPB_err(111); @@ -1858,14 +1858,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 11: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, 1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 7) { + } else if (f == 5) { OPB_Convert(&x, OPT_lrltyp); } else if (f == 3) { OPB_Convert(&x, OPT_linttyp); @@ -1876,7 +1876,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 13: case 14: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else if (x->readonly) { OPB_err(76); @@ -1900,18 +1900,18 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 18: if ((x->class == 7 && f == 3)) { OPB_CharToString(x); - f = 10; + f = 8; } if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 10)) { + } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 8)) { OPB_err(111); } break; case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if (x->typ->size != OPM_LIntSize) { OPB_Convert(&x, OPT_linttyp); } @@ -1928,7 +1928,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) if (x->class != 8) { OPB_err(110); x = OPB_NewIntConst(1); - } else if (__IN(f, 0x63fe) || __IN(x->typ->comp, 0x14)) { + } else if (__IN(f, 0x18fe) || __IN(x->typ->comp, 0x14)) { (*OPB_typSize)(x->typ); x->typ->pvused = 1; x = OPB_NewIntConst(x->typ->size); @@ -1943,22 +1943,22 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (!__IN(f, 0x022a)) { + } else if (!__IN(f, 0x9a)) { OPB_err(111); } break; case 24: case 25: case 28: case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } break; case 26: case 27: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if (x->conval->intval < 0 || x->conval->intval > -1) { OPB_err(220); } @@ -1969,14 +1969,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 29: if (x->class != 8) { OPB_err(110); - } else if (__IN(f, 0x1401) || x->typ->comp == 3) { + } else if (__IN(f, 0x0501) || x->typ->comp == 3) { OPB_err(111); } break; case 30: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { } else { OPB_err(111); } @@ -2036,7 +2036,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; } else { if (x->typ != p->typ) { - if ((x->class == 7 && f == 5)) { + if ((x->class == 7 && f == 4)) { OPB_Convert(&x, p->typ); } else { OPB_err(111); @@ -2049,7 +2049,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 15: case 16: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (0 > x->conval->intval || x->conval->intval > OPM_MaxSet))) { OPB_err(202); } @@ -2060,7 +2060,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; break; case 17: - if (!(f == 5) || x->class != 7) { + if (!(f == 4) || x->class != 7) { OPB_err(69); } else if (x->typ->size == 1) { L = (SYSTEM_INT16)x->conval->intval; @@ -2109,7 +2109,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((p->class == 7 && x->class == 7)) { if (-OPB_maxExp > x->conval->intval || x->conval->intval > OPB_maxExp) { OPB_err(208); @@ -2137,7 +2137,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) if (x->class == 8 || x->class == 9) { OPB_err(126); } else if (p->typ->comp == 3) { - if (f == 5) { + if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2153,7 +2153,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else { if (fctno == 22) { @@ -2167,7 +2167,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 24: case 25: case 26: case 27: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x63ff)) { + } else if (__IN(f, 0x18ff)) { if (fctno == 24 || fctno == 26) { if (OPB_NotVar(x)) { OPB_err(112); @@ -2185,7 +2185,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 28: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(12, 26, p, x); } else { OPB_err(111); @@ -2193,7 +2193,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_booltyp; break; case 29: - if (((x->class == 8 || x->class == 9) || __IN(f, 0x1401)) || x->typ->comp == 3) { + if (((x->class == 8 || x->class == 9) || __IN(f, 0x0501)) || x->typ->comp == 3) { OPB_err(126); } if (x->typ->size < p->typ->size) { @@ -2209,7 +2209,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 30: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(19, 30, p, x); } else { OPB_err(111); @@ -2219,16 +2219,16 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } p->link = x; break; case 32: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); x->conval = OPT_NewConst(); @@ -2271,7 +2271,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) OPB_err(126); } else if (p->typ->comp != 3) { OPB_err(64); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2287,7 +2287,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) } else if ((fctno == 31 && n == 2)) { if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { node = OPT_NewNode(19); node->subcl = 31; node->right = p; @@ -2375,7 +2375,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((fvarpar && ftyp == OPT_bytetyp)) { - if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x2e) && atyp->size == 1))) { + if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x1e) && atyp->size == 1))) { if (__IN(18, OPM_opt)) { OPB_err(-301); } @@ -2384,7 +2384,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa if (ftyp->comp == 3) { OPB_DynArrParCheck(ftyp, atyp, fvarpar); } else if (ftyp != atyp) { - if ((((!fvarpar && ftyp->form == 13)) && atyp->form == 13)) { + if ((((!fvarpar && ftyp->form == 11)) && atyp->form == 11)) { ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((ftyp->comp == 4 && atyp->comp == 4)) { @@ -2408,7 +2408,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa static void OPB_CheckReceiver (OPT_Node *x, OPT_Object fp) { - if (fp->typ->form == 13) { + if (fp->typ->form == 11) { if ((*x)->class == 3) { *x = (*x)->left; } else { @@ -2425,7 +2425,7 @@ void OPB_PrepCall (OPT_Node *x, OPT_Object *fpar) OPB_CheckReceiver(&(*x)->left, *fpar); *fpar = (*fpar)->link; } - } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 14)) { + } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 12)) { *fpar = (*x)->typ->link; } else { OPB_err(121); @@ -2457,17 +2457,17 @@ void OPB_Param (OPT_Node ap, OPT_Object fp) if (q == NIL) { OPB_err(111); } - } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 13)) { - } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x2e) && ap->typ->size == 1)))))) { + } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 11)) { + } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x1e) && ap->typ->size == 1)))))) { OPB_err(123); - } else if ((fp->typ->form == 13 && ap->class == 5)) { + } else if ((fp->typ->form == 11 && ap->class == 5)) { OPB_err(123); } } else if (fp->typ->comp == 3) { if ((ap->class == 7 && ap->typ->form == 3)) { OPB_CharToString(ap); } - if ((ap->typ->form == 10 && fp->typ->BaseTyp->form == 3)) { + if ((ap->typ->form == 8 && fp->typ->BaseTyp->form == 3)) { } else if (ap->class >= 7) { OPB_err(59); } else { @@ -2575,7 +2575,7 @@ void OPB_Assign (OPT_Node *x, OPT_Node y) OPB_BindNodes(6, (*x)->typ, &z, NIL); *x = z; } - } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 10)) && y->conval->intval2 == 1)) { + } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 8)) && y->conval->intval2 == 1)) { y->typ = OPT_chartyp; y->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); diff --git a/bootstrap/unix-44/OPB.h b/bootstrap/unix-44/OPB.h index 385a9146..97c4485c 100644 --- a/bootstrap/unix-44/OPB.h +++ b/bootstrap/unix-44/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/unix-44/OPC.c b/bootstrap/unix-44/OPC.c index 45784a13..9f818a4a 100644 --- a/bootstrap/unix-44/OPC.c +++ b/bootstrap/unix-44/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "OPM.h" @@ -227,12 +227,12 @@ static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause) if (__IN(typ->comp, 0x0c)) { OPC_Stars(typ->BaseTyp, &*openClause); *openClause = typ->comp == 2; - } else if (typ->form == 14) { + } else if (typ->form == 12) { OPM_Write('('); OPM_Write('*'); } else { pointers = 0; - while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 13)) { + while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 11)) { pointers += 1; typ = typ->BaseTyp; } @@ -277,16 +277,16 @@ static void OPC_DeclareObj (OPT_Object dcl, BOOLEAN scopeDef) for (;;) { form = typ->form; comp = typ->comp; - if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 12) || comp == 4) { + if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 10) || comp == 4) { break; - } else if ((form == 13 && typ->BaseTyp->comp != 3)) { + } else if ((form == 11 && typ->BaseTyp->comp != 3)) { openClause = 1; - } else if (form == 14 || __IN(comp, 0x0c)) { + } else if (form == 12 || __IN(comp, 0x0c)) { if (openClause) { OPM_Write(')'); openClause = 0; } - if (form == 14) { + if (form == 12) { if (OPC_ansi) { OPM_Write(')'); OPC_AnsiParamList(typ->link, 0); @@ -331,19 +331,19 @@ static void OPC_DeclareBase (OPT_Object dcl) LONGINT off, n, dummy; typ = dcl->typ; prev = typ; - while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 12)) && !((typ->form == 13 && typ->BaseTyp->comp == 3)))) { + while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 10)) && !((typ->form == 11 && typ->BaseTyp->comp == 3)))) { prev = typ; typ = typ->BaseTyp; } obj = typ->strobj; - if (typ->form == 12) { + if (typ->form == 10) { OPM_WriteString((CHAR*)"void", 5); } else if ((obj != NIL && !OPC_Undefined(obj))) { OPC_Ident(obj); } else if (typ->comp == 4) { OPM_WriteString((CHAR*)"struct ", 8); OPC_Andent(typ); - if ((prev->form != 13 && (obj != NIL || dcl->name[0] == 0x00))) { + if ((prev->form != 11 && (obj != NIL || dcl->name[0] == 0x00))) { if ((typ->BaseTyp != NIL && typ->BaseTyp->strobj->vis != 0)) { OPM_WriteString((CHAR*)" { /* ", 7); OPC_Ident(typ->BaseTyp->strobj); @@ -357,7 +357,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_FieldList(typ, 1, &off, &n, &dummy); OPC_EndBlk0(); } - } else if ((typ->form == 13 && typ->BaseTyp->comp == 3)) { + } else if ((typ->form == 11 && typ->BaseTyp->comp == 3)) { typ = typ->BaseTyp->BaseTyp; nofdims = 1; while (typ->comp == 3) { @@ -372,7 +372,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_BegStat(); __NEW(obj, OPT_ObjDesc); __NEW(obj->typ, OPT_StrDesc); - obj->typ->form = 15; + obj->typ->form = 13; obj->typ->comp = 2; obj->typ->n = 1; obj->typ->BaseTyp = typ; @@ -393,7 +393,7 @@ LONGINT OPC_NofPtrs (OPT_Struct typ) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { _o_result = 1; return _o_result; } else if ((typ->comp == 4 && __MASK(typ->sysflag, -256) == 0)) { @@ -435,7 +435,7 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, LONGINT adr, LONGINT *cnt) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n, i; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { OPM_WriteInt(adr); OPM_WriteString((CHAR*)", ", 3); *cnt += 1; @@ -540,7 +540,7 @@ static void OPC_DeclareParams (OPT_Object par, BOOLEAN macro) if (macro) { OPM_WriteStringVar((void*)par->name, 256); } else { - if ((par->mode == 1 && par->typ->form == 7)) { + if ((par->mode == 1 && par->typ->form == 5)) { OPM_Write('_'); } OPC_Ident(par); @@ -612,7 +612,7 @@ OPT_Object OPC_BaseTProc (OPT_Object obj) OPT_Struct typ = NIL, base = NIL; LONGINT mno; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } base = typ->BaseTyp; @@ -635,7 +635,7 @@ static void OPC_DefineTProcMacros (OPT_Object obj, BOOLEAN *empty) OPC_Ident(obj); OPC_DeclareParams(obj->link, 1); OPM_WriteString((CHAR*)" __SEND(", 9); - if (obj->link->typ->form == 13) { + if (obj->link->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPC_Ident(obj->link); OPM_Write(')'); @@ -673,7 +673,7 @@ static void OPC_DefineType (OPT_Struct str) if (obj == NIL || OPC_Undefined(obj)) { if (obj != NIL) { if (obj->linkadr == 1) { - if (str->form != 13) { + if (str->form != 11) { OPM_Mark(244, str->txtpos); obj->linkadr = 2; } @@ -692,13 +692,13 @@ static void OPC_DefineType (OPT_Struct str) } field = field->link; } - } else if (str->form == 13) { + } else if (str->form == 11) { if (str->BaseTyp->comp != 4) { OPC_DefineType(str->BaseTyp); } } else if (__IN(str->comp, 0x0c)) { OPC_DefineType(str->BaseTyp); - } else if (str->form == 14) { + } else if (str->form == 12) { if (str->BaseTyp != OPT_notyp) { OPC_DefineType(str->BaseTyp); } @@ -889,7 +889,7 @@ LONGINT OPC_BaseAlignment (OPT_Struct typ) { LONGINT _o_result; LONGINT alignment; - if (typ->form == 15) { + if (typ->form == 13) { if (typ->comp == 4) { alignment = __MASK(typ->align, -65536); } else { @@ -1017,7 +1017,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_WriteString((CHAR*)"export ", 8); } } - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_WriteString((CHAR*)"double", 7); } else { OPC_DeclareBase(obj); @@ -1026,7 +1026,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_Write(','); } OPM_Write(' '); - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_Write('_'); } OPC_DeclareObj(obj, vis == 3); @@ -1043,7 +1043,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; - } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 13)) { + } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 11)) { OPM_WriteString((CHAR*)" = NIL", 7); } } @@ -1380,7 +1380,7 @@ void OPC_GenEnumPtrs (OPT_Object var) OPC_BegBlk(); } OPC_BegStat(); - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"P(", 3); OPC_Ident(var); OPM_Write(')'); @@ -1399,7 +1399,7 @@ void OPC_GenEnumPtrs (OPT_Object var) n = n * typ->n; typ = typ->BaseTyp; } - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"__ENUMP(", 9); OPC_Ident(var); OPC_Str1((CHAR*)", #, P)", 8, n); @@ -1562,7 +1562,7 @@ void OPC_EnterProc (OPT_Object proc) if (!OPC_ansi) { var = proc->link; while (var != NIL) { - if ((var->typ->form == 7 && var->mode == 1)) { + if ((var->typ->form == 5 && var->mode == 1)) { OPC_BegStat(); OPC_Ident(var->typ->strobj); OPM_Write(' '); @@ -1878,7 +1878,7 @@ void OPC_Case (LONGINT caseVal, INTEGER form) case 3: OPC_CharacterLiteral(caseVal); break; - case 5: + case 4: OPM_WriteInt(caseVal); break; default: @@ -1976,16 +1976,16 @@ void OPC_Constant (OPT_Const con, INTEGER form) case 3: OPC_CharacterLiteral(con->intval); break; - case 5: + case 4: OPM_WriteInt(con->intval); break; - case 7: + case 5: OPM_WriteReal(con->realval, 'f'); break; - case 8: + case 6: OPM_WriteReal(con->realval, 0x00); break; - case 9: + case 7: OPM_WriteString((CHAR*)"0x", 3); skipLeading = 1; s = con->setval; @@ -2008,10 +2008,10 @@ void OPC_Constant (OPT_Const con, INTEGER form) OPM_Write('0'); } break; - case 10: + case 8: OPC_StringLiteral(*con->ext, 256, con->intval2 - 1); break; - case 11: + case 9: OPM_WriteString((CHAR*)"NIL", 4); break; default: diff --git a/bootstrap/unix-44/OPC.h b/bootstrap/unix-44/OPC.h index 4243328e..38f95afe 100644 --- a/bootstrap/unix-44/OPC.h +++ b/bootstrap/unix-44/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/unix-44/OPM.c b/bootstrap/unix-44/OPM.c index 979d9598..f2da0fed 100644 --- a/bootstrap/unix-44/OPM.c +++ b/bootstrap/unix-44/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "Console.h" diff --git a/bootstrap/unix-44/OPM.h b/bootstrap/unix-44/OPM.h index f93bcd98..15a980a6 100644 --- a/bootstrap/unix-44/OPM.h +++ b/bootstrap/unix-44/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/unix-44/OPP.c b/bootstrap/unix-44/OPP.c index b0e235d3..21c21350 100644 --- a/bootstrap/unix-44/OPP.c +++ b/bootstrap/unix-44/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPB.h" #include "OPM.h" @@ -136,7 +136,7 @@ static void OPP_CheckSysFlag (INTEGER *sysflag, INTEGER default_) OPP_err(135); } OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { sf = x->conval->intval; if (sf < 0 || sf > 1) { OPP_err(220); @@ -158,7 +158,7 @@ static void OPP_RecordType (OPT_Struct *typ, OPT_Struct *banned) OPT_Object fld = NIL, first = NIL, last = NIL, base = NIL; OPT_Struct ftyp = NIL; INTEGER sysflag; - *typ = OPT_NewStr(15, 4); + *typ = OPT_NewStr(13, 4); (*typ)->BaseTyp = NIL; OPP_CheckSysFlag(&sysflag, -1); if (OPP_sym == 30) { @@ -253,7 +253,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) INTEGER sysflag; OPP_CheckSysFlag(&sysflag, 0); if (OPP_sym == 25) { - *typ = OPT_NewStr(15, 3); + *typ = OPT_NewStr(13, 3); (*typ)->mno = 0; (*typ)->sysflag = sysflag; OPS_Get(&OPP_sym); @@ -265,10 +265,10 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) (*typ)->n = 0; } } else { - *typ = OPT_NewStr(15, 2); + *typ = OPT_NewStr(13, 2); (*typ)->sysflag = sysflag; OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { n = x->conval->intval; if (n <= 0 || n > OPM_MaxIndex) { OPP_err(63); @@ -301,7 +301,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) static void OPP_PointerType (OPT_Struct *typ) { OPT_Object id = NIL; - *typ = OPT_NewStr(13, 1); + *typ = OPT_NewStr(11, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); OPP_CheckSym(28); if (OPP_sym == 38) { @@ -409,7 +409,7 @@ static void OPP_FormalParameters (OPT_Object *firstPar, OPT_Struct *resTyp) if (OPP_sym == 38) { OPP_qualident(&res); if (res->mode == 5) { - if (res->typ->form < 15) { + if (res->typ->form < 13) { *resTyp = res->typ; } else { OPP_err(54); @@ -459,7 +459,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) OPP_PointerType(&*typ); } else if (OPP_sym == 61) { OPS_Get(&OPP_sym); - *typ = OPT_NewStr(14, 1); + *typ = OPT_NewStr(12, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); if (OPP_sym == 30) { OPS_Get(&OPP_sym); @@ -488,7 +488,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) static void OPP_Type (OPT_Struct *typ, OPT_Struct *banned) { OPP_TypeDecl(&*typ, &*banned); - if (((((*typ)->form == 13 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { + if (((((*typ)->form == 11 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { OPP_err(0); } } @@ -503,7 +503,7 @@ static void OPP_selector (OPT_Node *x) if (OPP_sym == 31) { OPS_Get(&OPP_sym); for (;;) { - if (((*x)->typ != NIL && (*x)->typ->form == 13)) { + if (((*x)->typ != NIL && (*x)->typ->form == 11)) { OPB_DeRef(&*x); } OPP_Expression(&y); @@ -521,7 +521,7 @@ static void OPP_selector (OPT_Node *x) __COPY(OPS_name, name, 256); OPS_Get(&OPP_sym); if ((*x)->typ != NIL) { - if ((*x)->typ->form == 13) { + if ((*x)->typ->form == 11) { OPB_DeRef(&*x); } if ((*x)->typ->comp == 4) { @@ -543,7 +543,7 @@ static void OPP_selector (OPT_Node *x) OPP_err(75); } typ = y->obj->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField((*x)->obj->name, typ->BaseTyp, &proc); @@ -572,7 +572,7 @@ static void OPP_selector (OPT_Node *x) } else if (OPP_sym == 17) { OPS_Get(&OPP_sym); OPB_DeRef(&*x); - } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 14)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { + } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 12)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&obj); @@ -871,10 +871,10 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } else { *typ = obj->typ; *rec = *typ; - if ((*rec)->form == 13) { + if ((*rec)->form == 11) { *rec = (*rec)->BaseTyp; } - if (!((((*mode == 1 && (*typ)->form == 13)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { + if (!((((*mode == 1 && (*typ)->form == 11)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { OPP_err(70); *rec = NIL; } @@ -888,7 +888,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } OPP_CheckSym(22); if (*rec == NIL) { - *rec = OPT_NewStr(15, 4); + *rec = OPT_NewStr(13, 4); (*rec)->BaseTyp = NIL; } } @@ -896,7 +896,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St static BOOLEAN OPP_Extends (OPT_Struct x, OPT_Struct b) { BOOLEAN _o_result; - if ((b->form == 13 && x->form == 13)) { + if ((b->form == 11 && x->form == 11)) { b = b->BaseTyp; x = x->BaseTyp; } @@ -1173,14 +1173,14 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O for (;;) { OPP_ConstExpression(&x); f = x->typ->form; - if (__IN(f, 0x28)) { + if (__IN(f, 0x18)) { xval = x->conval->intval; } else { OPP_err(61); xval = 1; } - if (f == 5) { - if (!(LabelTyp->form == 5) || LabelTyp->size < x->typ->size) { + if (f == 4) { + if (!(LabelTyp->form == 4) || LabelTyp->size < x->typ->size) { OPP_err(60); } } else if ((SYSTEM_INT16)LabelTyp->form != f) { @@ -1190,7 +1190,7 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O OPS_Get(&OPP_sym); OPP_ConstExpression(&y); yval = y->conval->intval; - if (((SYSTEM_INT16)y->typ->form != f && !((f == 5 && y->typ->form == 5)))) { + if (((SYSTEM_INT16)y->typ->form != f && !((f == 4 && y->typ->form == 4)))) { OPP_err(60); } if (yval < xval) { @@ -1253,7 +1253,7 @@ static void CasePart__31 (OPT_Node *x) *StatSeq__30_s->pos = OPM_errpos; if ((*x)->class == 8 || (*x)->class == 9) { OPP_err(126); - } else if (!__IN((*x)->typ->form, 0x38)) { + } else if (!__IN((*x)->typ->form, 0x18)) { OPP_err(125); } OPP_CheckSym(25); @@ -1439,7 +1439,7 @@ static void OPP_StatSeq (OPT_Node *stat) OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&id); - if (!(id->typ->form == 5)) { + if (!(id->typ->form == 4)) { OPP_err(68); } OPP_CheckSym(34); @@ -1471,7 +1471,7 @@ static void OPP_StatSeq (OPT_Node *stat) SetPos__35(z); OPB_Link(&*stat, &last, z); y = OPB_NewLeaf(t); - } else if (!(y->typ->form == 5) || y->typ->size > x->left->typ->size) { + } else if (!(y->typ->form == 4) || y->typ->size > x->left->typ->size) { OPP_err(113); } OPB_Link(&*stat, &last, x); @@ -1526,7 +1526,7 @@ static void OPP_StatSeq (OPT_Node *stat) if (OPP_sym == 38) { OPP_qualident(&id); y = OPB_NewLeaf(id); - if ((((id != NIL && id->typ->form == 13)) && (id->mode == 2 || !id->leaf))) { + if ((((id != NIL && id->typ->form == 11)) && (id->mode == 2 || !id->leaf))) { OPP_err(245); } OPP_CheckSym(20); diff --git a/bootstrap/unix-44/OPP.h b/bootstrap/unix-44/OPP.h index 0ddbe4c3..8bed9493 100644 --- a/bootstrap/unix-44/OPP.h +++ b/bootstrap/unix-44/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/unix-44/OPS.c b/bootstrap/unix-44/OPS.c index 89c8242e..f197a5c6 100644 --- a/bootstrap/unix-44/OPS.c +++ b/bootstrap/unix-44/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #include "SYSTEM.h" #include "OPM.h" diff --git a/bootstrap/unix-44/OPS.h b/bootstrap/unix-44/OPS.h index 46e05201..1e99f5e9 100644 --- a/bootstrap/unix-44/OPS.h +++ b/bootstrap/unix-44/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/unix-44/OPT.c b/bootstrap/unix-44/OPT.c index 7398b44a..5b495ad5 100644 --- a/bootstrap/unix-44/OPT.c +++ b/bootstrap/unix-44/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPM.h" #include "OPS.h" @@ -173,7 +173,7 @@ OPT_Struct OPT_ShorterOrLongerType (OPT_Struct x, INTEGER dir) { OPT_Struct _o_result; INTEGER i; - __ASSERT(x->form == 5, 0); + __ASSERT(x->form == 4, 0); __ASSERT(dir == 1 || dir == -1, 0); __ASSERT(x->BaseTyp == OPT_undftyp, 0); i = 0; @@ -284,7 +284,7 @@ void OPT_Close (void) OPT_GlbMod[__X(i, 64)] = NIL; i += 1; } - i = 16; + i = 14; while (i < 255) { OPT_impCtxt.ref[__X(i, 255)] = NIL; OPT_impCtxt.old[__X(i, 255)] = NIL; @@ -483,14 +483,14 @@ void OPT_IdFPrint (OPT_Struct typ) OPT_FPrintName(&idfp, (void*)OPT_GlbMod[__X(typ->mno, 64)]->name, 256); OPT_FPrintName(&idfp, (void*)strobj->name, 256); } - if ((f == 13 || (c == 4 && btyp != NIL)) || c == 3) { + if ((f == 11 || (c == 4 && btyp != NIL)) || c == 3) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); } else if (c == 2) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); OPM_FPrint(&idfp, typ->n); - } else if (f == 14) { + } else if (f == 12) { OPT_FPrintSign(&idfp, btyp, typ->link); } typ->idfp = idfp; @@ -519,7 +519,7 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; FPrintHdFld__15(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -531,8 +531,8 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { - OPM_FPrint(&*FPrintStr__12_s->pvfp, 13); + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { + OPM_FPrint(&*FPrintStr__12_s->pvfp, 11); OPM_FPrint(&*FPrintStr__12_s->pvfp, adr); OPT_nofhdfld += 1; } @@ -595,7 +595,7 @@ void OPT_FPrintStr (OPT_Struct typ) f = typ->form; c = typ->comp; btyp = typ->BaseTyp; - if (f == 13) { + if (f == 11) { strobj = typ->strobj; bstrobj = btyp->strobj; if (((strobj == NIL || strobj->name[0] == 0x00) || bstrobj == NIL) || bstrobj->name[0] == 0x00) { @@ -603,7 +603,7 @@ void OPT_FPrintStr (OPT_Struct typ) OPM_FPrint(&pbfp, btyp->pbfp); pvfp = pbfp; } - } else if (f == 14) { + } else if (f == 12) { } else if (__IN(c, 0x0c)) { OPT_FPrintStr(btyp); OPM_FPrint(&pbfp, btyp->pvfp); @@ -649,23 +649,23 @@ void OPT_FPrintObj (OPT_Object obj) f = obj->typ->form; OPM_FPrint(&fprint, f); switch (f) { - case 2: case 3: case 5: + case 2: case 3: case 4: OPM_FPrint(&fprint, obj->conval->intval); break; - case 9: + case 7: OPM_FPrintSet(&fprint, obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_FPrintReal(&fprint, rval); break; - case 8: + case 6: OPM_FPrintLReal(&fprint, obj->conval->realval); break; - case 10: + case 8: OPT_FPrintName(&fprint, (void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -850,22 +850,22 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) OPM_SymRCh(&ch); conval->intval = (SYSTEM_INT16)ch; break; - case 5: + case 4: conval->intval = OPM_SymRInt(); break; - case 9: + case 7: OPM_SymRSet(&conval->setval); break; - case 7: + case 5: OPM_SymRReal(&rval); conval->realval = rval; conval->intval = -1; break; - case 8: + case 6: OPM_SymRLReal(&conval->realval); conval->intval = -1; break; - case 10: + case 8: ext = OPT_NewExt(); conval->ext = ext; i = 0; @@ -877,7 +877,7 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) conval->intval2 = i; conval->intval = -1; break; - case 11: + case 9: conval->intval = 0; break; default: @@ -979,7 +979,7 @@ static OPT_Object OPT_InTProc (SHORTINT mno) static OPT_Struct OPT_InTyp (LONGINT tag) { OPT_Struct _o_result; - if (tag == 5) { + if (tag == 4) { _o_result = OPT_IntType(OPM_SymRInt()); return _o_result; } else { @@ -1054,20 +1054,20 @@ static void OPT_InStruct (OPT_Struct *typ) } switch (tag) { case 36: - (*typ)->form = 13; + (*typ)->form = 11; (*typ)->size = OPM_PointerSize; (*typ)->n = 0; OPT_InStruct(&(*typ)->BaseTyp); break; case 37: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 2; OPT_InStruct(&(*typ)->BaseTyp); (*typ)->n = OPM_SymRInt(); (*OPT_typSize)(*typ); break; case 38: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 3; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp->comp == 3) { @@ -1078,7 +1078,7 @@ static void OPT_InStruct (OPT_Struct *typ) (*OPT_typSize)(*typ); break; case 39: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 4; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp == OPT_notyp) { @@ -1112,7 +1112,7 @@ static void OPT_InStruct (OPT_Struct *typ) } break; case 40: - (*typ)->form = 14; + (*typ)->form = 12; (*typ)->size = OPM_ProcSize; OPT_InSign(mno, &(*typ)->BaseTyp, &(*typ)->link); break; @@ -1191,7 +1191,7 @@ static OPT_Object OPT_InObj (SHORTINT mno) obj = OPT_NewObj(); obj->mnolev = -mno; obj->vis = 1; - if (tag <= 13) { + if (tag <= 11) { obj->mode = 3; obj->conval = OPT_NewConst(); OPT_InConstant(tag, obj->conval); @@ -1288,7 +1288,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done) obj->scope = OPT_syslink; obj->typ = OPT_notyp; } else { - OPT_impCtxt.nofr = 16; + OPT_impCtxt.nofr = 14; OPT_impCtxt.minr = 255; OPT_impCtxt.nofm = 0; OPT_impCtxt.self = __STRCMP(aliasName, "@self") == 0; @@ -1355,7 +1355,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; OPT_OutHdFld(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -1367,7 +1367,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { OPM_SymWInt(27); OPM_SymWInt(adr); OPT_nofhdfld += 1; @@ -1439,7 +1439,7 @@ static void OPT_OutStr (OPT_Struct typ) OPT_Object strobj = NIL; if (typ->ref < OPT_expCtxt.ref) { OPM_SymWInt(-typ->ref); - if (typ->ref == 5) { + if (typ->ref == 4) { OPM_SymWInt(typ->size); } } else { @@ -1474,15 +1474,15 @@ static void OPT_OutStr (OPT_Struct typ) OPM_SymWInt(typ->sysflag); } switch (typ->form) { - case 13: + case 11: OPM_SymWInt(36); OPT_OutStr(typ->BaseTyp); break; - case 14: + case 12: OPM_SymWInt(40); OPT_OutSign(typ->BaseTyp, typ->link); break; - case 15: + case 13: switch (typ->comp) { case 2: OPM_SymWInt(37); @@ -1537,24 +1537,24 @@ static void OPT_OutConstant (OPT_Object obj) case 2: case 3: OPM_SymWCh((CHAR)obj->conval->intval); break; - case 5: + case 4: OPM_SymWInt(obj->conval->intval); OPM_SymWInt(obj->typ->size); break; - case 9: + case 7: OPM_SymWSet(obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_SymWReal(rval); break; - case 8: + case 6: OPM_SymWLReal(obj->conval->realval); break; - case 10: + case 8: OPT_OutName((void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -1668,7 +1668,7 @@ void OPT_Export (BOOLEAN *ext, BOOLEAN *new) OPM_SymWInt(16); OPT_OutName((void*)OPT_SelfName, 256); OPT_expCtxt.reffp = 0; - OPT_expCtxt.ref = 16; + OPT_expCtxt.ref = 14; OPT_expCtxt.nofm = 1; OPT_expCtxt.locmno[0] = 0; i = 1; @@ -1844,16 +1844,16 @@ export void *OPT__init(void) OPM_errpos = 0; OPT_InitStruct(&OPT_undftyp, 0); OPT_undftyp->BaseTyp = OPT_undftyp; - OPT_InitStruct(&OPT_notyp, 12); - OPT_InitStruct(&OPT_stringtyp, 10); - OPT_InitStruct(&OPT_niltyp, 11); + OPT_InitStruct(&OPT_notyp, 10); + OPT_InitStruct(&OPT_stringtyp, 8); + OPT_InitStruct(&OPT_niltyp, 9); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); - OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp); - OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_PointerSize, &OPT_ainttyp); - OPT_EnterTyp((CHAR*)"INT8", 5, 1, &OPT_int8typ); - OPT_EnterTyp((CHAR*)"INT16", 5, 2, &OPT_int16typ); - OPT_EnterTyp((CHAR*)"INT32", 5, 4, &OPT_int32typ); - OPT_EnterTyp((CHAR*)"INT64", 5, 8, &OPT_int64typ); + OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); + OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp); + OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); + OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); + OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); + OPT_EnterTyp((CHAR*)"INT64", 4, 8, &OPT_int64typ); OPT_EnterProc((CHAR*)"ADR", 20); OPT_EnterProc((CHAR*)"CC", 21); OPT_EnterProc((CHAR*)"LSH", 22); @@ -1871,12 +1871,12 @@ export void *OPT__init(void) OPT_topScope->right = NIL; OPT_EnterTyp((CHAR*)"BOOLEAN", 2, OPM_BoolSize, &OPT_booltyp); OPT_EnterTyp((CHAR*)"CHAR", 3, OPM_CharSize, &OPT_chartyp); - OPT_EnterTyp((CHAR*)"SET", 9, OPM_SetSize, &OPT_settyp); - OPT_EnterTyp((CHAR*)"REAL", 7, OPM_RealSize, &OPT_realtyp); - OPT_EnterTyp((CHAR*)"INTEGER", 5, OPM_IntSize, &OPT_inttyp); - OPT_EnterTyp((CHAR*)"LONGINT", 5, OPM_LIntSize, &OPT_linttyp); - OPT_EnterTyp((CHAR*)"LONGREAL", 8, OPM_LRealSize, &OPT_lrltyp); - OPT_EnterTyp((CHAR*)"SHORTINT", 5, OPM_SIntSize, &OPT_sinttyp); + OPT_EnterTyp((CHAR*)"SET", 7, OPM_SetSize, &OPT_settyp); + OPT_EnterTyp((CHAR*)"REAL", 5, OPM_RealSize, &OPT_realtyp); + OPT_EnterTyp((CHAR*)"INTEGER", 4, OPM_IntSize, &OPT_inttyp); + OPT_EnterTyp((CHAR*)"LONGINT", 4, OPM_LIntSize, &OPT_linttyp); + OPT_EnterTyp((CHAR*)"LONGREAL", 6, OPM_LRealSize, &OPT_lrltyp); + OPT_EnterTyp((CHAR*)"SHORTINT", 4, OPM_SIntSize, &OPT_sinttyp); OPT_EnterBoolConst((CHAR*)"FALSE", 0); OPT_EnterBoolConst((CHAR*)"TRUE", 1); OPT_EnterProc((CHAR*)"HALT", 0); @@ -1904,14 +1904,14 @@ export void *OPT__init(void) OPT_impCtxt.ref[1] = OPT_bytetyp; OPT_impCtxt.ref[2] = OPT_booltyp; OPT_impCtxt.ref[3] = OPT_chartyp; - OPT_impCtxt.ref[5] = OPT_inttyp; - OPT_impCtxt.ref[7] = OPT_realtyp; - OPT_impCtxt.ref[8] = OPT_lrltyp; - OPT_impCtxt.ref[9] = OPT_settyp; - OPT_impCtxt.ref[10] = OPT_stringtyp; - OPT_impCtxt.ref[11] = OPT_niltyp; - OPT_impCtxt.ref[12] = OPT_notyp; - OPT_impCtxt.ref[13] = OPT_sysptrtyp; + OPT_impCtxt.ref[4] = OPT_inttyp; + OPT_impCtxt.ref[5] = OPT_realtyp; + OPT_impCtxt.ref[6] = OPT_lrltyp; + OPT_impCtxt.ref[7] = OPT_settyp; + OPT_impCtxt.ref[8] = OPT_stringtyp; + OPT_impCtxt.ref[9] = OPT_niltyp; + OPT_impCtxt.ref[10] = OPT_notyp; + OPT_impCtxt.ref[11] = OPT_sysptrtyp; OPT_IntTypes[1] = OPT_sinttyp; OPT_IntTypes[2] = OPT_inttyp; OPT_IntTypes[3] = OPT_linttyp; diff --git a/bootstrap/unix-44/OPT.h b/bootstrap/unix-44/OPT.h index 3e352ca3..307b94e2 100644 --- a/bootstrap/unix-44/OPT.h +++ b/bootstrap/unix-44/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/unix-44/OPV.c b/bootstrap/unix-44/OPV.c index 7538f014..df62e985 100644 --- a/bootstrap/unix-44/OPV.c +++ b/bootstrap/unix-44/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPC.h" #include "OPM.h" @@ -122,14 +122,14 @@ void OPV_TypSize (OPT_Struct typ) } else if (c == 2) { OPV_TypSize(typ->BaseTyp); typ->size = typ->n * typ->BaseTyp->size; - } else if (f == 13) { + } else if (f == 11) { typ->size = OPM_PointerSize; if (typ->BaseTyp == OPT_undftyp) { OPM_Mark(128, typ->n); } else { OPV_TypSize(typ->BaseTyp); } - } else if (f == 14) { + } else if (f == 12) { typ->size = OPM_ProcSize; } else if (c == 3) { btyp = typ->BaseTyp; @@ -162,7 +162,7 @@ static void OPV_GetTProcNum (OPT_Object obj) oldPos = OPM_errpos; OPM_errpos = obj->scope->adr; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(obj->name, typ->BaseTyp, &redef); @@ -236,7 +236,7 @@ static void OPV_Traverse (OPT_Object obj, OPT_Object outerScope, BOOLEAN exporte if ((mode == 5 && (obj->vis != 0) == exported)) { typ = obj->typ; OPV_TypSize(obj->typ); - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } if (typ->comp == 4) { @@ -348,7 +348,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN case 12: switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -357,7 +357,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 2: - if (form == 9) { + if (form == 7) { _o_result = 3; return _o_result; } else { @@ -370,7 +370,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN return _o_result; break; case 6: - if (form == 9) { + if (form == 7) { _o_result = 2; return _o_result; } else { @@ -379,7 +379,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 7: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -463,7 +463,7 @@ static BOOLEAN OPV_SideEffects (OPT_Node n) static void OPV_Entier (OPT_Node n, INTEGER prec) { - if (__IN(n->typ->form, 0x0180)) { + if (__IN(n->typ->form, 0x60)) { OPM_WriteString((CHAR*)"__ENTIER(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -502,11 +502,11 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) INTEGER from, to; from = n->typ->form; to = newtype->form; - if (to == 9) { + if (to == 7) { OPM_WriteString((CHAR*)"__SETOF(", 9); OPV_Entier(n, -1); OPM_Write(')'); - } else if (to == 5) { + } else if (to == 4) { if ((newtype->size < n->typ->size && __IN(2, OPM_opt))) { OPM_WriteString((CHAR*)"__SHORT", 8); if (OPV_SideEffects(n)) { @@ -541,7 +541,7 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) static void OPV_TypeOf (OPT_Node n) { - if (n->typ->form == 13) { + if (n->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -793,14 +793,14 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } else if (OPV_ansi) { if ((__IN(comp, 0x0c) && n->class == 7)) { OPM_WriteString((CHAR*)"(CHAR*)", 8); - } else if ((((form == 13 && typ != n->typ)) && n->typ != OPT_niltyp)) { + } else if ((((form == 11 && typ != n->typ)) && n->typ != OPT_niltyp)) { OPM_WriteString((CHAR*)"(void*)", 8); } } else { - if ((__IN(form, 0x0180) && n->typ->form == 5)) { + if ((__IN(form, 0x60) && n->typ->form == 4)) { OPM_WriteString((CHAR*)"(double)", 9); prec = 9; - } else if (form == 5) { + } else if (form == 4) { OPV_SizeCast(n->typ->size, typ->size); } } @@ -811,7 +811,7 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } if ((((mode == 2 && n->class == 11)) && n->subcl == 29)) { OPV_expr(n->left, prec); - } else if ((form == 5 && n->class == 7)) { + } else if ((form == 4 && n->class == 7)) { OPV_ParIntLiteral(n->conval->intval, n->typ->size); } else { OPV_expr(n, prec); @@ -860,7 +860,7 @@ static OPT_Object OPV_SuperProc (OPT_Node n) OPT_Object obj = NIL; OPT_Struct typ = NIL; typ = n->right->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(n->left->obj->name, typ->BaseTyp, &obj); @@ -901,7 +901,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); break; case 7: - if (form == 9) { + if (form == 7) { OPM_Write('~'); } else { OPM_Write('-'); @@ -929,7 +929,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 21: if (OPV_SideEffects(l)) { - if (l->typ->form < 7) { + if (l->typ->form < 5) { if (l->typ->size <= 4) { OPM_WriteString((CHAR*)"(int)", 6); } @@ -958,18 +958,18 @@ static void OPV_expr (OPT_Node n, INTEGER prec) if (l->class == 1) { OPC_CompleteIdent(l->obj); } else { - if ((l->typ->form != 10 && !__IN(l->typ->comp, 0x0c))) { + if ((l->typ->form != 8 && !__IN(l->typ->comp, 0x0c))) { OPM_Write('&'); } OPV_expr(l, exprPrec); } break; case 29: - if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x6220) && __IN(l->typ->form, 0x6220))) && n->typ->size == l->typ->size)) { + if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x1890) && __IN(l->typ->form, 0x1890))) && n->typ->size == l->typ->size)) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); - if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) { + if (__IN(n->typ->form, 0x1800) || __IN(l->typ->form, 0x1800)) { OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", 16); } OPV_expr(l, exprPrec); @@ -1079,7 +1079,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 9: case 10: case 11: case 12: case 13: case 14: - if (__IN(l->typ->form, 0x8400)) { + if (__IN(l->typ->form, 0x2100)) { OPM_WriteString((CHAR*)"__STRCMP(", 10); OPV_expr(l, -1); OPM_WriteString((CHAR*)", ", 3); @@ -1091,31 +1091,31 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); OPC_Cmp(subclass); typ = l->typ; - if ((((((typ->form == 13 && r->typ->form != 11)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { + if ((((((typ->form == 11 && r->typ->form != 9)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { OPM_WriteString((CHAR*)"(void *) ", 10); } OPV_expr(r, exprPrec); } break; default: - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write('('); } OPV_expr(l, exprPrec); switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ", 4); } else { OPM_WriteString((CHAR*)" * ", 4); } break; case 2: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" ^ ", 4); } else { OPM_WriteString((CHAR*)" / ", 4); - if (r->obj == NIL || r->obj->typ->form == 5) { + if (r->obj == NIL || r->obj->typ->form == 4) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); @@ -1126,14 +1126,14 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPM_WriteString((CHAR*)" && ", 5); break; case 6: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" | ", 4); } else { OPM_WriteString((CHAR*)" + ", 4); } break; case 7: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ~", 5); } else { OPM_WriteString((CHAR*)" - ", 4); @@ -1149,7 +1149,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; } OPV_expr(r, exprPrec); - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write(')'); } break; @@ -1323,7 +1323,7 @@ static void OPV_NewArr (OPT_Node d, OPT_Node x) if ((base->comp == 4 && OPC_NofPtrs(base) != 0)) { OPC_Ident(base->strobj); OPM_WriteString((CHAR*)"__typ", 6); - } else if (base->form == 13) { + } else if (base->form == 11) { OPM_WriteString((CHAR*)"POINTER__typ", 13); } else { OPM_WriteString((CHAR*)"NIL", 4); @@ -1429,11 +1429,11 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } OPM_Write(')'); } else { - if ((((((l->typ->form == 13 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { + if ((((((l->typ->form == 11 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { l->obj->adr = 0; OPV_design(l, -1); l->obj->adr = 1; - if (r->typ->form != 11) { + if (r->typ->form != 9) { OPM_WriteString((CHAR*)" = (void*)", 11); } else { OPM_WriteString((CHAR*)" = ", 4); @@ -1444,7 +1444,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } if (l->typ == r->typ) { OPV_expr(r, -1); - } else if ((((l->typ->form == 13 && r->typ->form != 11)) && l->typ->strobj != NIL)) { + } else if ((((l->typ->form == 11 && r->typ->form != 9)) && l->typ->strobj != NIL)) { OPM_Write('('); OPC_Ident(l->typ->strobj); OPM_Write(')'); @@ -1629,7 +1629,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } else { if (n->left != NIL) { OPM_WriteString((CHAR*)"_o_result = ", 13); - if ((n->left->typ->form == 13 && n->obj->typ != n->left->typ)) { + if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) { OPM_WriteString((CHAR*)"(void*)", 8); OPV_expr(n->left, 10); } else { diff --git a/bootstrap/unix-44/OPV.h b/bootstrap/unix-44/OPV.h index 0299d34b..06bc39f1 100644 --- a/bootstrap/unix-44/OPV.h +++ b/bootstrap/unix-44/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/unix-44/Platform.c b/bootstrap/unix-44/Platform.c index 2508f6f7..033e03cf 100644 --- a/bootstrap/unix-44/Platform.c +++ b/bootstrap/unix-44/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" typedef diff --git a/bootstrap/unix-44/Platform.h b/bootstrap/unix-44/Platform.h index 4c7f2849..34d088bf 100644 --- a/bootstrap/unix-44/Platform.h +++ b/bootstrap/unix-44/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/unix-44/Reals.c b/bootstrap/unix-44/Reals.c index bea1f4aa..28a855aa 100644 --- a/bootstrap/unix-44/Reals.c +++ b/bootstrap/unix-44/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" diff --git a/bootstrap/unix-44/Reals.h b/bootstrap/unix-44/Reals.h index 6eeb5a87..65543fac 100644 --- a/bootstrap/unix-44/Reals.h +++ b/bootstrap/unix-44/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/unix-44/Strings.c b/bootstrap/unix-44/Strings.c index f1d4f53d..834c1fb1 100644 --- a/bootstrap/unix-44/Strings.c +++ b/bootstrap/unix-44/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" diff --git a/bootstrap/unix-44/Strings.h b/bootstrap/unix-44/Strings.h index 43656e74..2edcc736 100644 --- a/bootstrap/unix-44/Strings.h +++ b/bootstrap/unix-44/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/unix-44/Texts.c b/bootstrap/unix-44/Texts.c index e473e702..df4278f7 100644 --- a/bootstrap/unix-44/Texts.c +++ b/bootstrap/unix-44/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Files.h" #include "Modules.h" diff --git a/bootstrap/unix-44/Texts.h b/bootstrap/unix-44/Texts.h index 34a403f2..c878ff62 100644 --- a/bootstrap/unix-44/Texts.h +++ b/bootstrap/unix-44/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/unix-44/Vishap.c b/bootstrap/unix-44/Vishap.c index 7c16c24d..030b94f6 100644 --- a/bootstrap/unix-44/Vishap.c +++ b/bootstrap/unix-44/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkamSf */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkamSf */ #include "SYSTEM.h" #include "Configuration.h" #include "Heap.h" diff --git a/bootstrap/unix-44/errors.c b/bootstrap/unix-44/errors.c index 7a91fc31..3f916fe9 100644 --- a/bootstrap/unix-44/errors.c +++ b/bootstrap/unix-44/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" typedef diff --git a/bootstrap/unix-44/errors.h b/bootstrap/unix-44/errors.h index 4a787a17..2afac320 100644 --- a/bootstrap/unix-44/errors.h +++ b/bootstrap/unix-44/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/unix-44/extTools.c b/bootstrap/unix-44/extTools.c index cfb79ac9..bfab2dc6 100644 --- a/bootstrap/unix-44/extTools.c +++ b/bootstrap/unix-44/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "Console.h" diff --git a/bootstrap/unix-44/extTools.h b/bootstrap/unix-44/extTools.h index fb0797f3..ca635519 100644 --- a/bootstrap/unix-44/extTools.h +++ b/bootstrap/unix-44/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/unix-44/vt100.c b/bootstrap/unix-44/vt100.c index dfe62efa..84707926 100644 --- a/bootstrap/unix-44/vt100.c +++ b/bootstrap/unix-44/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Console.h" #include "Strings.h" diff --git a/bootstrap/unix-44/vt100.h b/bootstrap/unix-44/vt100.h index 73d985c9..6266a678 100644 --- a/bootstrap/unix-44/vt100.h +++ b/bootstrap/unix-44/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef vt100__h #define vt100__h diff --git a/bootstrap/unix-48/Configuration.c b/bootstrap/unix-48/Configuration.c index eed3c4f0..fb7df026 100644 --- a/bootstrap/unix-48/Configuration.c +++ b/bootstrap/unix-48/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" @@ -13,6 +13,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/08/31] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/01] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/unix-48/Configuration.h b/bootstrap/unix-48/Configuration.h index 90696149..61b33bc5 100644 --- a/bootstrap/unix-48/Configuration.h +++ b/bootstrap/unix-48/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/unix-48/Console.c b/bootstrap/unix-48/Console.c index 124f7163..816df1b9 100644 --- a/bootstrap/unix-48/Console.c +++ b/bootstrap/unix-48/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Platform.h" diff --git a/bootstrap/unix-48/Console.h b/bootstrap/unix-48/Console.h index fad0f676..2c01265d 100644 --- a/bootstrap/unix-48/Console.h +++ b/bootstrap/unix-48/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/unix-48/Files.c b/bootstrap/unix-48/Files.c index a6db1a11..bd3e3fd5 100644 --- a/bootstrap/unix-48/Files.c +++ b/bootstrap/unix-48/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "Console.h" diff --git a/bootstrap/unix-48/Files.h b/bootstrap/unix-48/Files.h index 61089cbd..985572ec 100644 --- a/bootstrap/unix-48/Files.h +++ b/bootstrap/unix-48/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/unix-48/Heap.c b/bootstrap/unix-48/Heap.c index f35765c6..50d17d87 100644 --- a/bootstrap/unix-48/Heap.c +++ b/bootstrap/unix-48/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #include "SYSTEM.h" struct Heap__1 { diff --git a/bootstrap/unix-48/Heap.h b/bootstrap/unix-48/Heap.h index 4d5c5b4e..a4e30a5e 100644 --- a/bootstrap/unix-48/Heap.h +++ b/bootstrap/unix-48/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/unix-48/Modules.c b/bootstrap/unix-48/Modules.c index 9f39f448..52abc5b8 100644 --- a/bootstrap/unix-48/Modules.c +++ b/bootstrap/unix-48/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Console.h" #include "Heap.h" diff --git a/bootstrap/unix-48/Modules.h b/bootstrap/unix-48/Modules.h index 1707868f..6bee52c7 100644 --- a/bootstrap/unix-48/Modules.h +++ b/bootstrap/unix-48/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/unix-48/OPB.c b/bootstrap/unix-48/OPB.c index e6e966a6..a3322969 100644 --- a/bootstrap/unix-48/OPB.c +++ b/bootstrap/unix-48/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPM.h" #include "OPS.h" @@ -317,7 +317,7 @@ void OPB_DeRef (OPT_Node *x) typ = (*x)->typ; if ((*x)->class >= 7) { OPB_err(78); - } else if (typ->form == 13) { + } else if (typ->form == 11) { if (typ == OPT_sysptrtyp) { OPB_err(57); } @@ -340,7 +340,7 @@ void OPB_Index (OPT_Node *x, OPT_Node y) f = y->typ->form; if ((*x)->class >= 7) { OPB_err(79); - } else if (f != 5 || __IN(y->class, 0x0300)) { + } else if (f != 4 || __IN(y->class, 0x0300)) { OPB_err(80); y->typ = OPT_inttyp; } @@ -437,10 +437,10 @@ void OPB_TypTest (OPT_Node *x, OPT_Object obj, BOOLEAN guard) TypTest__57_s = &_s; if (OPB_NotVar(*x)) { OPB_err(112); - } else if ((*x)->typ->form == 13) { + } else if ((*x)->typ->form == 11) { if (((*x)->typ->BaseTyp->comp != 4 && (*x)->typ != OPT_sysptrtyp)) { OPB_err(85); - } else if (obj->typ->form == 13) { + } else if (obj->typ->form == 11) { GTT__58((*x)->typ->BaseTyp, obj->typ->BaseTyp); } else { OPB_err(86); @@ -465,7 +465,7 @@ void OPB_In (OPT_Node *x, OPT_Node y) f = (*x)->typ->form; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if ((f == 5 && y->typ->form == 9)) { + } else if ((f == 4 && y->typ->form == 7)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (k < 0 || k > OPM_MaxSet) { @@ -504,7 +504,7 @@ static LONGINT OPB_log (LONGINT x) static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) { LONGREAL min, max, r; - if (f == 7) { + if (f == 5) { min = OPM_MinReal; max = OPM_MaxReal; } else { @@ -515,7 +515,7 @@ static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) if (r > max || r < min) { OPB_err(nr); x->realval = (LONGREAL)1; - } else if (f == 7) { + } else if (f == 5) { x->realval = x->realval; } x->intval = -1; @@ -567,21 +567,21 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 6: - if (!__IN(f, 0x01a0)) { + if (!__IN(f, 0x70)) { OPB_err(96); } break; case 7: - if (__IN(f, 0x03a0)) { + if (__IN(f, 0xf0)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-2147483647-1)) { OPB_err(203); } else { z->conval->intval = -z->conval->intval; OPB_SetIntType(z); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { z->conval->realval = -z->conval->realval; } else { z->conval->setval = ~z->conval->setval; @@ -595,9 +595,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 21: - if (__IN(f, 0x01a0)) { + if (__IN(f, 0x70)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-2147483647-1)) { OPB_err(203); } else { @@ -629,7 +629,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 23: - if (f == 5) { + if (f == 4) { if (z->class == 7) { z->conval->intval = OPB_BoolToInt(__ODD(z->conval->intval)); z->obj = NIL; @@ -644,9 +644,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) case 24: if ((((z->class == 7 && f == 3)) && z->conval->intval >= 32)) { OPB_CharToString(z); - f = 10; + f = 8; } - if (z->class < 7 || f == 10) { + if (z->class < 7 || f == 8) { z = NewOp__29(op, typ, z); } else { OPB_err(127); @@ -654,7 +654,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) z->typ = OPT_linttyp; break; case 25: - if ((f == 5 && z->class == 7)) { + if ((f == 4 && z->class == 7)) { if ((0 <= z->conval->intval && z->conval->intval <= -1)) { z = NewOp__29(op, typ, z); } else { @@ -681,7 +681,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) INTEGER g; OPT_Struct p = NIL, q = NIL, t = NIL; g = y->typ->form; - if (g == 13) { + if (g == 11) { p = x->typ->BaseTyp; q = y->typ->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -699,7 +699,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) } else { OPB_err(100); } - } else if (g != 11) { + } else if (g != 9) { OPB_err(100); } } @@ -716,7 +716,7 @@ void OPB_CheckParameters (OPT_Object fp, OPT_Object ap, BOOLEAN checkNames) at = at->BaseTyp; } if (ft != at) { - if ((ft->form == 14 && at->form == 14)) { + if ((ft->form == 12 && at->form == 12)) { if (ft->BaseTyp == at->BaseTyp) { OPB_CheckParameters(ft->link, at->link, 0); } else { @@ -777,7 +777,7 @@ static INTEGER ConstCmp__14 (void) case 0: res = 9; break; - case 1: case 3: case 4: case 5: + case 1: case 3: case 4: if ((*ConstOp__13_s->xval)->intval < (*ConstOp__13_s->yval)->intval) { res = 11; } else if ((*ConstOp__13_s->xval)->intval > (*ConstOp__13_s->yval)->intval) { @@ -786,7 +786,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 7: case 8: + case 5: case 6: if ((*ConstOp__13_s->xval)->realval < (*ConstOp__13_s->yval)->realval) { res = 11; } else if ((*ConstOp__13_s->xval)->realval > (*ConstOp__13_s->yval)->realval) { @@ -802,14 +802,14 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 9: + case 7: if ((*ConstOp__13_s->xval)->setval != (*ConstOp__13_s->yval)->setval) { res = 10; } else { res = 9; } break; - case 10: + case 8: if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) < 0) { res = 11; } else if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) > 0) { @@ -818,7 +818,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 11: case 13: case 14: + case 9: case 11: case 12: if ((*ConstOp__13_s->xval)->intval != (*ConstOp__13_s->yval)->intval) { res = 10; } else { @@ -856,7 +856,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) if (f != g) { switch (f) { case 3: - if (g == 10) { + if (g == 8) { OPB_CharToString(x); } else { OPB_err(100); @@ -864,17 +864,17 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 5: - if (g == 5) { + case 4: + if (g == 4) { if (x->typ->size <= y->typ->size) { x->typ = y->typ; } else { x->typ = OPT_IntType(x->typ->size); } - } else if (g == 7) { + } else if (g == 5) { x->typ = OPT_realtyp; xval->realval = xval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; xval->realval = xval->intval; } else { @@ -883,11 +883,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 7: - if (g == 5) { + case 5: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; } else { OPB_err(100); @@ -895,11 +895,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 8: - if (g == 5) { + case 6: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 7) { + } else if (g == 5) { y->typ = OPT_lrltyp; } else { OPB_err(100); @@ -907,26 +907,26 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 10: + case 8: if (g == 3) { OPB_CharToString(y); - g = 10; + g = 8; } else { OPB_err(100); y->typ = x->typ; __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 11: - if (!__IN(g, 0x6000)) { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; - case 13: + case 11: OPB_CheckPtr(x, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; @@ -940,7 +940,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } switch (op) { case 1: - if (f == 5) { + if (f == 4) { xv = xval->intval; yv = yval->intval; if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(2147483647, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-2147483647-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-2147483647-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-2147483647-1))) && yv != (-2147483647-1))) && -xv <= __DIV(2147483647, -yv))) { @@ -949,7 +949,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) <= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 / (LONGREAL)__ABS(yval->realval)) { xval->realval = xval->realval * yval->realval; @@ -957,23 +957,23 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & yval->setval); } else if (f != 0) { OPB_err(101); } break; case 2: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->realval = xval->intval / (REAL)yval->intval; - OPB_CheckRealType(7, 205, xval); + OPB_CheckRealType(5, 205, xval); } else { OPB_err(205); xval->realval = (LONGREAL)1; } x->typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) >= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 * __ABS(yval->realval)) { xval->realval = xval->realval / yval->realval; @@ -981,14 +981,14 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(205); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval ^ yval->setval; } else if (f != 0) { OPB_err(102); } break; case 3: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = __DIV(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1000,7 +1000,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = (int)__MOD(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1019,7 +1019,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 6: - if (f == 5) { + if (f == 4) { temp = (yval->intval >= 0 && xval->intval <= 2147483647 - yval->intval); if (temp || (yval->intval < 0 && xval->intval >= (-2147483647-1) - yval->intval)) { xval->intval += yval->intval; @@ -1027,7 +1027,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 - yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 - yval->realval)) { xval->realval = xval->realval + yval->realval; @@ -1035,21 +1035,21 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval | yval->setval; } else if (f != 0) { OPB_err(105); } break; case 7: - if (f == 5) { + if (f == 4) { if ((yval->intval >= 0 && xval->intval >= (-2147483647-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 2147483647 + yval->intval)) { xval->intval -= yval->intval; OPB_SetIntType(x); } else { OPB_err(207); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 + yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 + yval->realval)) { xval->realval = xval->realval - yval->realval; @@ -1057,7 +1057,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(207); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & ~yval->setval); } else if (f != 0) { OPB_err(106); @@ -1077,28 +1077,28 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) xval->intval = OPB_BoolToInt(ConstCmp__14() != 9); break; case 11: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 11); } break; case 12: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 13); } break; case 13: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 13); } break; case 14: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 11); @@ -1122,8 +1122,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) f = (*x)->typ->form; g = typ->form; if ((*x)->class == 7) { - if (f == 5) { - if (g == 5) { + if (f == 4) { + if (g == 4) { if (f > g) { OPB_SetIntType(*x); if ((*x)->typ->size > typ->size) { @@ -1131,7 +1131,7 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) (*x)->conval->intval = 1; } } - } else if (__IN(g, 0x0180)) { + } else if (__IN(g, 0x60)) { (*x)->conval->realval = (*x)->conval->intval; (*x)->conval->intval = -1; } else { @@ -1140,8 +1140,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) OPB_err(220); } } - } else if (__IN(f, 0x0180)) { - if (__IN(g, 0x0180)) { + } else if (__IN(f, 0x60)) { + if (__IN(g, 0x60)) { OPB_CheckRealType(g, 203, (*x)->conval); } else { r = (*x)->conval->realval; @@ -1190,25 +1190,25 @@ static BOOLEAN strings__41 (OPT_Node *x, OPT_Node *y) { BOOLEAN _o_result; BOOLEAN ok, xCharArr, yCharArr; - xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 10; - yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 10; + xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 8; + yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 8; if ((((xCharArr && *Op__38_s->g == 3)) && (*y)->class == 7)) { OPB_CharToString(*y); - *Op__38_s->g = 10; + *Op__38_s->g = 8; yCharArr = 1; } if ((((yCharArr && *Op__38_s->f == 3)) && (*x)->class == 7)) { OPB_CharToString(*x); - *Op__38_s->f = 10; + *Op__38_s->f = 8; xCharArr = 1; } ok = (xCharArr && yCharArr); if (ok) { - if ((*Op__38_s->f == 10 && (*x)->conval->intval2 == 1)) { + if ((*Op__38_s->f == 8 && (*x)->conval->intval2 == 1)) { (*x)->typ = OPT_chartyp; (*x)->conval->intval = 0; OPB_Index(&*y, OPB_NewIntConst(0)); - } else if ((*Op__38_s->g == 10 && (*y)->conval->intval2 == 1)) { + } else if ((*Op__38_s->g == 8 && (*y)->conval->intval2 == 1)) { (*y)->typ = OPT_chartyp; (*y)->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); @@ -1247,49 +1247,49 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) OPB_err(100); } break; + case 4: + if ((g == 4 && y->typ->size < z->typ->size)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x70)) { + OPB_Convert(&z, y->typ); + } else { + OPB_err(100); + } + break; case 5: - if ((g == 5 && y->typ->size < z->typ->size)) { + if (g == 4) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x01a0)) { + } else if (__IN(g, 0x60)) { OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 7: - if (g == 5) { + case 6: + if (__IN(g, 0x70)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x60)) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 8: - if (__IN(g, 0x01a0)) { - OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&y, z->typ); - } else { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; case 11: - if (!__IN(g, 0x6000)) { - OPB_err(100); - } - break; - case 13: OPB_CheckPtr(z, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; - case 10: + case 8: break; - case 15: + case 13: if (z->typ->comp == 4) { OPB_err(100); } @@ -1305,7 +1305,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) switch (op) { case 1: do_ = 1; - if (f == 5) { + if (f == 4) { if (z->class == 7) { val = z->conval->intval; if (val == 1) { @@ -1336,7 +1336,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) y->obj = NIL; } } - } else if (!__IN(f, 0x0381)) { + } else if (!__IN(f, 0xe1)) { OPB_err(105); typ = OPT_undftyp; } @@ -1345,18 +1345,18 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 2: - if (f == 5) { + if (f == 4) { if ((y->class == 7 && y->conval->intval == 0)) { OPB_err(205); } OPB_Convert(&z, OPT_realtyp); OPB_Convert(&y, OPT_realtyp); typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { if ((y->class == 7 && y->conval->realval == (LONGREAL)0)) { OPB_err(205); } - } else if ((f != 9 && f != 0)) { + } else if ((f != 7 && f != 0)) { OPB_err(102); typ = OPT_undftyp; } @@ -1364,7 +1364,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) break; case 3: do_ = 1; - if (f == 5) { + if (f == 4) { if (y->class == 7) { val = y->conval->intval; if (val == 0) { @@ -1387,7 +1387,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (y->class == 7) { if (y->conval->intval == 0) { OPB_err(205); @@ -1419,12 +1419,12 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 6: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(105); typ = OPT_undftyp; } do_ = 1; - if (f == 5) { + if (f == 4) { if ((z->class == 7 && z->conval->intval == 0)) { do_ = 0; z = y; @@ -1438,11 +1438,11 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 7: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(106); typ = OPT_undftyp; } - if ((f != 5 || y->class != 7) || y->conval->intval != 0) { + if ((f != 4 || y->class != 7) || y->conval->intval != 0) { NewOp__39(op, typ, &z, y); } break; @@ -1462,7 +1462,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 9: case 10: - if (__IN(f, 0x6bff) || strings__41(&z, &y)) { + if (__IN(f, 0x1aff) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPB_err(107); @@ -1471,7 +1471,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) NewOp__39(op, typ, &z, y); break; case 11: case 12: case 13: case 14: - if (__IN(f, 0x01f9) || strings__41(&z, &y)) { + if (__IN(f, 0x79) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPM_LogWLn(); @@ -1498,7 +1498,7 @@ void OPB_SetRange (OPT_Node *x, OPT_Node y) LONGINT k, l; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if (((*x)->typ->form == 5 && y->typ->form == 5)) { + } else if (((*x)->typ->form == 4 && y->typ->form == 4)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (0 > k || k > OPM_MaxSet) { @@ -1533,7 +1533,7 @@ void OPB_SetElem (OPT_Node *x) LONGINT k; if ((*x)->class == 8 || (*x)->class == 9) { OPB_err(126); - } else if ((*x)->typ->form != 5) { + } else if ((*x)->typ->form != 4) { OPB_err(93); } else if ((*x)->class == 7) { k = (*x)->conval->intval; @@ -1576,40 +1576,40 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWNum(ynode->typ->size, 0); OPM_LogWLn(); } - if (ynode->class == 8 || (ynode->class == 9 && f != 14)) { + if (ynode->class == 8 || (ynode->class == 9 && f != 12)) { OPB_err(126); } switch (f) { - case 0: case 10: + case 0: case 8: break; case 1: - if (!((__IN(g, 0x2a) && y->size == 1))) { + if (!((__IN(g, 0x1a) && y->size == 1))) { OPB_err(113); } break; - case 2: case 3: case 9: + case 2: case 3: case 7: if (g != f) { OPB_err(113); } break; + case 4: + if (g != 4 || x->size < y->size) { + OPB_err(113); + } + break; case 5: - if (g != 5 || x->size < y->size) { + if (!__IN(g, 0x30)) { OPB_err(113); } break; - case 7: - if (!__IN(g, 0xe0)) { + case 6: + if (!__IN(g, 0x70)) { OPB_err(113); } break; - case 8: - if (!__IN(g, 0x01e0)) { - OPB_err(113); - } - break; - case 13: - if ((x == y || g == 11) || (x == OPT_sysptrtyp && g == 13)) { - } else if (g == 13) { + case 11: + if ((x == y || g == 9) || (x == OPT_sysptrtyp && g == 11)) { + } else if (g == 11) { p = x->BaseTyp; q = y->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -1626,28 +1626,28 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPB_err(113); } break; - case 14: + case 12: if (ynode->class == 9) { OPB_CheckProc(x, ynode->obj); - } else if (x == y || g == 11) { + } else if (x == y || g == 9) { } else { OPB_err(113); } break; - case 12: case 11: + case 10: case 9: OPB_err(113); break; - case 15: + case 13: x->pvused = 1; if (x->comp == 2) { if ((ynode->class == 7 && g == 3)) { OPB_CharToString(ynode); y = ynode->typ; - g = 10; + g = 8; } if (x == y) { } else if (x->BaseTyp == OPT_chartyp) { - if (g == 10) { + if (g == 8) { if (ynode->conval->intval2 > x->n) { OPB_err(114); } @@ -1686,7 +1686,7 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWLn(); break; } - if ((((((ynode->class == 7 && g < f)) && __IN(g, 0xe0))) && __IN(f, 0x01e0))) { + if ((((((ynode->class == 7 && g < f)) && __IN(g, 0x30))) && __IN(f, 0x70))) { OPB_Convert(&ynode, x); } } @@ -1704,7 +1704,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) f = x->typ->form; switch (fctno) { case 0: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); } else { @@ -1719,7 +1719,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) typ = OPT_notyp; if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { if (x->readonly) { OPB_err(76); } @@ -1757,7 +1757,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 5: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { OPB_Convert(&x, OPT_linttyp); } else { OPB_err(111); @@ -1777,17 +1777,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(0); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMinimum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(0); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MinReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MinLReal, OPT_lrltyp); break; default: @@ -1808,17 +1808,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(255); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMaximum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(OPM_MaxSet); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MaxReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MaxLReal, OPT_lrltyp); break; default: @@ -1832,7 +1832,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 9: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x21)) { + } else if (__IN(f, 0x11)) { OPB_Convert(&x, OPT_chartyp); } else { OPB_err(111); @@ -1842,14 +1842,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 10: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, -1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 8) { + } else if (f == 6) { OPB_Convert(&x, OPT_realtyp); } else { OPB_err(111); @@ -1858,14 +1858,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 11: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, 1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 7) { + } else if (f == 5) { OPB_Convert(&x, OPT_lrltyp); } else if (f == 3) { OPB_Convert(&x, OPT_linttyp); @@ -1876,7 +1876,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 13: case 14: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else if (x->readonly) { OPB_err(76); @@ -1900,18 +1900,18 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 18: if ((x->class == 7 && f == 3)) { OPB_CharToString(x); - f = 10; + f = 8; } if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 10)) { + } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 8)) { OPB_err(111); } break; case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if (x->typ->size != OPM_LIntSize) { OPB_Convert(&x, OPT_linttyp); } @@ -1928,7 +1928,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) if (x->class != 8) { OPB_err(110); x = OPB_NewIntConst(1); - } else if (__IN(f, 0x63fe) || __IN(x->typ->comp, 0x14)) { + } else if (__IN(f, 0x18fe) || __IN(x->typ->comp, 0x14)) { (*OPB_typSize)(x->typ); x->typ->pvused = 1; x = OPB_NewIntConst(x->typ->size); @@ -1943,22 +1943,22 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (!__IN(f, 0x022a)) { + } else if (!__IN(f, 0x9a)) { OPB_err(111); } break; case 24: case 25: case 28: case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } break; case 26: case 27: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if (x->conval->intval < 0 || x->conval->intval > -1) { OPB_err(220); } @@ -1969,14 +1969,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 29: if (x->class != 8) { OPB_err(110); - } else if (__IN(f, 0x1401) || x->typ->comp == 3) { + } else if (__IN(f, 0x0501) || x->typ->comp == 3) { OPB_err(111); } break; case 30: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { } else { OPB_err(111); } @@ -2036,7 +2036,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; } else { if (x->typ != p->typ) { - if ((x->class == 7 && f == 5)) { + if ((x->class == 7 && f == 4)) { OPB_Convert(&x, p->typ); } else { OPB_err(111); @@ -2049,7 +2049,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 15: case 16: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (0 > x->conval->intval || x->conval->intval > OPM_MaxSet))) { OPB_err(202); } @@ -2060,7 +2060,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; break; case 17: - if (!(f == 5) || x->class != 7) { + if (!(f == 4) || x->class != 7) { OPB_err(69); } else if (x->typ->size == 1) { L = (SYSTEM_INT16)x->conval->intval; @@ -2109,7 +2109,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((p->class == 7 && x->class == 7)) { if (-OPB_maxExp > x->conval->intval || x->conval->intval > OPB_maxExp) { OPB_err(208); @@ -2137,7 +2137,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) if (x->class == 8 || x->class == 9) { OPB_err(126); } else if (p->typ->comp == 3) { - if (f == 5) { + if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2153,7 +2153,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else { if (fctno == 22) { @@ -2167,7 +2167,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 24: case 25: case 26: case 27: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x63ff)) { + } else if (__IN(f, 0x18ff)) { if (fctno == 24 || fctno == 26) { if (OPB_NotVar(x)) { OPB_err(112); @@ -2185,7 +2185,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 28: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(12, 26, p, x); } else { OPB_err(111); @@ -2193,7 +2193,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_booltyp; break; case 29: - if (((x->class == 8 || x->class == 9) || __IN(f, 0x1401)) || x->typ->comp == 3) { + if (((x->class == 8 || x->class == 9) || __IN(f, 0x0501)) || x->typ->comp == 3) { OPB_err(126); } if (x->typ->size < p->typ->size) { @@ -2209,7 +2209,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 30: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(19, 30, p, x); } else { OPB_err(111); @@ -2219,16 +2219,16 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } p->link = x; break; case 32: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); x->conval = OPT_NewConst(); @@ -2271,7 +2271,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) OPB_err(126); } else if (p->typ->comp != 3) { OPB_err(64); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2287,7 +2287,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) } else if ((fctno == 31 && n == 2)) { if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { node = OPT_NewNode(19); node->subcl = 31; node->right = p; @@ -2375,7 +2375,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((fvarpar && ftyp == OPT_bytetyp)) { - if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x2e) && atyp->size == 1))) { + if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x1e) && atyp->size == 1))) { if (__IN(18, OPM_opt)) { OPB_err(-301); } @@ -2384,7 +2384,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa if (ftyp->comp == 3) { OPB_DynArrParCheck(ftyp, atyp, fvarpar); } else if (ftyp != atyp) { - if ((((!fvarpar && ftyp->form == 13)) && atyp->form == 13)) { + if ((((!fvarpar && ftyp->form == 11)) && atyp->form == 11)) { ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((ftyp->comp == 4 && atyp->comp == 4)) { @@ -2408,7 +2408,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa static void OPB_CheckReceiver (OPT_Node *x, OPT_Object fp) { - if (fp->typ->form == 13) { + if (fp->typ->form == 11) { if ((*x)->class == 3) { *x = (*x)->left; } else { @@ -2425,7 +2425,7 @@ void OPB_PrepCall (OPT_Node *x, OPT_Object *fpar) OPB_CheckReceiver(&(*x)->left, *fpar); *fpar = (*fpar)->link; } - } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 14)) { + } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 12)) { *fpar = (*x)->typ->link; } else { OPB_err(121); @@ -2457,17 +2457,17 @@ void OPB_Param (OPT_Node ap, OPT_Object fp) if (q == NIL) { OPB_err(111); } - } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 13)) { - } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x2e) && ap->typ->size == 1)))))) { + } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 11)) { + } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x1e) && ap->typ->size == 1)))))) { OPB_err(123); - } else if ((fp->typ->form == 13 && ap->class == 5)) { + } else if ((fp->typ->form == 11 && ap->class == 5)) { OPB_err(123); } } else if (fp->typ->comp == 3) { if ((ap->class == 7 && ap->typ->form == 3)) { OPB_CharToString(ap); } - if ((ap->typ->form == 10 && fp->typ->BaseTyp->form == 3)) { + if ((ap->typ->form == 8 && fp->typ->BaseTyp->form == 3)) { } else if (ap->class >= 7) { OPB_err(59); } else { @@ -2575,7 +2575,7 @@ void OPB_Assign (OPT_Node *x, OPT_Node y) OPB_BindNodes(6, (*x)->typ, &z, NIL); *x = z; } - } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 10)) && y->conval->intval2 == 1)) { + } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 8)) && y->conval->intval2 == 1)) { y->typ = OPT_chartyp; y->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); diff --git a/bootstrap/unix-48/OPB.h b/bootstrap/unix-48/OPB.h index 385a9146..97c4485c 100644 --- a/bootstrap/unix-48/OPB.h +++ b/bootstrap/unix-48/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/unix-48/OPC.c b/bootstrap/unix-48/OPC.c index 45784a13..9f818a4a 100644 --- a/bootstrap/unix-48/OPC.c +++ b/bootstrap/unix-48/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "OPM.h" @@ -227,12 +227,12 @@ static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause) if (__IN(typ->comp, 0x0c)) { OPC_Stars(typ->BaseTyp, &*openClause); *openClause = typ->comp == 2; - } else if (typ->form == 14) { + } else if (typ->form == 12) { OPM_Write('('); OPM_Write('*'); } else { pointers = 0; - while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 13)) { + while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 11)) { pointers += 1; typ = typ->BaseTyp; } @@ -277,16 +277,16 @@ static void OPC_DeclareObj (OPT_Object dcl, BOOLEAN scopeDef) for (;;) { form = typ->form; comp = typ->comp; - if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 12) || comp == 4) { + if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 10) || comp == 4) { break; - } else if ((form == 13 && typ->BaseTyp->comp != 3)) { + } else if ((form == 11 && typ->BaseTyp->comp != 3)) { openClause = 1; - } else if (form == 14 || __IN(comp, 0x0c)) { + } else if (form == 12 || __IN(comp, 0x0c)) { if (openClause) { OPM_Write(')'); openClause = 0; } - if (form == 14) { + if (form == 12) { if (OPC_ansi) { OPM_Write(')'); OPC_AnsiParamList(typ->link, 0); @@ -331,19 +331,19 @@ static void OPC_DeclareBase (OPT_Object dcl) LONGINT off, n, dummy; typ = dcl->typ; prev = typ; - while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 12)) && !((typ->form == 13 && typ->BaseTyp->comp == 3)))) { + while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 10)) && !((typ->form == 11 && typ->BaseTyp->comp == 3)))) { prev = typ; typ = typ->BaseTyp; } obj = typ->strobj; - if (typ->form == 12) { + if (typ->form == 10) { OPM_WriteString((CHAR*)"void", 5); } else if ((obj != NIL && !OPC_Undefined(obj))) { OPC_Ident(obj); } else if (typ->comp == 4) { OPM_WriteString((CHAR*)"struct ", 8); OPC_Andent(typ); - if ((prev->form != 13 && (obj != NIL || dcl->name[0] == 0x00))) { + if ((prev->form != 11 && (obj != NIL || dcl->name[0] == 0x00))) { if ((typ->BaseTyp != NIL && typ->BaseTyp->strobj->vis != 0)) { OPM_WriteString((CHAR*)" { /* ", 7); OPC_Ident(typ->BaseTyp->strobj); @@ -357,7 +357,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_FieldList(typ, 1, &off, &n, &dummy); OPC_EndBlk0(); } - } else if ((typ->form == 13 && typ->BaseTyp->comp == 3)) { + } else if ((typ->form == 11 && typ->BaseTyp->comp == 3)) { typ = typ->BaseTyp->BaseTyp; nofdims = 1; while (typ->comp == 3) { @@ -372,7 +372,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_BegStat(); __NEW(obj, OPT_ObjDesc); __NEW(obj->typ, OPT_StrDesc); - obj->typ->form = 15; + obj->typ->form = 13; obj->typ->comp = 2; obj->typ->n = 1; obj->typ->BaseTyp = typ; @@ -393,7 +393,7 @@ LONGINT OPC_NofPtrs (OPT_Struct typ) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { _o_result = 1; return _o_result; } else if ((typ->comp == 4 && __MASK(typ->sysflag, -256) == 0)) { @@ -435,7 +435,7 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, LONGINT adr, LONGINT *cnt) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n, i; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { OPM_WriteInt(adr); OPM_WriteString((CHAR*)", ", 3); *cnt += 1; @@ -540,7 +540,7 @@ static void OPC_DeclareParams (OPT_Object par, BOOLEAN macro) if (macro) { OPM_WriteStringVar((void*)par->name, 256); } else { - if ((par->mode == 1 && par->typ->form == 7)) { + if ((par->mode == 1 && par->typ->form == 5)) { OPM_Write('_'); } OPC_Ident(par); @@ -612,7 +612,7 @@ OPT_Object OPC_BaseTProc (OPT_Object obj) OPT_Struct typ = NIL, base = NIL; LONGINT mno; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } base = typ->BaseTyp; @@ -635,7 +635,7 @@ static void OPC_DefineTProcMacros (OPT_Object obj, BOOLEAN *empty) OPC_Ident(obj); OPC_DeclareParams(obj->link, 1); OPM_WriteString((CHAR*)" __SEND(", 9); - if (obj->link->typ->form == 13) { + if (obj->link->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPC_Ident(obj->link); OPM_Write(')'); @@ -673,7 +673,7 @@ static void OPC_DefineType (OPT_Struct str) if (obj == NIL || OPC_Undefined(obj)) { if (obj != NIL) { if (obj->linkadr == 1) { - if (str->form != 13) { + if (str->form != 11) { OPM_Mark(244, str->txtpos); obj->linkadr = 2; } @@ -692,13 +692,13 @@ static void OPC_DefineType (OPT_Struct str) } field = field->link; } - } else if (str->form == 13) { + } else if (str->form == 11) { if (str->BaseTyp->comp != 4) { OPC_DefineType(str->BaseTyp); } } else if (__IN(str->comp, 0x0c)) { OPC_DefineType(str->BaseTyp); - } else if (str->form == 14) { + } else if (str->form == 12) { if (str->BaseTyp != OPT_notyp) { OPC_DefineType(str->BaseTyp); } @@ -889,7 +889,7 @@ LONGINT OPC_BaseAlignment (OPT_Struct typ) { LONGINT _o_result; LONGINT alignment; - if (typ->form == 15) { + if (typ->form == 13) { if (typ->comp == 4) { alignment = __MASK(typ->align, -65536); } else { @@ -1017,7 +1017,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_WriteString((CHAR*)"export ", 8); } } - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_WriteString((CHAR*)"double", 7); } else { OPC_DeclareBase(obj); @@ -1026,7 +1026,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_Write(','); } OPM_Write(' '); - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_Write('_'); } OPC_DeclareObj(obj, vis == 3); @@ -1043,7 +1043,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; - } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 13)) { + } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 11)) { OPM_WriteString((CHAR*)" = NIL", 7); } } @@ -1380,7 +1380,7 @@ void OPC_GenEnumPtrs (OPT_Object var) OPC_BegBlk(); } OPC_BegStat(); - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"P(", 3); OPC_Ident(var); OPM_Write(')'); @@ -1399,7 +1399,7 @@ void OPC_GenEnumPtrs (OPT_Object var) n = n * typ->n; typ = typ->BaseTyp; } - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"__ENUMP(", 9); OPC_Ident(var); OPC_Str1((CHAR*)", #, P)", 8, n); @@ -1562,7 +1562,7 @@ void OPC_EnterProc (OPT_Object proc) if (!OPC_ansi) { var = proc->link; while (var != NIL) { - if ((var->typ->form == 7 && var->mode == 1)) { + if ((var->typ->form == 5 && var->mode == 1)) { OPC_BegStat(); OPC_Ident(var->typ->strobj); OPM_Write(' '); @@ -1878,7 +1878,7 @@ void OPC_Case (LONGINT caseVal, INTEGER form) case 3: OPC_CharacterLiteral(caseVal); break; - case 5: + case 4: OPM_WriteInt(caseVal); break; default: @@ -1976,16 +1976,16 @@ void OPC_Constant (OPT_Const con, INTEGER form) case 3: OPC_CharacterLiteral(con->intval); break; - case 5: + case 4: OPM_WriteInt(con->intval); break; - case 7: + case 5: OPM_WriteReal(con->realval, 'f'); break; - case 8: + case 6: OPM_WriteReal(con->realval, 0x00); break; - case 9: + case 7: OPM_WriteString((CHAR*)"0x", 3); skipLeading = 1; s = con->setval; @@ -2008,10 +2008,10 @@ void OPC_Constant (OPT_Const con, INTEGER form) OPM_Write('0'); } break; - case 10: + case 8: OPC_StringLiteral(*con->ext, 256, con->intval2 - 1); break; - case 11: + case 9: OPM_WriteString((CHAR*)"NIL", 4); break; default: diff --git a/bootstrap/unix-48/OPC.h b/bootstrap/unix-48/OPC.h index 4243328e..38f95afe 100644 --- a/bootstrap/unix-48/OPC.h +++ b/bootstrap/unix-48/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/unix-48/OPM.c b/bootstrap/unix-48/OPM.c index 979d9598..f2da0fed 100644 --- a/bootstrap/unix-48/OPM.c +++ b/bootstrap/unix-48/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "Console.h" diff --git a/bootstrap/unix-48/OPM.h b/bootstrap/unix-48/OPM.h index f93bcd98..15a980a6 100644 --- a/bootstrap/unix-48/OPM.h +++ b/bootstrap/unix-48/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/unix-48/OPP.c b/bootstrap/unix-48/OPP.c index b0e235d3..21c21350 100644 --- a/bootstrap/unix-48/OPP.c +++ b/bootstrap/unix-48/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPB.h" #include "OPM.h" @@ -136,7 +136,7 @@ static void OPP_CheckSysFlag (INTEGER *sysflag, INTEGER default_) OPP_err(135); } OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { sf = x->conval->intval; if (sf < 0 || sf > 1) { OPP_err(220); @@ -158,7 +158,7 @@ static void OPP_RecordType (OPT_Struct *typ, OPT_Struct *banned) OPT_Object fld = NIL, first = NIL, last = NIL, base = NIL; OPT_Struct ftyp = NIL; INTEGER sysflag; - *typ = OPT_NewStr(15, 4); + *typ = OPT_NewStr(13, 4); (*typ)->BaseTyp = NIL; OPP_CheckSysFlag(&sysflag, -1); if (OPP_sym == 30) { @@ -253,7 +253,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) INTEGER sysflag; OPP_CheckSysFlag(&sysflag, 0); if (OPP_sym == 25) { - *typ = OPT_NewStr(15, 3); + *typ = OPT_NewStr(13, 3); (*typ)->mno = 0; (*typ)->sysflag = sysflag; OPS_Get(&OPP_sym); @@ -265,10 +265,10 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) (*typ)->n = 0; } } else { - *typ = OPT_NewStr(15, 2); + *typ = OPT_NewStr(13, 2); (*typ)->sysflag = sysflag; OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { n = x->conval->intval; if (n <= 0 || n > OPM_MaxIndex) { OPP_err(63); @@ -301,7 +301,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) static void OPP_PointerType (OPT_Struct *typ) { OPT_Object id = NIL; - *typ = OPT_NewStr(13, 1); + *typ = OPT_NewStr(11, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); OPP_CheckSym(28); if (OPP_sym == 38) { @@ -409,7 +409,7 @@ static void OPP_FormalParameters (OPT_Object *firstPar, OPT_Struct *resTyp) if (OPP_sym == 38) { OPP_qualident(&res); if (res->mode == 5) { - if (res->typ->form < 15) { + if (res->typ->form < 13) { *resTyp = res->typ; } else { OPP_err(54); @@ -459,7 +459,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) OPP_PointerType(&*typ); } else if (OPP_sym == 61) { OPS_Get(&OPP_sym); - *typ = OPT_NewStr(14, 1); + *typ = OPT_NewStr(12, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); if (OPP_sym == 30) { OPS_Get(&OPP_sym); @@ -488,7 +488,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) static void OPP_Type (OPT_Struct *typ, OPT_Struct *banned) { OPP_TypeDecl(&*typ, &*banned); - if (((((*typ)->form == 13 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { + if (((((*typ)->form == 11 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { OPP_err(0); } } @@ -503,7 +503,7 @@ static void OPP_selector (OPT_Node *x) if (OPP_sym == 31) { OPS_Get(&OPP_sym); for (;;) { - if (((*x)->typ != NIL && (*x)->typ->form == 13)) { + if (((*x)->typ != NIL && (*x)->typ->form == 11)) { OPB_DeRef(&*x); } OPP_Expression(&y); @@ -521,7 +521,7 @@ static void OPP_selector (OPT_Node *x) __COPY(OPS_name, name, 256); OPS_Get(&OPP_sym); if ((*x)->typ != NIL) { - if ((*x)->typ->form == 13) { + if ((*x)->typ->form == 11) { OPB_DeRef(&*x); } if ((*x)->typ->comp == 4) { @@ -543,7 +543,7 @@ static void OPP_selector (OPT_Node *x) OPP_err(75); } typ = y->obj->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField((*x)->obj->name, typ->BaseTyp, &proc); @@ -572,7 +572,7 @@ static void OPP_selector (OPT_Node *x) } else if (OPP_sym == 17) { OPS_Get(&OPP_sym); OPB_DeRef(&*x); - } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 14)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { + } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 12)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&obj); @@ -871,10 +871,10 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } else { *typ = obj->typ; *rec = *typ; - if ((*rec)->form == 13) { + if ((*rec)->form == 11) { *rec = (*rec)->BaseTyp; } - if (!((((*mode == 1 && (*typ)->form == 13)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { + if (!((((*mode == 1 && (*typ)->form == 11)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { OPP_err(70); *rec = NIL; } @@ -888,7 +888,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } OPP_CheckSym(22); if (*rec == NIL) { - *rec = OPT_NewStr(15, 4); + *rec = OPT_NewStr(13, 4); (*rec)->BaseTyp = NIL; } } @@ -896,7 +896,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St static BOOLEAN OPP_Extends (OPT_Struct x, OPT_Struct b) { BOOLEAN _o_result; - if ((b->form == 13 && x->form == 13)) { + if ((b->form == 11 && x->form == 11)) { b = b->BaseTyp; x = x->BaseTyp; } @@ -1173,14 +1173,14 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O for (;;) { OPP_ConstExpression(&x); f = x->typ->form; - if (__IN(f, 0x28)) { + if (__IN(f, 0x18)) { xval = x->conval->intval; } else { OPP_err(61); xval = 1; } - if (f == 5) { - if (!(LabelTyp->form == 5) || LabelTyp->size < x->typ->size) { + if (f == 4) { + if (!(LabelTyp->form == 4) || LabelTyp->size < x->typ->size) { OPP_err(60); } } else if ((SYSTEM_INT16)LabelTyp->form != f) { @@ -1190,7 +1190,7 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O OPS_Get(&OPP_sym); OPP_ConstExpression(&y); yval = y->conval->intval; - if (((SYSTEM_INT16)y->typ->form != f && !((f == 5 && y->typ->form == 5)))) { + if (((SYSTEM_INT16)y->typ->form != f && !((f == 4 && y->typ->form == 4)))) { OPP_err(60); } if (yval < xval) { @@ -1253,7 +1253,7 @@ static void CasePart__31 (OPT_Node *x) *StatSeq__30_s->pos = OPM_errpos; if ((*x)->class == 8 || (*x)->class == 9) { OPP_err(126); - } else if (!__IN((*x)->typ->form, 0x38)) { + } else if (!__IN((*x)->typ->form, 0x18)) { OPP_err(125); } OPP_CheckSym(25); @@ -1439,7 +1439,7 @@ static void OPP_StatSeq (OPT_Node *stat) OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&id); - if (!(id->typ->form == 5)) { + if (!(id->typ->form == 4)) { OPP_err(68); } OPP_CheckSym(34); @@ -1471,7 +1471,7 @@ static void OPP_StatSeq (OPT_Node *stat) SetPos__35(z); OPB_Link(&*stat, &last, z); y = OPB_NewLeaf(t); - } else if (!(y->typ->form == 5) || y->typ->size > x->left->typ->size) { + } else if (!(y->typ->form == 4) || y->typ->size > x->left->typ->size) { OPP_err(113); } OPB_Link(&*stat, &last, x); @@ -1526,7 +1526,7 @@ static void OPP_StatSeq (OPT_Node *stat) if (OPP_sym == 38) { OPP_qualident(&id); y = OPB_NewLeaf(id); - if ((((id != NIL && id->typ->form == 13)) && (id->mode == 2 || !id->leaf))) { + if ((((id != NIL && id->typ->form == 11)) && (id->mode == 2 || !id->leaf))) { OPP_err(245); } OPP_CheckSym(20); diff --git a/bootstrap/unix-48/OPP.h b/bootstrap/unix-48/OPP.h index 0ddbe4c3..8bed9493 100644 --- a/bootstrap/unix-48/OPP.h +++ b/bootstrap/unix-48/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/unix-48/OPS.c b/bootstrap/unix-48/OPS.c index 89c8242e..f197a5c6 100644 --- a/bootstrap/unix-48/OPS.c +++ b/bootstrap/unix-48/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #include "SYSTEM.h" #include "OPM.h" diff --git a/bootstrap/unix-48/OPS.h b/bootstrap/unix-48/OPS.h index 46e05201..1e99f5e9 100644 --- a/bootstrap/unix-48/OPS.h +++ b/bootstrap/unix-48/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/unix-48/OPT.c b/bootstrap/unix-48/OPT.c index 7398b44a..5b495ad5 100644 --- a/bootstrap/unix-48/OPT.c +++ b/bootstrap/unix-48/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPM.h" #include "OPS.h" @@ -173,7 +173,7 @@ OPT_Struct OPT_ShorterOrLongerType (OPT_Struct x, INTEGER dir) { OPT_Struct _o_result; INTEGER i; - __ASSERT(x->form == 5, 0); + __ASSERT(x->form == 4, 0); __ASSERT(dir == 1 || dir == -1, 0); __ASSERT(x->BaseTyp == OPT_undftyp, 0); i = 0; @@ -284,7 +284,7 @@ void OPT_Close (void) OPT_GlbMod[__X(i, 64)] = NIL; i += 1; } - i = 16; + i = 14; while (i < 255) { OPT_impCtxt.ref[__X(i, 255)] = NIL; OPT_impCtxt.old[__X(i, 255)] = NIL; @@ -483,14 +483,14 @@ void OPT_IdFPrint (OPT_Struct typ) OPT_FPrintName(&idfp, (void*)OPT_GlbMod[__X(typ->mno, 64)]->name, 256); OPT_FPrintName(&idfp, (void*)strobj->name, 256); } - if ((f == 13 || (c == 4 && btyp != NIL)) || c == 3) { + if ((f == 11 || (c == 4 && btyp != NIL)) || c == 3) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); } else if (c == 2) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); OPM_FPrint(&idfp, typ->n); - } else if (f == 14) { + } else if (f == 12) { OPT_FPrintSign(&idfp, btyp, typ->link); } typ->idfp = idfp; @@ -519,7 +519,7 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; FPrintHdFld__15(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -531,8 +531,8 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { - OPM_FPrint(&*FPrintStr__12_s->pvfp, 13); + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { + OPM_FPrint(&*FPrintStr__12_s->pvfp, 11); OPM_FPrint(&*FPrintStr__12_s->pvfp, adr); OPT_nofhdfld += 1; } @@ -595,7 +595,7 @@ void OPT_FPrintStr (OPT_Struct typ) f = typ->form; c = typ->comp; btyp = typ->BaseTyp; - if (f == 13) { + if (f == 11) { strobj = typ->strobj; bstrobj = btyp->strobj; if (((strobj == NIL || strobj->name[0] == 0x00) || bstrobj == NIL) || bstrobj->name[0] == 0x00) { @@ -603,7 +603,7 @@ void OPT_FPrintStr (OPT_Struct typ) OPM_FPrint(&pbfp, btyp->pbfp); pvfp = pbfp; } - } else if (f == 14) { + } else if (f == 12) { } else if (__IN(c, 0x0c)) { OPT_FPrintStr(btyp); OPM_FPrint(&pbfp, btyp->pvfp); @@ -649,23 +649,23 @@ void OPT_FPrintObj (OPT_Object obj) f = obj->typ->form; OPM_FPrint(&fprint, f); switch (f) { - case 2: case 3: case 5: + case 2: case 3: case 4: OPM_FPrint(&fprint, obj->conval->intval); break; - case 9: + case 7: OPM_FPrintSet(&fprint, obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_FPrintReal(&fprint, rval); break; - case 8: + case 6: OPM_FPrintLReal(&fprint, obj->conval->realval); break; - case 10: + case 8: OPT_FPrintName(&fprint, (void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -850,22 +850,22 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) OPM_SymRCh(&ch); conval->intval = (SYSTEM_INT16)ch; break; - case 5: + case 4: conval->intval = OPM_SymRInt(); break; - case 9: + case 7: OPM_SymRSet(&conval->setval); break; - case 7: + case 5: OPM_SymRReal(&rval); conval->realval = rval; conval->intval = -1; break; - case 8: + case 6: OPM_SymRLReal(&conval->realval); conval->intval = -1; break; - case 10: + case 8: ext = OPT_NewExt(); conval->ext = ext; i = 0; @@ -877,7 +877,7 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) conval->intval2 = i; conval->intval = -1; break; - case 11: + case 9: conval->intval = 0; break; default: @@ -979,7 +979,7 @@ static OPT_Object OPT_InTProc (SHORTINT mno) static OPT_Struct OPT_InTyp (LONGINT tag) { OPT_Struct _o_result; - if (tag == 5) { + if (tag == 4) { _o_result = OPT_IntType(OPM_SymRInt()); return _o_result; } else { @@ -1054,20 +1054,20 @@ static void OPT_InStruct (OPT_Struct *typ) } switch (tag) { case 36: - (*typ)->form = 13; + (*typ)->form = 11; (*typ)->size = OPM_PointerSize; (*typ)->n = 0; OPT_InStruct(&(*typ)->BaseTyp); break; case 37: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 2; OPT_InStruct(&(*typ)->BaseTyp); (*typ)->n = OPM_SymRInt(); (*OPT_typSize)(*typ); break; case 38: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 3; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp->comp == 3) { @@ -1078,7 +1078,7 @@ static void OPT_InStruct (OPT_Struct *typ) (*OPT_typSize)(*typ); break; case 39: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 4; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp == OPT_notyp) { @@ -1112,7 +1112,7 @@ static void OPT_InStruct (OPT_Struct *typ) } break; case 40: - (*typ)->form = 14; + (*typ)->form = 12; (*typ)->size = OPM_ProcSize; OPT_InSign(mno, &(*typ)->BaseTyp, &(*typ)->link); break; @@ -1191,7 +1191,7 @@ static OPT_Object OPT_InObj (SHORTINT mno) obj = OPT_NewObj(); obj->mnolev = -mno; obj->vis = 1; - if (tag <= 13) { + if (tag <= 11) { obj->mode = 3; obj->conval = OPT_NewConst(); OPT_InConstant(tag, obj->conval); @@ -1288,7 +1288,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done) obj->scope = OPT_syslink; obj->typ = OPT_notyp; } else { - OPT_impCtxt.nofr = 16; + OPT_impCtxt.nofr = 14; OPT_impCtxt.minr = 255; OPT_impCtxt.nofm = 0; OPT_impCtxt.self = __STRCMP(aliasName, "@self") == 0; @@ -1355,7 +1355,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; OPT_OutHdFld(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -1367,7 +1367,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { OPM_SymWInt(27); OPM_SymWInt(adr); OPT_nofhdfld += 1; @@ -1439,7 +1439,7 @@ static void OPT_OutStr (OPT_Struct typ) OPT_Object strobj = NIL; if (typ->ref < OPT_expCtxt.ref) { OPM_SymWInt(-typ->ref); - if (typ->ref == 5) { + if (typ->ref == 4) { OPM_SymWInt(typ->size); } } else { @@ -1474,15 +1474,15 @@ static void OPT_OutStr (OPT_Struct typ) OPM_SymWInt(typ->sysflag); } switch (typ->form) { - case 13: + case 11: OPM_SymWInt(36); OPT_OutStr(typ->BaseTyp); break; - case 14: + case 12: OPM_SymWInt(40); OPT_OutSign(typ->BaseTyp, typ->link); break; - case 15: + case 13: switch (typ->comp) { case 2: OPM_SymWInt(37); @@ -1537,24 +1537,24 @@ static void OPT_OutConstant (OPT_Object obj) case 2: case 3: OPM_SymWCh((CHAR)obj->conval->intval); break; - case 5: + case 4: OPM_SymWInt(obj->conval->intval); OPM_SymWInt(obj->typ->size); break; - case 9: + case 7: OPM_SymWSet(obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_SymWReal(rval); break; - case 8: + case 6: OPM_SymWLReal(obj->conval->realval); break; - case 10: + case 8: OPT_OutName((void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -1668,7 +1668,7 @@ void OPT_Export (BOOLEAN *ext, BOOLEAN *new) OPM_SymWInt(16); OPT_OutName((void*)OPT_SelfName, 256); OPT_expCtxt.reffp = 0; - OPT_expCtxt.ref = 16; + OPT_expCtxt.ref = 14; OPT_expCtxt.nofm = 1; OPT_expCtxt.locmno[0] = 0; i = 1; @@ -1844,16 +1844,16 @@ export void *OPT__init(void) OPM_errpos = 0; OPT_InitStruct(&OPT_undftyp, 0); OPT_undftyp->BaseTyp = OPT_undftyp; - OPT_InitStruct(&OPT_notyp, 12); - OPT_InitStruct(&OPT_stringtyp, 10); - OPT_InitStruct(&OPT_niltyp, 11); + OPT_InitStruct(&OPT_notyp, 10); + OPT_InitStruct(&OPT_stringtyp, 8); + OPT_InitStruct(&OPT_niltyp, 9); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); - OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp); - OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_PointerSize, &OPT_ainttyp); - OPT_EnterTyp((CHAR*)"INT8", 5, 1, &OPT_int8typ); - OPT_EnterTyp((CHAR*)"INT16", 5, 2, &OPT_int16typ); - OPT_EnterTyp((CHAR*)"INT32", 5, 4, &OPT_int32typ); - OPT_EnterTyp((CHAR*)"INT64", 5, 8, &OPT_int64typ); + OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); + OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp); + OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); + OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); + OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); + OPT_EnterTyp((CHAR*)"INT64", 4, 8, &OPT_int64typ); OPT_EnterProc((CHAR*)"ADR", 20); OPT_EnterProc((CHAR*)"CC", 21); OPT_EnterProc((CHAR*)"LSH", 22); @@ -1871,12 +1871,12 @@ export void *OPT__init(void) OPT_topScope->right = NIL; OPT_EnterTyp((CHAR*)"BOOLEAN", 2, OPM_BoolSize, &OPT_booltyp); OPT_EnterTyp((CHAR*)"CHAR", 3, OPM_CharSize, &OPT_chartyp); - OPT_EnterTyp((CHAR*)"SET", 9, OPM_SetSize, &OPT_settyp); - OPT_EnterTyp((CHAR*)"REAL", 7, OPM_RealSize, &OPT_realtyp); - OPT_EnterTyp((CHAR*)"INTEGER", 5, OPM_IntSize, &OPT_inttyp); - OPT_EnterTyp((CHAR*)"LONGINT", 5, OPM_LIntSize, &OPT_linttyp); - OPT_EnterTyp((CHAR*)"LONGREAL", 8, OPM_LRealSize, &OPT_lrltyp); - OPT_EnterTyp((CHAR*)"SHORTINT", 5, OPM_SIntSize, &OPT_sinttyp); + OPT_EnterTyp((CHAR*)"SET", 7, OPM_SetSize, &OPT_settyp); + OPT_EnterTyp((CHAR*)"REAL", 5, OPM_RealSize, &OPT_realtyp); + OPT_EnterTyp((CHAR*)"INTEGER", 4, OPM_IntSize, &OPT_inttyp); + OPT_EnterTyp((CHAR*)"LONGINT", 4, OPM_LIntSize, &OPT_linttyp); + OPT_EnterTyp((CHAR*)"LONGREAL", 6, OPM_LRealSize, &OPT_lrltyp); + OPT_EnterTyp((CHAR*)"SHORTINT", 4, OPM_SIntSize, &OPT_sinttyp); OPT_EnterBoolConst((CHAR*)"FALSE", 0); OPT_EnterBoolConst((CHAR*)"TRUE", 1); OPT_EnterProc((CHAR*)"HALT", 0); @@ -1904,14 +1904,14 @@ export void *OPT__init(void) OPT_impCtxt.ref[1] = OPT_bytetyp; OPT_impCtxt.ref[2] = OPT_booltyp; OPT_impCtxt.ref[3] = OPT_chartyp; - OPT_impCtxt.ref[5] = OPT_inttyp; - OPT_impCtxt.ref[7] = OPT_realtyp; - OPT_impCtxt.ref[8] = OPT_lrltyp; - OPT_impCtxt.ref[9] = OPT_settyp; - OPT_impCtxt.ref[10] = OPT_stringtyp; - OPT_impCtxt.ref[11] = OPT_niltyp; - OPT_impCtxt.ref[12] = OPT_notyp; - OPT_impCtxt.ref[13] = OPT_sysptrtyp; + OPT_impCtxt.ref[4] = OPT_inttyp; + OPT_impCtxt.ref[5] = OPT_realtyp; + OPT_impCtxt.ref[6] = OPT_lrltyp; + OPT_impCtxt.ref[7] = OPT_settyp; + OPT_impCtxt.ref[8] = OPT_stringtyp; + OPT_impCtxt.ref[9] = OPT_niltyp; + OPT_impCtxt.ref[10] = OPT_notyp; + OPT_impCtxt.ref[11] = OPT_sysptrtyp; OPT_IntTypes[1] = OPT_sinttyp; OPT_IntTypes[2] = OPT_inttyp; OPT_IntTypes[3] = OPT_linttyp; diff --git a/bootstrap/unix-48/OPT.h b/bootstrap/unix-48/OPT.h index 3e352ca3..307b94e2 100644 --- a/bootstrap/unix-48/OPT.h +++ b/bootstrap/unix-48/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/unix-48/OPV.c b/bootstrap/unix-48/OPV.c index 7538f014..df62e985 100644 --- a/bootstrap/unix-48/OPV.c +++ b/bootstrap/unix-48/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPC.h" #include "OPM.h" @@ -122,14 +122,14 @@ void OPV_TypSize (OPT_Struct typ) } else if (c == 2) { OPV_TypSize(typ->BaseTyp); typ->size = typ->n * typ->BaseTyp->size; - } else if (f == 13) { + } else if (f == 11) { typ->size = OPM_PointerSize; if (typ->BaseTyp == OPT_undftyp) { OPM_Mark(128, typ->n); } else { OPV_TypSize(typ->BaseTyp); } - } else if (f == 14) { + } else if (f == 12) { typ->size = OPM_ProcSize; } else if (c == 3) { btyp = typ->BaseTyp; @@ -162,7 +162,7 @@ static void OPV_GetTProcNum (OPT_Object obj) oldPos = OPM_errpos; OPM_errpos = obj->scope->adr; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(obj->name, typ->BaseTyp, &redef); @@ -236,7 +236,7 @@ static void OPV_Traverse (OPT_Object obj, OPT_Object outerScope, BOOLEAN exporte if ((mode == 5 && (obj->vis != 0) == exported)) { typ = obj->typ; OPV_TypSize(obj->typ); - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } if (typ->comp == 4) { @@ -348,7 +348,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN case 12: switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -357,7 +357,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 2: - if (form == 9) { + if (form == 7) { _o_result = 3; return _o_result; } else { @@ -370,7 +370,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN return _o_result; break; case 6: - if (form == 9) { + if (form == 7) { _o_result = 2; return _o_result; } else { @@ -379,7 +379,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 7: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -463,7 +463,7 @@ static BOOLEAN OPV_SideEffects (OPT_Node n) static void OPV_Entier (OPT_Node n, INTEGER prec) { - if (__IN(n->typ->form, 0x0180)) { + if (__IN(n->typ->form, 0x60)) { OPM_WriteString((CHAR*)"__ENTIER(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -502,11 +502,11 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) INTEGER from, to; from = n->typ->form; to = newtype->form; - if (to == 9) { + if (to == 7) { OPM_WriteString((CHAR*)"__SETOF(", 9); OPV_Entier(n, -1); OPM_Write(')'); - } else if (to == 5) { + } else if (to == 4) { if ((newtype->size < n->typ->size && __IN(2, OPM_opt))) { OPM_WriteString((CHAR*)"__SHORT", 8); if (OPV_SideEffects(n)) { @@ -541,7 +541,7 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) static void OPV_TypeOf (OPT_Node n) { - if (n->typ->form == 13) { + if (n->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -793,14 +793,14 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } else if (OPV_ansi) { if ((__IN(comp, 0x0c) && n->class == 7)) { OPM_WriteString((CHAR*)"(CHAR*)", 8); - } else if ((((form == 13 && typ != n->typ)) && n->typ != OPT_niltyp)) { + } else if ((((form == 11 && typ != n->typ)) && n->typ != OPT_niltyp)) { OPM_WriteString((CHAR*)"(void*)", 8); } } else { - if ((__IN(form, 0x0180) && n->typ->form == 5)) { + if ((__IN(form, 0x60) && n->typ->form == 4)) { OPM_WriteString((CHAR*)"(double)", 9); prec = 9; - } else if (form == 5) { + } else if (form == 4) { OPV_SizeCast(n->typ->size, typ->size); } } @@ -811,7 +811,7 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } if ((((mode == 2 && n->class == 11)) && n->subcl == 29)) { OPV_expr(n->left, prec); - } else if ((form == 5 && n->class == 7)) { + } else if ((form == 4 && n->class == 7)) { OPV_ParIntLiteral(n->conval->intval, n->typ->size); } else { OPV_expr(n, prec); @@ -860,7 +860,7 @@ static OPT_Object OPV_SuperProc (OPT_Node n) OPT_Object obj = NIL; OPT_Struct typ = NIL; typ = n->right->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(n->left->obj->name, typ->BaseTyp, &obj); @@ -901,7 +901,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); break; case 7: - if (form == 9) { + if (form == 7) { OPM_Write('~'); } else { OPM_Write('-'); @@ -929,7 +929,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 21: if (OPV_SideEffects(l)) { - if (l->typ->form < 7) { + if (l->typ->form < 5) { if (l->typ->size <= 4) { OPM_WriteString((CHAR*)"(int)", 6); } @@ -958,18 +958,18 @@ static void OPV_expr (OPT_Node n, INTEGER prec) if (l->class == 1) { OPC_CompleteIdent(l->obj); } else { - if ((l->typ->form != 10 && !__IN(l->typ->comp, 0x0c))) { + if ((l->typ->form != 8 && !__IN(l->typ->comp, 0x0c))) { OPM_Write('&'); } OPV_expr(l, exprPrec); } break; case 29: - if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x6220) && __IN(l->typ->form, 0x6220))) && n->typ->size == l->typ->size)) { + if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x1890) && __IN(l->typ->form, 0x1890))) && n->typ->size == l->typ->size)) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); - if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) { + if (__IN(n->typ->form, 0x1800) || __IN(l->typ->form, 0x1800)) { OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", 16); } OPV_expr(l, exprPrec); @@ -1079,7 +1079,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 9: case 10: case 11: case 12: case 13: case 14: - if (__IN(l->typ->form, 0x8400)) { + if (__IN(l->typ->form, 0x2100)) { OPM_WriteString((CHAR*)"__STRCMP(", 10); OPV_expr(l, -1); OPM_WriteString((CHAR*)", ", 3); @@ -1091,31 +1091,31 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); OPC_Cmp(subclass); typ = l->typ; - if ((((((typ->form == 13 && r->typ->form != 11)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { + if ((((((typ->form == 11 && r->typ->form != 9)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { OPM_WriteString((CHAR*)"(void *) ", 10); } OPV_expr(r, exprPrec); } break; default: - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write('('); } OPV_expr(l, exprPrec); switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ", 4); } else { OPM_WriteString((CHAR*)" * ", 4); } break; case 2: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" ^ ", 4); } else { OPM_WriteString((CHAR*)" / ", 4); - if (r->obj == NIL || r->obj->typ->form == 5) { + if (r->obj == NIL || r->obj->typ->form == 4) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); @@ -1126,14 +1126,14 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPM_WriteString((CHAR*)" && ", 5); break; case 6: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" | ", 4); } else { OPM_WriteString((CHAR*)" + ", 4); } break; case 7: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ~", 5); } else { OPM_WriteString((CHAR*)" - ", 4); @@ -1149,7 +1149,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; } OPV_expr(r, exprPrec); - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write(')'); } break; @@ -1323,7 +1323,7 @@ static void OPV_NewArr (OPT_Node d, OPT_Node x) if ((base->comp == 4 && OPC_NofPtrs(base) != 0)) { OPC_Ident(base->strobj); OPM_WriteString((CHAR*)"__typ", 6); - } else if (base->form == 13) { + } else if (base->form == 11) { OPM_WriteString((CHAR*)"POINTER__typ", 13); } else { OPM_WriteString((CHAR*)"NIL", 4); @@ -1429,11 +1429,11 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } OPM_Write(')'); } else { - if ((((((l->typ->form == 13 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { + if ((((((l->typ->form == 11 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { l->obj->adr = 0; OPV_design(l, -1); l->obj->adr = 1; - if (r->typ->form != 11) { + if (r->typ->form != 9) { OPM_WriteString((CHAR*)" = (void*)", 11); } else { OPM_WriteString((CHAR*)" = ", 4); @@ -1444,7 +1444,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } if (l->typ == r->typ) { OPV_expr(r, -1); - } else if ((((l->typ->form == 13 && r->typ->form != 11)) && l->typ->strobj != NIL)) { + } else if ((((l->typ->form == 11 && r->typ->form != 9)) && l->typ->strobj != NIL)) { OPM_Write('('); OPC_Ident(l->typ->strobj); OPM_Write(')'); @@ -1629,7 +1629,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } else { if (n->left != NIL) { OPM_WriteString((CHAR*)"_o_result = ", 13); - if ((n->left->typ->form == 13 && n->obj->typ != n->left->typ)) { + if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) { OPM_WriteString((CHAR*)"(void*)", 8); OPV_expr(n->left, 10); } else { diff --git a/bootstrap/unix-48/OPV.h b/bootstrap/unix-48/OPV.h index 0299d34b..06bc39f1 100644 --- a/bootstrap/unix-48/OPV.h +++ b/bootstrap/unix-48/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/unix-48/Platform.c b/bootstrap/unix-48/Platform.c index 2508f6f7..033e03cf 100644 --- a/bootstrap/unix-48/Platform.c +++ b/bootstrap/unix-48/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" typedef diff --git a/bootstrap/unix-48/Platform.h b/bootstrap/unix-48/Platform.h index 4c7f2849..34d088bf 100644 --- a/bootstrap/unix-48/Platform.h +++ b/bootstrap/unix-48/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/unix-48/Reals.c b/bootstrap/unix-48/Reals.c index bea1f4aa..28a855aa 100644 --- a/bootstrap/unix-48/Reals.c +++ b/bootstrap/unix-48/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" diff --git a/bootstrap/unix-48/Reals.h b/bootstrap/unix-48/Reals.h index 6eeb5a87..65543fac 100644 --- a/bootstrap/unix-48/Reals.h +++ b/bootstrap/unix-48/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/unix-48/Strings.c b/bootstrap/unix-48/Strings.c index f1d4f53d..834c1fb1 100644 --- a/bootstrap/unix-48/Strings.c +++ b/bootstrap/unix-48/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" diff --git a/bootstrap/unix-48/Strings.h b/bootstrap/unix-48/Strings.h index 43656e74..2edcc736 100644 --- a/bootstrap/unix-48/Strings.h +++ b/bootstrap/unix-48/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/unix-48/Texts.c b/bootstrap/unix-48/Texts.c index bd5d1115..dddea925 100644 --- a/bootstrap/unix-48/Texts.c +++ b/bootstrap/unix-48/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Files.h" #include "Modules.h" diff --git a/bootstrap/unix-48/Texts.h b/bootstrap/unix-48/Texts.h index be79016b..5499c3d0 100644 --- a/bootstrap/unix-48/Texts.h +++ b/bootstrap/unix-48/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/unix-48/Vishap.c b/bootstrap/unix-48/Vishap.c index 7c16c24d..030b94f6 100644 --- a/bootstrap/unix-48/Vishap.c +++ b/bootstrap/unix-48/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkamSf */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkamSf */ #include "SYSTEM.h" #include "Configuration.h" #include "Heap.h" diff --git a/bootstrap/unix-48/errors.c b/bootstrap/unix-48/errors.c index 7a91fc31..3f916fe9 100644 --- a/bootstrap/unix-48/errors.c +++ b/bootstrap/unix-48/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" typedef diff --git a/bootstrap/unix-48/errors.h b/bootstrap/unix-48/errors.h index 4a787a17..2afac320 100644 --- a/bootstrap/unix-48/errors.h +++ b/bootstrap/unix-48/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/unix-48/extTools.c b/bootstrap/unix-48/extTools.c index cfb79ac9..bfab2dc6 100644 --- a/bootstrap/unix-48/extTools.c +++ b/bootstrap/unix-48/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "Console.h" diff --git a/bootstrap/unix-48/extTools.h b/bootstrap/unix-48/extTools.h index fb0797f3..ca635519 100644 --- a/bootstrap/unix-48/extTools.h +++ b/bootstrap/unix-48/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/unix-48/vt100.c b/bootstrap/unix-48/vt100.c index dfe62efa..84707926 100644 --- a/bootstrap/unix-48/vt100.c +++ b/bootstrap/unix-48/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Console.h" #include "Strings.h" diff --git a/bootstrap/unix-48/vt100.h b/bootstrap/unix-48/vt100.h index 73d985c9..6266a678 100644 --- a/bootstrap/unix-48/vt100.h +++ b/bootstrap/unix-48/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef vt100__h #define vt100__h diff --git a/bootstrap/unix-88/Configuration.c b/bootstrap/unix-88/Configuration.c index 5a7e6896..f4abd052 100644 --- a/bootstrap/unix-88/Configuration.c +++ b/bootstrap/unix-88/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" @@ -14,6 +14,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/08/31] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/01] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/unix-88/Configuration.h b/bootstrap/unix-88/Configuration.h index b38a0aa6..c756e930 100644 --- a/bootstrap/unix-88/Configuration.h +++ b/bootstrap/unix-88/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/unix-88/Console.c b/bootstrap/unix-88/Console.c index bb971366..d884a64a 100644 --- a/bootstrap/unix-88/Console.c +++ b/bootstrap/unix-88/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Platform.h" diff --git a/bootstrap/unix-88/Console.h b/bootstrap/unix-88/Console.h index 22d598fb..8d9e2fb5 100644 --- a/bootstrap/unix-88/Console.h +++ b/bootstrap/unix-88/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/unix-88/Files.c b/bootstrap/unix-88/Files.c index 5ae22903..67a7a958 100644 --- a/bootstrap/unix-88/Files.c +++ b/bootstrap/unix-88/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" diff --git a/bootstrap/unix-88/Files.h b/bootstrap/unix-88/Files.h index 17323792..3be486fe 100644 --- a/bootstrap/unix-88/Files.h +++ b/bootstrap/unix-88/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/unix-88/Heap.c b/bootstrap/unix-88/Heap.c index a5063871..5822f690 100644 --- a/bootstrap/unix-88/Heap.c +++ b/bootstrap/unix-88/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/unix-88/Heap.h b/bootstrap/unix-88/Heap.h index eebee23c..5e7c01fb 100644 --- a/bootstrap/unix-88/Heap.h +++ b/bootstrap/unix-88/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/unix-88/Modules.c b/bootstrap/unix-88/Modules.c index 5929cd57..004f1f8b 100644 --- a/bootstrap/unix-88/Modules.c +++ b/bootstrap/unix-88/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Console.h" diff --git a/bootstrap/unix-88/Modules.h b/bootstrap/unix-88/Modules.h index 03458258..6f5e4cad 100644 --- a/bootstrap/unix-88/Modules.h +++ b/bootstrap/unix-88/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/unix-88/OPB.c b/bootstrap/unix-88/OPB.c index fef28dff..eacff2d0 100644 --- a/bootstrap/unix-88/OPB.c +++ b/bootstrap/unix-88/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPM.h" @@ -318,7 +318,7 @@ void OPB_DeRef (OPT_Node *x) typ = (*x)->typ; if ((*x)->class >= 7) { OPB_err(78); - } else if (typ->form == 13) { + } else if (typ->form == 11) { if (typ == OPT_sysptrtyp) { OPB_err(57); } @@ -341,7 +341,7 @@ void OPB_Index (OPT_Node *x, OPT_Node y) f = y->typ->form; if ((*x)->class >= 7) { OPB_err(79); - } else if (f != 5 || __IN(y->class, 0x0300)) { + } else if (f != 4 || __IN(y->class, 0x0300)) { OPB_err(80); y->typ = OPT_inttyp; } @@ -438,10 +438,10 @@ void OPB_TypTest (OPT_Node *x, OPT_Object obj, BOOLEAN guard) TypTest__57_s = &_s; if (OPB_NotVar(*x)) { OPB_err(112); - } else if ((*x)->typ->form == 13) { + } else if ((*x)->typ->form == 11) { if (((*x)->typ->BaseTyp->comp != 4 && (*x)->typ != OPT_sysptrtyp)) { OPB_err(85); - } else if (obj->typ->form == 13) { + } else if (obj->typ->form == 11) { GTT__58((*x)->typ->BaseTyp, obj->typ->BaseTyp); } else { OPB_err(86); @@ -466,7 +466,7 @@ void OPB_In (OPT_Node *x, OPT_Node y) f = (*x)->typ->form; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if ((f == 5 && y->typ->form == 9)) { + } else if ((f == 4 && y->typ->form == 7)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (k < 0 || k > (SYSTEM_INT64)OPM_MaxSet) { @@ -505,7 +505,7 @@ static LONGINT OPB_log (LONGINT x) static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) { LONGREAL min, max, r; - if (f == 7) { + if (f == 5) { min = OPM_MinReal; max = OPM_MaxReal; } else { @@ -516,7 +516,7 @@ static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) if (r > max || r < min) { OPB_err(nr); x->realval = (LONGREAL)1; - } else if (f == 7) { + } else if (f == 5) { x->realval = x->realval; } x->intval = -1; @@ -568,21 +568,21 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 6: - if (!__IN(f, 0x01a0)) { + if (!__IN(f, 0x70)) { OPB_err(96); } break; case 7: - if (__IN(f, 0x03a0)) { + if (__IN(f, 0xf0)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-9223372036854775807-1)) { OPB_err(203); } else { z->conval->intval = -z->conval->intval; OPB_SetIntType(z); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { z->conval->realval = -z->conval->realval; } else { z->conval->setval = ~z->conval->setval; @@ -596,9 +596,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 21: - if (__IN(f, 0x01a0)) { + if (__IN(f, 0x70)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-9223372036854775807-1)) { OPB_err(203); } else { @@ -630,7 +630,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 23: - if (f == 5) { + if (f == 4) { if (z->class == 7) { z->conval->intval = OPB_BoolToInt(__ODD(z->conval->intval)); z->obj = NIL; @@ -645,9 +645,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) case 24: if ((((z->class == 7 && f == 3)) && z->conval->intval >= 32)) { OPB_CharToString(z); - f = 10; + f = 8; } - if (z->class < 7 || f == 10) { + if (z->class < 7 || f == 8) { z = NewOp__29(op, typ, z); } else { OPB_err(127); @@ -655,7 +655,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) z->typ = OPT_linttyp; break; case 25: - if ((f == 5 && z->class == 7)) { + if ((f == 4 && z->class == 7)) { if ((0 <= z->conval->intval && z->conval->intval <= -1)) { z = NewOp__29(op, typ, z); } else { @@ -682,7 +682,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) INTEGER g; OPT_Struct p = NIL, q = NIL, t = NIL; g = y->typ->form; - if (g == 13) { + if (g == 11) { p = x->typ->BaseTyp; q = y->typ->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -700,7 +700,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) } else { OPB_err(100); } - } else if (g != 11) { + } else if (g != 9) { OPB_err(100); } } @@ -717,7 +717,7 @@ void OPB_CheckParameters (OPT_Object fp, OPT_Object ap, BOOLEAN checkNames) at = at->BaseTyp; } if (ft != at) { - if ((ft->form == 14 && at->form == 14)) { + if ((ft->form == 12 && at->form == 12)) { if (ft->BaseTyp == at->BaseTyp) { OPB_CheckParameters(ft->link, at->link, 0); } else { @@ -778,7 +778,7 @@ static INTEGER ConstCmp__14 (void) case 0: res = 9; break; - case 1: case 3: case 4: case 5: + case 1: case 3: case 4: if ((*ConstOp__13_s->xval)->intval < (*ConstOp__13_s->yval)->intval) { res = 11; } else if ((*ConstOp__13_s->xval)->intval > (*ConstOp__13_s->yval)->intval) { @@ -787,7 +787,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 7: case 8: + case 5: case 6: if ((*ConstOp__13_s->xval)->realval < (*ConstOp__13_s->yval)->realval) { res = 11; } else if ((*ConstOp__13_s->xval)->realval > (*ConstOp__13_s->yval)->realval) { @@ -803,14 +803,14 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 9: + case 7: if ((*ConstOp__13_s->xval)->setval != (*ConstOp__13_s->yval)->setval) { res = 10; } else { res = 9; } break; - case 10: + case 8: if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) < 0) { res = 11; } else if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) > 0) { @@ -819,7 +819,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 11: case 13: case 14: + case 9: case 11: case 12: if ((*ConstOp__13_s->xval)->intval != (*ConstOp__13_s->yval)->intval) { res = 10; } else { @@ -857,7 +857,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) if (f != g) { switch (f) { case 3: - if (g == 10) { + if (g == 8) { OPB_CharToString(x); } else { OPB_err(100); @@ -865,17 +865,17 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 5: - if (g == 5) { + case 4: + if (g == 4) { if (x->typ->size <= y->typ->size) { x->typ = y->typ; } else { x->typ = OPT_IntType(x->typ->size); } - } else if (g == 7) { + } else if (g == 5) { x->typ = OPT_realtyp; xval->realval = xval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; xval->realval = xval->intval; } else { @@ -884,11 +884,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 7: - if (g == 5) { + case 5: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; } else { OPB_err(100); @@ -896,11 +896,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 8: - if (g == 5) { + case 6: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 7) { + } else if (g == 5) { y->typ = OPT_lrltyp; } else { OPB_err(100); @@ -908,26 +908,26 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 10: + case 8: if (g == 3) { OPB_CharToString(y); - g = 10; + g = 8; } else { OPB_err(100); y->typ = x->typ; __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 11: - if (!__IN(g, 0x6000)) { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; - case 13: + case 11: OPB_CheckPtr(x, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; @@ -941,7 +941,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } switch (op) { case 1: - if (f == 5) { + if (f == 4) { xv = xval->intval; yv = yval->intval; if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807-1))) && yv != (-9223372036854775807-1))) && -xv <= __DIV(9223372036854775807, -yv))) { @@ -950,7 +950,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) <= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 / (LONGREAL)__ABS(yval->realval)) { xval->realval = xval->realval * yval->realval; @@ -958,23 +958,23 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & yval->setval); } else if (f != 0) { OPB_err(101); } break; case 2: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->realval = xval->intval / (REAL)yval->intval; - OPB_CheckRealType(7, 205, xval); + OPB_CheckRealType(5, 205, xval); } else { OPB_err(205); xval->realval = (LONGREAL)1; } x->typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) >= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 * __ABS(yval->realval)) { xval->realval = xval->realval / yval->realval; @@ -982,14 +982,14 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(205); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval ^ yval->setval; } else if (f != 0) { OPB_err(102); } break; case 3: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = __DIV(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1001,7 +1001,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = __MOD(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1020,7 +1020,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 6: - if (f == 5) { + if (f == 4) { temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807 - yval->intval); if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807-1) - yval->intval)) { xval->intval += yval->intval; @@ -1028,7 +1028,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 - yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 - yval->realval)) { xval->realval = xval->realval + yval->realval; @@ -1036,21 +1036,21 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval | yval->setval; } else if (f != 0) { OPB_err(105); } break; case 7: - if (f == 5) { + if (f == 4) { if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807 + yval->intval)) { xval->intval -= yval->intval; OPB_SetIntType(x); } else { OPB_err(207); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 + yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 + yval->realval)) { xval->realval = xval->realval - yval->realval; @@ -1058,7 +1058,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(207); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & ~yval->setval); } else if (f != 0) { OPB_err(106); @@ -1078,28 +1078,28 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) xval->intval = OPB_BoolToInt(ConstCmp__14() != 9); break; case 11: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 11); } break; case 12: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 13); } break; case 13: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 13); } break; case 14: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 11); @@ -1123,8 +1123,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) f = (*x)->typ->form; g = typ->form; if ((*x)->class == 7) { - if (f == 5) { - if (g == 5) { + if (f == 4) { + if (g == 4) { if (f > g) { OPB_SetIntType(*x); if ((*x)->typ->size > typ->size) { @@ -1132,7 +1132,7 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) (*x)->conval->intval = 1; } } - } else if (__IN(g, 0x0180)) { + } else if (__IN(g, 0x60)) { (*x)->conval->realval = (*x)->conval->intval; (*x)->conval->intval = -1; } else { @@ -1141,8 +1141,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) OPB_err(220); } } - } else if (__IN(f, 0x0180)) { - if (__IN(g, 0x0180)) { + } else if (__IN(f, 0x60)) { + if (__IN(g, 0x60)) { OPB_CheckRealType(g, 203, (*x)->conval); } else { r = (*x)->conval->realval; @@ -1191,25 +1191,25 @@ static BOOLEAN strings__41 (OPT_Node *x, OPT_Node *y) { BOOLEAN _o_result; BOOLEAN ok, xCharArr, yCharArr; - xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 10; - yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 10; + xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 8; + yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 8; if ((((xCharArr && *Op__38_s->g == 3)) && (*y)->class == 7)) { OPB_CharToString(*y); - *Op__38_s->g = 10; + *Op__38_s->g = 8; yCharArr = 1; } if ((((yCharArr && *Op__38_s->f == 3)) && (*x)->class == 7)) { OPB_CharToString(*x); - *Op__38_s->f = 10; + *Op__38_s->f = 8; xCharArr = 1; } ok = (xCharArr && yCharArr); if (ok) { - if ((*Op__38_s->f == 10 && (*x)->conval->intval2 == 1)) { + if ((*Op__38_s->f == 8 && (*x)->conval->intval2 == 1)) { (*x)->typ = OPT_chartyp; (*x)->conval->intval = 0; OPB_Index(&*y, OPB_NewIntConst(0)); - } else if ((*Op__38_s->g == 10 && (*y)->conval->intval2 == 1)) { + } else if ((*Op__38_s->g == 8 && (*y)->conval->intval2 == 1)) { (*y)->typ = OPT_chartyp; (*y)->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); @@ -1248,49 +1248,49 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) OPB_err(100); } break; + case 4: + if ((g == 4 && y->typ->size < z->typ->size)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x70)) { + OPB_Convert(&z, y->typ); + } else { + OPB_err(100); + } + break; case 5: - if ((g == 5 && y->typ->size < z->typ->size)) { + if (g == 4) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x01a0)) { + } else if (__IN(g, 0x60)) { OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 7: - if (g == 5) { + case 6: + if (__IN(g, 0x70)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x60)) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 8: - if (__IN(g, 0x01a0)) { - OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&y, z->typ); - } else { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; case 11: - if (!__IN(g, 0x6000)) { - OPB_err(100); - } - break; - case 13: OPB_CheckPtr(z, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; - case 10: + case 8: break; - case 15: + case 13: if (z->typ->comp == 4) { OPB_err(100); } @@ -1306,7 +1306,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) switch (op) { case 1: do_ = 1; - if (f == 5) { + if (f == 4) { if (z->class == 7) { val = z->conval->intval; if (val == 1) { @@ -1337,7 +1337,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) y->obj = NIL; } } - } else if (!__IN(f, 0x0381)) { + } else if (!__IN(f, 0xe1)) { OPB_err(105); typ = OPT_undftyp; } @@ -1346,18 +1346,18 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 2: - if (f == 5) { + if (f == 4) { if ((y->class == 7 && y->conval->intval == 0)) { OPB_err(205); } OPB_Convert(&z, OPT_realtyp); OPB_Convert(&y, OPT_realtyp); typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { if ((y->class == 7 && y->conval->realval == (LONGREAL)0)) { OPB_err(205); } - } else if ((f != 9 && f != 0)) { + } else if ((f != 7 && f != 0)) { OPB_err(102); typ = OPT_undftyp; } @@ -1365,7 +1365,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) break; case 3: do_ = 1; - if (f == 5) { + if (f == 4) { if (y->class == 7) { val = y->conval->intval; if (val == 0) { @@ -1388,7 +1388,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (y->class == 7) { if (y->conval->intval == 0) { OPB_err(205); @@ -1420,12 +1420,12 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 6: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(105); typ = OPT_undftyp; } do_ = 1; - if (f == 5) { + if (f == 4) { if ((z->class == 7 && z->conval->intval == 0)) { do_ = 0; z = y; @@ -1439,11 +1439,11 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 7: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(106); typ = OPT_undftyp; } - if ((f != 5 || y->class != 7) || y->conval->intval != 0) { + if ((f != 4 || y->class != 7) || y->conval->intval != 0) { NewOp__39(op, typ, &z, y); } break; @@ -1463,7 +1463,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 9: case 10: - if (__IN(f, 0x6bff) || strings__41(&z, &y)) { + if (__IN(f, 0x1aff) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPB_err(107); @@ -1472,7 +1472,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) NewOp__39(op, typ, &z, y); break; case 11: case 12: case 13: case 14: - if (__IN(f, 0x01f9) || strings__41(&z, &y)) { + if (__IN(f, 0x79) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPM_LogWLn(); @@ -1499,7 +1499,7 @@ void OPB_SetRange (OPT_Node *x, OPT_Node y) LONGINT k, l; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if (((*x)->typ->form == 5 && y->typ->form == 5)) { + } else if (((*x)->typ->form == 4 && y->typ->form == 4)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (0 > k || k > (SYSTEM_INT64)OPM_MaxSet) { @@ -1534,7 +1534,7 @@ void OPB_SetElem (OPT_Node *x) LONGINT k; if ((*x)->class == 8 || (*x)->class == 9) { OPB_err(126); - } else if ((*x)->typ->form != 5) { + } else if ((*x)->typ->form != 4) { OPB_err(93); } else if ((*x)->class == 7) { k = (*x)->conval->intval; @@ -1577,40 +1577,40 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWNum(ynode->typ->size, 0); OPM_LogWLn(); } - if (ynode->class == 8 || (ynode->class == 9 && f != 14)) { + if (ynode->class == 8 || (ynode->class == 9 && f != 12)) { OPB_err(126); } switch (f) { - case 0: case 10: + case 0: case 8: break; case 1: - if (!((__IN(g, 0x2a) && y->size == 1))) { + if (!((__IN(g, 0x1a) && y->size == 1))) { OPB_err(113); } break; - case 2: case 3: case 9: + case 2: case 3: case 7: if (g != f) { OPB_err(113); } break; + case 4: + if (g != 4 || x->size < y->size) { + OPB_err(113); + } + break; case 5: - if (g != 5 || x->size < y->size) { + if (!__IN(g, 0x30)) { OPB_err(113); } break; - case 7: - if (!__IN(g, 0xe0)) { + case 6: + if (!__IN(g, 0x70)) { OPB_err(113); } break; - case 8: - if (!__IN(g, 0x01e0)) { - OPB_err(113); - } - break; - case 13: - if ((x == y || g == 11) || (x == OPT_sysptrtyp && g == 13)) { - } else if (g == 13) { + case 11: + if ((x == y || g == 9) || (x == OPT_sysptrtyp && g == 11)) { + } else if (g == 11) { p = x->BaseTyp; q = y->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -1627,28 +1627,28 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPB_err(113); } break; - case 14: + case 12: if (ynode->class == 9) { OPB_CheckProc(x, ynode->obj); - } else if (x == y || g == 11) { + } else if (x == y || g == 9) { } else { OPB_err(113); } break; - case 12: case 11: + case 10: case 9: OPB_err(113); break; - case 15: + case 13: x->pvused = 1; if (x->comp == 2) { if ((ynode->class == 7 && g == 3)) { OPB_CharToString(ynode); y = ynode->typ; - g = 10; + g = 8; } if (x == y) { } else if (x->BaseTyp == OPT_chartyp) { - if (g == 10) { + if (g == 8) { if (ynode->conval->intval2 > x->n) { OPB_err(114); } @@ -1687,7 +1687,7 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWLn(); break; } - if ((((((ynode->class == 7 && g < f)) && __IN(g, 0xe0))) && __IN(f, 0x01e0))) { + if ((((((ynode->class == 7 && g < f)) && __IN(g, 0x30))) && __IN(f, 0x70))) { OPB_Convert(&ynode, x); } } @@ -1705,7 +1705,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) f = x->typ->form; switch (fctno) { case 0: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); } else { @@ -1720,7 +1720,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) typ = OPT_notyp; if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { if (x->readonly) { OPB_err(76); } @@ -1758,7 +1758,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 5: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { OPB_Convert(&x, OPT_linttyp); } else { OPB_err(111); @@ -1778,17 +1778,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(0); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMinimum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(0); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MinReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MinLReal, OPT_lrltyp); break; default: @@ -1809,17 +1809,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(255); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMaximum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(OPM_MaxSet); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MaxReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MaxLReal, OPT_lrltyp); break; default: @@ -1833,7 +1833,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 9: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x21)) { + } else if (__IN(f, 0x11)) { OPB_Convert(&x, OPT_chartyp); } else { OPB_err(111); @@ -1843,14 +1843,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 10: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, -1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 8) { + } else if (f == 6) { OPB_Convert(&x, OPT_realtyp); } else { OPB_err(111); @@ -1859,14 +1859,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 11: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, 1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 7) { + } else if (f == 5) { OPB_Convert(&x, OPT_lrltyp); } else if (f == 3) { OPB_Convert(&x, OPT_linttyp); @@ -1877,7 +1877,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 13: case 14: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else if (x->readonly) { OPB_err(76); @@ -1901,18 +1901,18 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 18: if ((x->class == 7 && f == 3)) { OPB_CharToString(x); - f = 10; + f = 8; } if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 10)) { + } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 8)) { OPB_err(111); } break; case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if (x->typ->size != (SYSTEM_INT64)OPM_LIntSize) { OPB_Convert(&x, OPT_linttyp); } @@ -1929,7 +1929,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) if (x->class != 8) { OPB_err(110); x = OPB_NewIntConst(1); - } else if (__IN(f, 0x63fe) || __IN(x->typ->comp, 0x14)) { + } else if (__IN(f, 0x18fe) || __IN(x->typ->comp, 0x14)) { (*OPB_typSize)(x->typ); x->typ->pvused = 1; x = OPB_NewIntConst(x->typ->size); @@ -1944,22 +1944,22 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (!__IN(f, 0x022a)) { + } else if (!__IN(f, 0x9a)) { OPB_err(111); } break; case 24: case 25: case 28: case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == (SYSTEM_INT64)OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == (SYSTEM_INT64)OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } break; case 26: case 27: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if (x->conval->intval < 0 || x->conval->intval > -1) { OPB_err(220); } @@ -1970,14 +1970,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 29: if (x->class != 8) { OPB_err(110); - } else if (__IN(f, 0x1401) || x->typ->comp == 3) { + } else if (__IN(f, 0x0501) || x->typ->comp == 3) { OPB_err(111); } break; case 30: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { } else { OPB_err(111); } @@ -2037,7 +2037,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; } else { if (x->typ != p->typ) { - if ((x->class == 7 && f == 5)) { + if ((x->class == 7 && f == 4)) { OPB_Convert(&x, p->typ); } else { OPB_err(111); @@ -2050,7 +2050,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 15: case 16: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (0 > x->conval->intval || x->conval->intval > (SYSTEM_INT64)OPM_MaxSet))) { OPB_err(202); } @@ -2061,7 +2061,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; break; case 17: - if (!(f == 5) || x->class != 7) { + if (!(f == 4) || x->class != 7) { OPB_err(69); } else if (x->typ->size == 1) { L = (SYSTEM_INT32)x->conval->intval; @@ -2110,7 +2110,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((p->class == 7 && x->class == 7)) { if (-OPB_maxExp > x->conval->intval || x->conval->intval > OPB_maxExp) { OPB_err(208); @@ -2138,7 +2138,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) if (x->class == 8 || x->class == 9) { OPB_err(126); } else if (p->typ->comp == 3) { - if (f == 5) { + if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2154,7 +2154,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else { if (fctno == 22) { @@ -2168,7 +2168,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 24: case 25: case 26: case 27: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x63ff)) { + } else if (__IN(f, 0x18ff)) { if (fctno == 24 || fctno == 26) { if (OPB_NotVar(x)) { OPB_err(112); @@ -2186,7 +2186,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 28: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(12, 26, p, x); } else { OPB_err(111); @@ -2194,7 +2194,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_booltyp; break; case 29: - if (((x->class == 8 || x->class == 9) || __IN(f, 0x1401)) || x->typ->comp == 3) { + if (((x->class == 8 || x->class == 9) || __IN(f, 0x0501)) || x->typ->comp == 3) { OPB_err(126); } if (x->typ->size < p->typ->size) { @@ -2210,7 +2210,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 30: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(19, 30, p, x); } else { OPB_err(111); @@ -2220,16 +2220,16 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == (SYSTEM_INT64)OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == (SYSTEM_INT64)OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } p->link = x; break; case 32: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); x->conval = OPT_NewConst(); @@ -2272,7 +2272,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) OPB_err(126); } else if (p->typ->comp != 3) { OPB_err(64); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2288,7 +2288,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) } else if ((fctno == 31 && n == 2)) { if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { node = OPT_NewNode(19); node->subcl = 31; node->right = p; @@ -2376,7 +2376,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((fvarpar && ftyp == OPT_bytetyp)) { - if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x2e) && atyp->size == 1))) { + if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x1e) && atyp->size == 1))) { if (__IN(18, OPM_opt)) { OPB_err(-301); } @@ -2385,7 +2385,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa if (ftyp->comp == 3) { OPB_DynArrParCheck(ftyp, atyp, fvarpar); } else if (ftyp != atyp) { - if ((((!fvarpar && ftyp->form == 13)) && atyp->form == 13)) { + if ((((!fvarpar && ftyp->form == 11)) && atyp->form == 11)) { ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((ftyp->comp == 4 && atyp->comp == 4)) { @@ -2409,7 +2409,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa static void OPB_CheckReceiver (OPT_Node *x, OPT_Object fp) { - if (fp->typ->form == 13) { + if (fp->typ->form == 11) { if ((*x)->class == 3) { *x = (*x)->left; } else { @@ -2426,7 +2426,7 @@ void OPB_PrepCall (OPT_Node *x, OPT_Object *fpar) OPB_CheckReceiver(&(*x)->left, *fpar); *fpar = (*fpar)->link; } - } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 14)) { + } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 12)) { *fpar = (*x)->typ->link; } else { OPB_err(121); @@ -2458,17 +2458,17 @@ void OPB_Param (OPT_Node ap, OPT_Object fp) if (q == NIL) { OPB_err(111); } - } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 13)) { - } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x2e) && ap->typ->size == 1)))))) { + } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 11)) { + } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x1e) && ap->typ->size == 1)))))) { OPB_err(123); - } else if ((fp->typ->form == 13 && ap->class == 5)) { + } else if ((fp->typ->form == 11 && ap->class == 5)) { OPB_err(123); } } else if (fp->typ->comp == 3) { if ((ap->class == 7 && ap->typ->form == 3)) { OPB_CharToString(ap); } - if ((ap->typ->form == 10 && fp->typ->BaseTyp->form == 3)) { + if ((ap->typ->form == 8 && fp->typ->BaseTyp->form == 3)) { } else if (ap->class >= 7) { OPB_err(59); } else { @@ -2576,7 +2576,7 @@ void OPB_Assign (OPT_Node *x, OPT_Node y) OPB_BindNodes(6, (*x)->typ, &z, NIL); *x = z; } - } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 10)) && y->conval->intval2 == 1)) { + } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 8)) && y->conval->intval2 == 1)) { y->typ = OPT_chartyp; y->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); diff --git a/bootstrap/unix-88/OPB.h b/bootstrap/unix-88/OPB.h index 0b71f987..7b980a10 100644 --- a/bootstrap/unix-88/OPB.h +++ b/bootstrap/unix-88/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/unix-88/OPC.c b/bootstrap/unix-88/OPC.c index b8a0608e..ad70616c 100644 --- a/bootstrap/unix-88/OPC.c +++ b/bootstrap/unix-88/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" @@ -228,12 +228,12 @@ static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause) if (__IN(typ->comp, 0x0c)) { OPC_Stars(typ->BaseTyp, &*openClause); *openClause = typ->comp == 2; - } else if (typ->form == 14) { + } else if (typ->form == 12) { OPM_Write('('); OPM_Write('*'); } else { pointers = 0; - while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 13)) { + while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 11)) { pointers += 1; typ = typ->BaseTyp; } @@ -278,16 +278,16 @@ static void OPC_DeclareObj (OPT_Object dcl, BOOLEAN scopeDef) for (;;) { form = typ->form; comp = typ->comp; - if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 12) || comp == 4) { + if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 10) || comp == 4) { break; - } else if ((form == 13 && typ->BaseTyp->comp != 3)) { + } else if ((form == 11 && typ->BaseTyp->comp != 3)) { openClause = 1; - } else if (form == 14 || __IN(comp, 0x0c)) { + } else if (form == 12 || __IN(comp, 0x0c)) { if (openClause) { OPM_Write(')'); openClause = 0; } - if (form == 14) { + if (form == 12) { if (OPC_ansi) { OPM_Write(')'); OPC_AnsiParamList(typ->link, 0); @@ -332,19 +332,19 @@ static void OPC_DeclareBase (OPT_Object dcl) LONGINT off, n, dummy; typ = dcl->typ; prev = typ; - while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 12)) && !((typ->form == 13 && typ->BaseTyp->comp == 3)))) { + while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 10)) && !((typ->form == 11 && typ->BaseTyp->comp == 3)))) { prev = typ; typ = typ->BaseTyp; } obj = typ->strobj; - if (typ->form == 12) { + if (typ->form == 10) { OPM_WriteString((CHAR*)"void", 5); } else if ((obj != NIL && !OPC_Undefined(obj))) { OPC_Ident(obj); } else if (typ->comp == 4) { OPM_WriteString((CHAR*)"struct ", 8); OPC_Andent(typ); - if ((prev->form != 13 && (obj != NIL || dcl->name[0] == 0x00))) { + if ((prev->form != 11 && (obj != NIL || dcl->name[0] == 0x00))) { if ((typ->BaseTyp != NIL && typ->BaseTyp->strobj->vis != 0)) { OPM_WriteString((CHAR*)" { /* ", 7); OPC_Ident(typ->BaseTyp->strobj); @@ -358,7 +358,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_FieldList(typ, 1, &off, &n, &dummy); OPC_EndBlk0(); } - } else if ((typ->form == 13 && typ->BaseTyp->comp == 3)) { + } else if ((typ->form == 11 && typ->BaseTyp->comp == 3)) { typ = typ->BaseTyp->BaseTyp; nofdims = 1; while (typ->comp == 3) { @@ -373,7 +373,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_BegStat(); __NEW(obj, OPT_ObjDesc); __NEW(obj->typ, OPT_StrDesc); - obj->typ->form = 15; + obj->typ->form = 13; obj->typ->comp = 2; obj->typ->n = 1; obj->typ->BaseTyp = typ; @@ -394,7 +394,7 @@ LONGINT OPC_NofPtrs (OPT_Struct typ) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { _o_result = 1; return _o_result; } else if ((typ->comp == 4 && __MASK(typ->sysflag, -256) == 0)) { @@ -436,7 +436,7 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, LONGINT adr, LONGINT *cnt) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n, i; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { OPM_WriteInt(adr); OPM_WriteString((CHAR*)", ", 3); *cnt += 1; @@ -541,7 +541,7 @@ static void OPC_DeclareParams (OPT_Object par, BOOLEAN macro) if (macro) { OPM_WriteStringVar((void*)par->name, 256); } else { - if ((par->mode == 1 && par->typ->form == 7)) { + if ((par->mode == 1 && par->typ->form == 5)) { OPM_Write('_'); } OPC_Ident(par); @@ -613,7 +613,7 @@ OPT_Object OPC_BaseTProc (OPT_Object obj) OPT_Struct typ = NIL, base = NIL; LONGINT mno; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } base = typ->BaseTyp; @@ -636,7 +636,7 @@ static void OPC_DefineTProcMacros (OPT_Object obj, BOOLEAN *empty) OPC_Ident(obj); OPC_DeclareParams(obj->link, 1); OPM_WriteString((CHAR*)" __SEND(", 9); - if (obj->link->typ->form == 13) { + if (obj->link->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPC_Ident(obj->link); OPM_Write(')'); @@ -674,7 +674,7 @@ static void OPC_DefineType (OPT_Struct str) if (obj == NIL || OPC_Undefined(obj)) { if (obj != NIL) { if (obj->linkadr == 1) { - if (str->form != 13) { + if (str->form != 11) { OPM_Mark(244, str->txtpos); obj->linkadr = 2; } @@ -693,13 +693,13 @@ static void OPC_DefineType (OPT_Struct str) } field = field->link; } - } else if (str->form == 13) { + } else if (str->form == 11) { if (str->BaseTyp->comp != 4) { OPC_DefineType(str->BaseTyp); } } else if (__IN(str->comp, 0x0c)) { OPC_DefineType(str->BaseTyp); - } else if (str->form == 14) { + } else if (str->form == 12) { if (str->BaseTyp != OPT_notyp) { OPC_DefineType(str->BaseTyp); } @@ -890,7 +890,7 @@ LONGINT OPC_BaseAlignment (OPT_Struct typ) { LONGINT _o_result; LONGINT alignment; - if (typ->form == 15) { + if (typ->form == 13) { if (typ->comp == 4) { alignment = __MASK(typ->align, -65536); } else { @@ -1018,7 +1018,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_WriteString((CHAR*)"export ", 8); } } - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_WriteString((CHAR*)"double", 7); } else { OPC_DeclareBase(obj); @@ -1027,7 +1027,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_Write(','); } OPM_Write(' '); - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_Write('_'); } OPC_DeclareObj(obj, vis == 3); @@ -1044,7 +1044,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; - } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 13)) { + } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 11)) { OPM_WriteString((CHAR*)" = NIL", 7); } } @@ -1381,7 +1381,7 @@ void OPC_GenEnumPtrs (OPT_Object var) OPC_BegBlk(); } OPC_BegStat(); - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"P(", 3); OPC_Ident(var); OPM_Write(')'); @@ -1400,7 +1400,7 @@ void OPC_GenEnumPtrs (OPT_Object var) n = n * typ->n; typ = typ->BaseTyp; } - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"__ENUMP(", 9); OPC_Ident(var); OPC_Str1((CHAR*)", #, P)", 8, n); @@ -1563,7 +1563,7 @@ void OPC_EnterProc (OPT_Object proc) if (!OPC_ansi) { var = proc->link; while (var != NIL) { - if ((var->typ->form == 7 && var->mode == 1)) { + if ((var->typ->form == 5 && var->mode == 1)) { OPC_BegStat(); OPC_Ident(var->typ->strobj); OPM_Write(' '); @@ -1879,7 +1879,7 @@ void OPC_Case (LONGINT caseVal, INTEGER form) case 3: OPC_CharacterLiteral(caseVal); break; - case 5: + case 4: OPM_WriteInt(caseVal); break; default: @@ -1977,16 +1977,16 @@ void OPC_Constant (OPT_Const con, INTEGER form) case 3: OPC_CharacterLiteral(con->intval); break; - case 5: + case 4: OPM_WriteInt(con->intval); break; - case 7: + case 5: OPM_WriteReal(con->realval, 'f'); break; - case 8: + case 6: OPM_WriteReal(con->realval, 0x00); break; - case 9: + case 7: OPM_WriteString((CHAR*)"0x", 3); skipLeading = 1; s = con->setval; @@ -2009,10 +2009,10 @@ void OPC_Constant (OPT_Const con, INTEGER form) OPM_Write('0'); } break; - case 10: + case 8: OPC_StringLiteral(*con->ext, 256, con->intval2 - 1); break; - case 11: + case 9: OPM_WriteString((CHAR*)"NIL", 4); break; default: diff --git a/bootstrap/unix-88/OPC.h b/bootstrap/unix-88/OPC.h index 21b48db8..bb250e9a 100644 --- a/bootstrap/unix-88/OPC.h +++ b/bootstrap/unix-88/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/unix-88/OPM.c b/bootstrap/unix-88/OPM.c index 450ed83d..228e7978 100644 --- a/bootstrap/unix-88/OPM.c +++ b/bootstrap/unix-88/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" diff --git a/bootstrap/unix-88/OPM.h b/bootstrap/unix-88/OPM.h index 5363c227..6bbab25d 100644 --- a/bootstrap/unix-88/OPM.h +++ b/bootstrap/unix-88/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/unix-88/OPP.c b/bootstrap/unix-88/OPP.c index becc2507..9337c539 100644 --- a/bootstrap/unix-88/OPP.c +++ b/bootstrap/unix-88/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPB.h" @@ -137,7 +137,7 @@ static void OPP_CheckSysFlag (INTEGER *sysflag, INTEGER default_) OPP_err(135); } OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { sf = x->conval->intval; if (sf < 0 || sf > 1) { OPP_err(220); @@ -159,7 +159,7 @@ static void OPP_RecordType (OPT_Struct *typ, OPT_Struct *banned) OPT_Object fld = NIL, first = NIL, last = NIL, base = NIL; OPT_Struct ftyp = NIL; INTEGER sysflag; - *typ = OPT_NewStr(15, 4); + *typ = OPT_NewStr(13, 4); (*typ)->BaseTyp = NIL; OPP_CheckSysFlag(&sysflag, -1); if (OPP_sym == 30) { @@ -254,7 +254,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) INTEGER sysflag; OPP_CheckSysFlag(&sysflag, 0); if (OPP_sym == 25) { - *typ = OPT_NewStr(15, 3); + *typ = OPT_NewStr(13, 3); (*typ)->mno = 0; (*typ)->sysflag = sysflag; OPS_Get(&OPP_sym); @@ -266,10 +266,10 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) (*typ)->n = 0; } } else { - *typ = OPT_NewStr(15, 2); + *typ = OPT_NewStr(13, 2); (*typ)->sysflag = sysflag; OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { n = x->conval->intval; if (n <= 0 || n > OPM_MaxIndex) { OPP_err(63); @@ -302,7 +302,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) static void OPP_PointerType (OPT_Struct *typ) { OPT_Object id = NIL; - *typ = OPT_NewStr(13, 1); + *typ = OPT_NewStr(11, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); OPP_CheckSym(28); if (OPP_sym == 38) { @@ -410,7 +410,7 @@ static void OPP_FormalParameters (OPT_Object *firstPar, OPT_Struct *resTyp) if (OPP_sym == 38) { OPP_qualident(&res); if (res->mode == 5) { - if (res->typ->form < 15) { + if (res->typ->form < 13) { *resTyp = res->typ; } else { OPP_err(54); @@ -460,7 +460,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) OPP_PointerType(&*typ); } else if (OPP_sym == 61) { OPS_Get(&OPP_sym); - *typ = OPT_NewStr(14, 1); + *typ = OPT_NewStr(12, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); if (OPP_sym == 30) { OPS_Get(&OPP_sym); @@ -489,7 +489,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) static void OPP_Type (OPT_Struct *typ, OPT_Struct *banned) { OPP_TypeDecl(&*typ, &*banned); - if (((((*typ)->form == 13 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { + if (((((*typ)->form == 11 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { OPP_err(0); } } @@ -504,7 +504,7 @@ static void OPP_selector (OPT_Node *x) if (OPP_sym == 31) { OPS_Get(&OPP_sym); for (;;) { - if (((*x)->typ != NIL && (*x)->typ->form == 13)) { + if (((*x)->typ != NIL && (*x)->typ->form == 11)) { OPB_DeRef(&*x); } OPP_Expression(&y); @@ -522,7 +522,7 @@ static void OPP_selector (OPT_Node *x) __COPY(OPS_name, name, 256); OPS_Get(&OPP_sym); if ((*x)->typ != NIL) { - if ((*x)->typ->form == 13) { + if ((*x)->typ->form == 11) { OPB_DeRef(&*x); } if ((*x)->typ->comp == 4) { @@ -544,7 +544,7 @@ static void OPP_selector (OPT_Node *x) OPP_err(75); } typ = y->obj->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField((*x)->obj->name, typ->BaseTyp, &proc); @@ -573,7 +573,7 @@ static void OPP_selector (OPT_Node *x) } else if (OPP_sym == 17) { OPS_Get(&OPP_sym); OPB_DeRef(&*x); - } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 14)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { + } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 12)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&obj); @@ -872,10 +872,10 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } else { *typ = obj->typ; *rec = *typ; - if ((*rec)->form == 13) { + if ((*rec)->form == 11) { *rec = (*rec)->BaseTyp; } - if (!((((*mode == 1 && (*typ)->form == 13)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { + if (!((((*mode == 1 && (*typ)->form == 11)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { OPP_err(70); *rec = NIL; } @@ -889,7 +889,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } OPP_CheckSym(22); if (*rec == NIL) { - *rec = OPT_NewStr(15, 4); + *rec = OPT_NewStr(13, 4); (*rec)->BaseTyp = NIL; } } @@ -897,7 +897,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St static BOOLEAN OPP_Extends (OPT_Struct x, OPT_Struct b) { BOOLEAN _o_result; - if ((b->form == 13 && x->form == 13)) { + if ((b->form == 11 && x->form == 11)) { b = b->BaseTyp; x = x->BaseTyp; } @@ -1174,14 +1174,14 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O for (;;) { OPP_ConstExpression(&x); f = x->typ->form; - if (__IN(f, 0x28)) { + if (__IN(f, 0x18)) { xval = x->conval->intval; } else { OPP_err(61); xval = 1; } - if (f == 5) { - if (!(LabelTyp->form == 5) || LabelTyp->size < x->typ->size) { + if (f == 4) { + if (!(LabelTyp->form == 4) || LabelTyp->size < x->typ->size) { OPP_err(60); } } else if (LabelTyp->form != f) { @@ -1191,7 +1191,7 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O OPS_Get(&OPP_sym); OPP_ConstExpression(&y); yval = y->conval->intval; - if ((y->typ->form != f && !((f == 5 && y->typ->form == 5)))) { + if ((y->typ->form != f && !((f == 4 && y->typ->form == 4)))) { OPP_err(60); } if (yval < xval) { @@ -1254,7 +1254,7 @@ static void CasePart__31 (OPT_Node *x) *StatSeq__30_s->pos = OPM_errpos; if ((*x)->class == 8 || (*x)->class == 9) { OPP_err(126); - } else if (!__IN((*x)->typ->form, 0x38)) { + } else if (!__IN((*x)->typ->form, 0x18)) { OPP_err(125); } OPP_CheckSym(25); @@ -1440,7 +1440,7 @@ static void OPP_StatSeq (OPT_Node *stat) OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&id); - if (!(id->typ->form == 5)) { + if (!(id->typ->form == 4)) { OPP_err(68); } OPP_CheckSym(34); @@ -1472,7 +1472,7 @@ static void OPP_StatSeq (OPT_Node *stat) SetPos__35(z); OPB_Link(&*stat, &last, z); y = OPB_NewLeaf(t); - } else if (!(y->typ->form == 5) || y->typ->size > x->left->typ->size) { + } else if (!(y->typ->form == 4) || y->typ->size > x->left->typ->size) { OPP_err(113); } OPB_Link(&*stat, &last, x); @@ -1527,7 +1527,7 @@ static void OPP_StatSeq (OPT_Node *stat) if (OPP_sym == 38) { OPP_qualident(&id); y = OPB_NewLeaf(id); - if ((((id != NIL && id->typ->form == 13)) && (id->mode == 2 || !id->leaf))) { + if ((((id != NIL && id->typ->form == 11)) && (id->mode == 2 || !id->leaf))) { OPP_err(245); } OPP_CheckSym(20); diff --git a/bootstrap/unix-88/OPP.h b/bootstrap/unix-88/OPP.h index 7a12f897..863db6d6 100644 --- a/bootstrap/unix-88/OPP.h +++ b/bootstrap/unix-88/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/unix-88/OPS.c b/bootstrap/unix-88/OPS.c index 2ee978f2..e575dfe6 100644 --- a/bootstrap/unix-88/OPS.c +++ b/bootstrap/unix-88/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPM.h" diff --git a/bootstrap/unix-88/OPS.h b/bootstrap/unix-88/OPS.h index a8dccfed..a60ffe74 100644 --- a/bootstrap/unix-88/OPS.h +++ b/bootstrap/unix-88/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/unix-88/OPT.c b/bootstrap/unix-88/OPT.c index f8762935..35088301 100644 --- a/bootstrap/unix-88/OPT.c +++ b/bootstrap/unix-88/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPM.h" @@ -174,7 +174,7 @@ OPT_Struct OPT_ShorterOrLongerType (OPT_Struct x, INTEGER dir) { OPT_Struct _o_result; INTEGER i; - __ASSERT(x->form == 5, 0); + __ASSERT(x->form == 4, 0); __ASSERT(dir == 1 || dir == -1, 0); __ASSERT(x->BaseTyp == OPT_undftyp, 0); i = 0; @@ -285,7 +285,7 @@ void OPT_Close (void) OPT_GlbMod[__X(i, 64)] = NIL; i += 1; } - i = 16; + i = 14; while (i < 255) { OPT_impCtxt.ref[__X(i, 255)] = NIL; OPT_impCtxt.old[__X(i, 255)] = NIL; @@ -484,14 +484,14 @@ void OPT_IdFPrint (OPT_Struct typ) OPT_FPrintName(&idfp, (void*)OPT_GlbMod[__X(typ->mno, 64)]->name, 256); OPT_FPrintName(&idfp, (void*)strobj->name, 256); } - if ((f == 13 || (c == 4 && btyp != NIL)) || c == 3) { + if ((f == 11 || (c == 4 && btyp != NIL)) || c == 3) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); } else if (c == 2) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); OPM_FPrint(&idfp, typ->n); - } else if (f == 14) { + } else if (f == 12) { OPT_FPrintSign(&idfp, btyp, typ->link); } typ->idfp = idfp; @@ -520,7 +520,7 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; FPrintHdFld__15(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -532,8 +532,8 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { - OPM_FPrint(&*FPrintStr__12_s->pvfp, 13); + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { + OPM_FPrint(&*FPrintStr__12_s->pvfp, 11); OPM_FPrint(&*FPrintStr__12_s->pvfp, adr); OPT_nofhdfld += 1; } @@ -596,7 +596,7 @@ void OPT_FPrintStr (OPT_Struct typ) f = typ->form; c = typ->comp; btyp = typ->BaseTyp; - if (f == 13) { + if (f == 11) { strobj = typ->strobj; bstrobj = btyp->strobj; if (((strobj == NIL || strobj->name[0] == 0x00) || bstrobj == NIL) || bstrobj->name[0] == 0x00) { @@ -604,7 +604,7 @@ void OPT_FPrintStr (OPT_Struct typ) OPM_FPrint(&pbfp, btyp->pbfp); pvfp = pbfp; } - } else if (f == 14) { + } else if (f == 12) { } else if (__IN(c, 0x0c)) { OPT_FPrintStr(btyp); OPM_FPrint(&pbfp, btyp->pvfp); @@ -650,23 +650,23 @@ void OPT_FPrintObj (OPT_Object obj) f = obj->typ->form; OPM_FPrint(&fprint, f); switch (f) { - case 2: case 3: case 5: + case 2: case 3: case 4: OPM_FPrint(&fprint, obj->conval->intval); break; - case 9: + case 7: OPM_FPrintSet(&fprint, obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_FPrintReal(&fprint, rval); break; - case 8: + case 6: OPM_FPrintLReal(&fprint, obj->conval->realval); break; - case 10: + case 8: OPT_FPrintName(&fprint, (void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -851,22 +851,22 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) OPM_SymRCh(&ch); conval->intval = ch; break; - case 5: + case 4: conval->intval = OPM_SymRInt(); break; - case 9: + case 7: OPM_SymRSet(&conval->setval); break; - case 7: + case 5: OPM_SymRReal(&rval); conval->realval = rval; conval->intval = -1; break; - case 8: + case 6: OPM_SymRLReal(&conval->realval); conval->intval = -1; break; - case 10: + case 8: ext = OPT_NewExt(); conval->ext = ext; i = 0; @@ -878,7 +878,7 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) conval->intval2 = i; conval->intval = -1; break; - case 11: + case 9: conval->intval = 0; break; default: @@ -980,7 +980,7 @@ static OPT_Object OPT_InTProc (SHORTINT mno) static OPT_Struct OPT_InTyp (LONGINT tag) { OPT_Struct _o_result; - if (tag == 5) { + if (tag == 4) { _o_result = OPT_IntType(OPM_SymRInt()); return _o_result; } else { @@ -1055,20 +1055,20 @@ static void OPT_InStruct (OPT_Struct *typ) } switch (tag) { case 36: - (*typ)->form = 13; + (*typ)->form = 11; (*typ)->size = OPM_PointerSize; (*typ)->n = 0; OPT_InStruct(&(*typ)->BaseTyp); break; case 37: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 2; OPT_InStruct(&(*typ)->BaseTyp); (*typ)->n = OPM_SymRInt(); (*OPT_typSize)(*typ); break; case 38: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 3; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp->comp == 3) { @@ -1079,7 +1079,7 @@ static void OPT_InStruct (OPT_Struct *typ) (*OPT_typSize)(*typ); break; case 39: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 4; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp == OPT_notyp) { @@ -1113,7 +1113,7 @@ static void OPT_InStruct (OPT_Struct *typ) } break; case 40: - (*typ)->form = 14; + (*typ)->form = 12; (*typ)->size = OPM_ProcSize; OPT_InSign(mno, &(*typ)->BaseTyp, &(*typ)->link); break; @@ -1192,7 +1192,7 @@ static OPT_Object OPT_InObj (SHORTINT mno) obj = OPT_NewObj(); obj->mnolev = -mno; obj->vis = 1; - if (tag <= 13) { + if (tag <= 11) { obj->mode = 3; obj->conval = OPT_NewConst(); OPT_InConstant(tag, obj->conval); @@ -1289,7 +1289,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done) obj->scope = OPT_syslink; obj->typ = OPT_notyp; } else { - OPT_impCtxt.nofr = 16; + OPT_impCtxt.nofr = 14; OPT_impCtxt.minr = 255; OPT_impCtxt.nofm = 0; OPT_impCtxt.self = __STRCMP(aliasName, "@self") == 0; @@ -1356,7 +1356,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; OPT_OutHdFld(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -1368,7 +1368,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { OPM_SymWInt(27); OPM_SymWInt(adr); OPT_nofhdfld += 1; @@ -1440,7 +1440,7 @@ static void OPT_OutStr (OPT_Struct typ) OPT_Object strobj = NIL; if (typ->ref < OPT_expCtxt.ref) { OPM_SymWInt(-typ->ref); - if (typ->ref == 5) { + if (typ->ref == 4) { OPM_SymWInt(typ->size); } } else { @@ -1475,15 +1475,15 @@ static void OPT_OutStr (OPT_Struct typ) OPM_SymWInt(typ->sysflag); } switch (typ->form) { - case 13: + case 11: OPM_SymWInt(36); OPT_OutStr(typ->BaseTyp); break; - case 14: + case 12: OPM_SymWInt(40); OPT_OutSign(typ->BaseTyp, typ->link); break; - case 15: + case 13: switch (typ->comp) { case 2: OPM_SymWInt(37); @@ -1538,24 +1538,24 @@ static void OPT_OutConstant (OPT_Object obj) case 2: case 3: OPM_SymWCh((CHAR)obj->conval->intval); break; - case 5: + case 4: OPM_SymWInt(obj->conval->intval); OPM_SymWInt(obj->typ->size); break; - case 9: + case 7: OPM_SymWSet(obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_SymWReal(rval); break; - case 8: + case 6: OPM_SymWLReal(obj->conval->realval); break; - case 10: + case 8: OPT_OutName((void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -1669,7 +1669,7 @@ void OPT_Export (BOOLEAN *ext, BOOLEAN *new) OPM_SymWInt(16); OPT_OutName((void*)OPT_SelfName, 256); OPT_expCtxt.reffp = 0; - OPT_expCtxt.ref = 16; + OPT_expCtxt.ref = 14; OPT_expCtxt.nofm = 1; OPT_expCtxt.locmno[0] = 0; i = 1; @@ -1845,16 +1845,16 @@ export void *OPT__init(void) OPM_errpos = 0; OPT_InitStruct(&OPT_undftyp, 0); OPT_undftyp->BaseTyp = OPT_undftyp; - OPT_InitStruct(&OPT_notyp, 12); - OPT_InitStruct(&OPT_stringtyp, 10); - OPT_InitStruct(&OPT_niltyp, 11); + OPT_InitStruct(&OPT_notyp, 10); + OPT_InitStruct(&OPT_stringtyp, 8); + OPT_InitStruct(&OPT_niltyp, 9); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); - OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp); - OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_PointerSize, &OPT_ainttyp); - OPT_EnterTyp((CHAR*)"INT8", 5, 1, &OPT_int8typ); - OPT_EnterTyp((CHAR*)"INT16", 5, 2, &OPT_int16typ); - OPT_EnterTyp((CHAR*)"INT32", 5, 4, &OPT_int32typ); - OPT_EnterTyp((CHAR*)"INT64", 5, 8, &OPT_int64typ); + OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); + OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp); + OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); + OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); + OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); + OPT_EnterTyp((CHAR*)"INT64", 4, 8, &OPT_int64typ); OPT_EnterProc((CHAR*)"ADR", 20); OPT_EnterProc((CHAR*)"CC", 21); OPT_EnterProc((CHAR*)"LSH", 22); @@ -1872,12 +1872,12 @@ export void *OPT__init(void) OPT_topScope->right = NIL; OPT_EnterTyp((CHAR*)"BOOLEAN", 2, OPM_BoolSize, &OPT_booltyp); OPT_EnterTyp((CHAR*)"CHAR", 3, OPM_CharSize, &OPT_chartyp); - OPT_EnterTyp((CHAR*)"SET", 9, OPM_SetSize, &OPT_settyp); - OPT_EnterTyp((CHAR*)"REAL", 7, OPM_RealSize, &OPT_realtyp); - OPT_EnterTyp((CHAR*)"INTEGER", 5, OPM_IntSize, &OPT_inttyp); - OPT_EnterTyp((CHAR*)"LONGINT", 5, OPM_LIntSize, &OPT_linttyp); - OPT_EnterTyp((CHAR*)"LONGREAL", 8, OPM_LRealSize, &OPT_lrltyp); - OPT_EnterTyp((CHAR*)"SHORTINT", 5, OPM_SIntSize, &OPT_sinttyp); + OPT_EnterTyp((CHAR*)"SET", 7, OPM_SetSize, &OPT_settyp); + OPT_EnterTyp((CHAR*)"REAL", 5, OPM_RealSize, &OPT_realtyp); + OPT_EnterTyp((CHAR*)"INTEGER", 4, OPM_IntSize, &OPT_inttyp); + OPT_EnterTyp((CHAR*)"LONGINT", 4, OPM_LIntSize, &OPT_linttyp); + OPT_EnterTyp((CHAR*)"LONGREAL", 6, OPM_LRealSize, &OPT_lrltyp); + OPT_EnterTyp((CHAR*)"SHORTINT", 4, OPM_SIntSize, &OPT_sinttyp); OPT_EnterBoolConst((CHAR*)"FALSE", 0); OPT_EnterBoolConst((CHAR*)"TRUE", 1); OPT_EnterProc((CHAR*)"HALT", 0); @@ -1905,14 +1905,14 @@ export void *OPT__init(void) OPT_impCtxt.ref[1] = OPT_bytetyp; OPT_impCtxt.ref[2] = OPT_booltyp; OPT_impCtxt.ref[3] = OPT_chartyp; - OPT_impCtxt.ref[5] = OPT_inttyp; - OPT_impCtxt.ref[7] = OPT_realtyp; - OPT_impCtxt.ref[8] = OPT_lrltyp; - OPT_impCtxt.ref[9] = OPT_settyp; - OPT_impCtxt.ref[10] = OPT_stringtyp; - OPT_impCtxt.ref[11] = OPT_niltyp; - OPT_impCtxt.ref[12] = OPT_notyp; - OPT_impCtxt.ref[13] = OPT_sysptrtyp; + OPT_impCtxt.ref[4] = OPT_inttyp; + OPT_impCtxt.ref[5] = OPT_realtyp; + OPT_impCtxt.ref[6] = OPT_lrltyp; + OPT_impCtxt.ref[7] = OPT_settyp; + OPT_impCtxt.ref[8] = OPT_stringtyp; + OPT_impCtxt.ref[9] = OPT_niltyp; + OPT_impCtxt.ref[10] = OPT_notyp; + OPT_impCtxt.ref[11] = OPT_sysptrtyp; OPT_IntTypes[1] = OPT_sinttyp; OPT_IntTypes[2] = OPT_inttyp; OPT_IntTypes[3] = OPT_linttyp; diff --git a/bootstrap/unix-88/OPT.h b/bootstrap/unix-88/OPT.h index acf2e9e9..c3fdc0cf 100644 --- a/bootstrap/unix-88/OPT.h +++ b/bootstrap/unix-88/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/unix-88/OPV.c b/bootstrap/unix-88/OPV.c index b5cebda5..c769935e 100644 --- a/bootstrap/unix-88/OPV.c +++ b/bootstrap/unix-88/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPC.h" @@ -123,14 +123,14 @@ void OPV_TypSize (OPT_Struct typ) } else if (c == 2) { OPV_TypSize(typ->BaseTyp); typ->size = typ->n * typ->BaseTyp->size; - } else if (f == 13) { + } else if (f == 11) { typ->size = OPM_PointerSize; if (typ->BaseTyp == OPT_undftyp) { OPM_Mark(128, typ->n); } else { OPV_TypSize(typ->BaseTyp); } - } else if (f == 14) { + } else if (f == 12) { typ->size = OPM_ProcSize; } else if (c == 3) { btyp = typ->BaseTyp; @@ -163,7 +163,7 @@ static void OPV_GetTProcNum (OPT_Object obj) oldPos = OPM_errpos; OPM_errpos = obj->scope->adr; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(obj->name, typ->BaseTyp, &redef); @@ -237,7 +237,7 @@ static void OPV_Traverse (OPT_Object obj, OPT_Object outerScope, BOOLEAN exporte if ((mode == 5 && (obj->vis != 0) == exported)) { typ = obj->typ; OPV_TypSize(obj->typ); - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } if (typ->comp == 4) { @@ -349,7 +349,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN case 12: switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -358,7 +358,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 2: - if (form == 9) { + if (form == 7) { _o_result = 3; return _o_result; } else { @@ -371,7 +371,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN return _o_result; break; case 6: - if (form == 9) { + if (form == 7) { _o_result = 2; return _o_result; } else { @@ -380,7 +380,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 7: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -464,7 +464,7 @@ static BOOLEAN OPV_SideEffects (OPT_Node n) static void OPV_Entier (OPT_Node n, INTEGER prec) { - if (__IN(n->typ->form, 0x0180)) { + if (__IN(n->typ->form, 0x60)) { OPM_WriteString((CHAR*)"__ENTIER(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -503,11 +503,11 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) INTEGER from, to; from = n->typ->form; to = newtype->form; - if (to == 9) { + if (to == 7) { OPM_WriteString((CHAR*)"__SETOF(", 9); OPV_Entier(n, -1); OPM_Write(')'); - } else if (to == 5) { + } else if (to == 4) { if ((newtype->size < n->typ->size && __IN(2, OPM_opt))) { OPM_WriteString((CHAR*)"__SHORT", 8); if (OPV_SideEffects(n)) { @@ -542,7 +542,7 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) static void OPV_TypeOf (OPT_Node n) { - if (n->typ->form == 13) { + if (n->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -794,14 +794,14 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } else if (OPV_ansi) { if ((__IN(comp, 0x0c) && n->class == 7)) { OPM_WriteString((CHAR*)"(CHAR*)", 8); - } else if ((((form == 13 && typ != n->typ)) && n->typ != OPT_niltyp)) { + } else if ((((form == 11 && typ != n->typ)) && n->typ != OPT_niltyp)) { OPM_WriteString((CHAR*)"(void*)", 8); } } else { - if ((__IN(form, 0x0180) && n->typ->form == 5)) { + if ((__IN(form, 0x60) && n->typ->form == 4)) { OPM_WriteString((CHAR*)"(double)", 9); prec = 9; - } else if (form == 5) { + } else if (form == 4) { OPV_SizeCast(n->typ->size, typ->size); } } @@ -812,7 +812,7 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } if ((((mode == 2 && n->class == 11)) && n->subcl == 29)) { OPV_expr(n->left, prec); - } else if ((form == 5 && n->class == 7)) { + } else if ((form == 4 && n->class == 7)) { OPV_ParIntLiteral(n->conval->intval, n->typ->size); } else { OPV_expr(n, prec); @@ -861,7 +861,7 @@ static OPT_Object OPV_SuperProc (OPT_Node n) OPT_Object obj = NIL; OPT_Struct typ = NIL; typ = n->right->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(n->left->obj->name, typ->BaseTyp, &obj); @@ -902,7 +902,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); break; case 7: - if (form == 9) { + if (form == 7) { OPM_Write('~'); } else { OPM_Write('-'); @@ -930,7 +930,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 21: if (OPV_SideEffects(l)) { - if (l->typ->form < 7) { + if (l->typ->form < 5) { if (l->typ->size <= 4) { OPM_WriteString((CHAR*)"(int)", 6); } @@ -959,18 +959,18 @@ static void OPV_expr (OPT_Node n, INTEGER prec) if (l->class == 1) { OPC_CompleteIdent(l->obj); } else { - if ((l->typ->form != 10 && !__IN(l->typ->comp, 0x0c))) { + if ((l->typ->form != 8 && !__IN(l->typ->comp, 0x0c))) { OPM_Write('&'); } OPV_expr(l, exprPrec); } break; case 29: - if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x6220) && __IN(l->typ->form, 0x6220))) && n->typ->size == l->typ->size)) { + if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x1890) && __IN(l->typ->form, 0x1890))) && n->typ->size == l->typ->size)) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); - if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) { + if (__IN(n->typ->form, 0x1800) || __IN(l->typ->form, 0x1800)) { OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", 16); } OPV_expr(l, exprPrec); @@ -1080,7 +1080,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 9: case 10: case 11: case 12: case 13: case 14: - if (__IN(l->typ->form, 0x8400)) { + if (__IN(l->typ->form, 0x2100)) { OPM_WriteString((CHAR*)"__STRCMP(", 10); OPV_expr(l, -1); OPM_WriteString((CHAR*)", ", 3); @@ -1092,31 +1092,31 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); OPC_Cmp(subclass); typ = l->typ; - if ((((((typ->form == 13 && r->typ->form != 11)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { + if ((((((typ->form == 11 && r->typ->form != 9)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { OPM_WriteString((CHAR*)"(void *) ", 10); } OPV_expr(r, exprPrec); } break; default: - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write('('); } OPV_expr(l, exprPrec); switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ", 4); } else { OPM_WriteString((CHAR*)" * ", 4); } break; case 2: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" ^ ", 4); } else { OPM_WriteString((CHAR*)" / ", 4); - if (r->obj == NIL || r->obj->typ->form == 5) { + if (r->obj == NIL || r->obj->typ->form == 4) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); @@ -1127,14 +1127,14 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPM_WriteString((CHAR*)" && ", 5); break; case 6: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" | ", 4); } else { OPM_WriteString((CHAR*)" + ", 4); } break; case 7: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ~", 5); } else { OPM_WriteString((CHAR*)" - ", 4); @@ -1150,7 +1150,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; } OPV_expr(r, exprPrec); - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write(')'); } break; @@ -1324,7 +1324,7 @@ static void OPV_NewArr (OPT_Node d, OPT_Node x) if ((base->comp == 4 && OPC_NofPtrs(base) != 0)) { OPC_Ident(base->strobj); OPM_WriteString((CHAR*)"__typ", 6); - } else if (base->form == 13) { + } else if (base->form == 11) { OPM_WriteString((CHAR*)"POINTER__typ", 13); } else { OPM_WriteString((CHAR*)"NIL", 4); @@ -1430,11 +1430,11 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } OPM_Write(')'); } else { - if ((((((l->typ->form == 13 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { + if ((((((l->typ->form == 11 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { l->obj->adr = 0; OPV_design(l, -1); l->obj->adr = 1; - if (r->typ->form != 11) { + if (r->typ->form != 9) { OPM_WriteString((CHAR*)" = (void*)", 11); } else { OPM_WriteString((CHAR*)" = ", 4); @@ -1445,7 +1445,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } if (l->typ == r->typ) { OPV_expr(r, -1); - } else if ((((l->typ->form == 13 && r->typ->form != 11)) && l->typ->strobj != NIL)) { + } else if ((((l->typ->form == 11 && r->typ->form != 9)) && l->typ->strobj != NIL)) { OPM_Write('('); OPC_Ident(l->typ->strobj); OPM_Write(')'); @@ -1630,7 +1630,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } else { if (n->left != NIL) { OPM_WriteString((CHAR*)"_o_result = ", 13); - if ((n->left->typ->form == 13 && n->obj->typ != n->left->typ)) { + if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) { OPM_WriteString((CHAR*)"(void*)", 8); OPV_expr(n->left, 10); } else { diff --git a/bootstrap/unix-88/OPV.h b/bootstrap/unix-88/OPV.h index 351ef416..914ff060 100644 --- a/bootstrap/unix-88/OPV.h +++ b/bootstrap/unix-88/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/unix-88/Platform.c b/bootstrap/unix-88/Platform.c index 9801d5f9..84e4aba7 100644 --- a/bootstrap/unix-88/Platform.c +++ b/bootstrap/unix-88/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/unix-88/Platform.h b/bootstrap/unix-88/Platform.h index ca58fbe8..906f09cb 100644 --- a/bootstrap/unix-88/Platform.h +++ b/bootstrap/unix-88/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/unix-88/Reals.c b/bootstrap/unix-88/Reals.c index 0652d6b4..98719812 100644 --- a/bootstrap/unix-88/Reals.c +++ b/bootstrap/unix-88/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/unix-88/Reals.h b/bootstrap/unix-88/Reals.h index 9836b502..87c9aa45 100644 --- a/bootstrap/unix-88/Reals.h +++ b/bootstrap/unix-88/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/unix-88/Strings.c b/bootstrap/unix-88/Strings.c index ad6ecbeb..24999430 100644 --- a/bootstrap/unix-88/Strings.c +++ b/bootstrap/unix-88/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/unix-88/Strings.h b/bootstrap/unix-88/Strings.h index f836f9f9..9c2bad27 100644 --- a/bootstrap/unix-88/Strings.h +++ b/bootstrap/unix-88/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/unix-88/Texts.c b/bootstrap/unix-88/Texts.c index 01c67abc..ff526cbc 100644 --- a/bootstrap/unix-88/Texts.c +++ b/bootstrap/unix-88/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Files.h" diff --git a/bootstrap/unix-88/Texts.h b/bootstrap/unix-88/Texts.h index 699c0323..f36b27cf 100644 --- a/bootstrap/unix-88/Texts.h +++ b/bootstrap/unix-88/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/unix-88/Vishap.c b/bootstrap/unix-88/Vishap.c index ffe27b0f..65dd2639 100644 --- a/bootstrap/unix-88/Vishap.c +++ b/bootstrap/unix-88/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkamSf */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkamSf */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" diff --git a/bootstrap/unix-88/errors.c b/bootstrap/unix-88/errors.c index 57e3252c..dc5320bb 100644 --- a/bootstrap/unix-88/errors.c +++ b/bootstrap/unix-88/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/unix-88/errors.h b/bootstrap/unix-88/errors.h index abc550ac..d15a472c 100644 --- a/bootstrap/unix-88/errors.h +++ b/bootstrap/unix-88/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/unix-88/extTools.c b/bootstrap/unix-88/extTools.c index 4e7d428f..566e2b5c 100644 --- a/bootstrap/unix-88/extTools.c +++ b/bootstrap/unix-88/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" diff --git a/bootstrap/unix-88/extTools.h b/bootstrap/unix-88/extTools.h index b5b2af96..161e273a 100644 --- a/bootstrap/unix-88/extTools.h +++ b/bootstrap/unix-88/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/unix-88/vt100.c b/bootstrap/unix-88/vt100.c index 037caf04..b9fb5373 100644 --- a/bootstrap/unix-88/vt100.c +++ b/bootstrap/unix-88/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Console.h" diff --git a/bootstrap/unix-88/vt100.h b/bootstrap/unix-88/vt100.h index 0b63640a..745ff709 100644 --- a/bootstrap/unix-88/vt100.h +++ b/bootstrap/unix-88/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef vt100__h #define vt100__h diff --git a/bootstrap/windows-48/Configuration.c b/bootstrap/windows-48/Configuration.c index eed3c4f0..fb7df026 100644 --- a/bootstrap/windows-48/Configuration.c +++ b/bootstrap/windows-48/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" @@ -13,6 +13,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/08/31] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/01] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/windows-48/Configuration.h b/bootstrap/windows-48/Configuration.h index 90696149..61b33bc5 100644 --- a/bootstrap/windows-48/Configuration.h +++ b/bootstrap/windows-48/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/windows-48/Console.c b/bootstrap/windows-48/Console.c index 01806847..bd7a7d85 100644 --- a/bootstrap/windows-48/Console.c +++ b/bootstrap/windows-48/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Platform.h" diff --git a/bootstrap/windows-48/Console.h b/bootstrap/windows-48/Console.h index fad0f676..2c01265d 100644 --- a/bootstrap/windows-48/Console.h +++ b/bootstrap/windows-48/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/windows-48/Files.c b/bootstrap/windows-48/Files.c index 08d1739f..459e292f 100644 --- a/bootstrap/windows-48/Files.c +++ b/bootstrap/windows-48/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "Console.h" diff --git a/bootstrap/windows-48/Files.h b/bootstrap/windows-48/Files.h index fdaec6b0..3de5b022 100644 --- a/bootstrap/windows-48/Files.h +++ b/bootstrap/windows-48/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/windows-48/Heap.c b/bootstrap/windows-48/Heap.c index f35765c6..50d17d87 100644 --- a/bootstrap/windows-48/Heap.c +++ b/bootstrap/windows-48/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #include "SYSTEM.h" struct Heap__1 { diff --git a/bootstrap/windows-48/Heap.h b/bootstrap/windows-48/Heap.h index 4d5c5b4e..a4e30a5e 100644 --- a/bootstrap/windows-48/Heap.h +++ b/bootstrap/windows-48/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/windows-48/Modules.c b/bootstrap/windows-48/Modules.c index 9f39f448..52abc5b8 100644 --- a/bootstrap/windows-48/Modules.c +++ b/bootstrap/windows-48/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Console.h" #include "Heap.h" diff --git a/bootstrap/windows-48/Modules.h b/bootstrap/windows-48/Modules.h index 1707868f..6bee52c7 100644 --- a/bootstrap/windows-48/Modules.h +++ b/bootstrap/windows-48/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/windows-48/OPB.c b/bootstrap/windows-48/OPB.c index e6e966a6..a3322969 100644 --- a/bootstrap/windows-48/OPB.c +++ b/bootstrap/windows-48/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPM.h" #include "OPS.h" @@ -317,7 +317,7 @@ void OPB_DeRef (OPT_Node *x) typ = (*x)->typ; if ((*x)->class >= 7) { OPB_err(78); - } else if (typ->form == 13) { + } else if (typ->form == 11) { if (typ == OPT_sysptrtyp) { OPB_err(57); } @@ -340,7 +340,7 @@ void OPB_Index (OPT_Node *x, OPT_Node y) f = y->typ->form; if ((*x)->class >= 7) { OPB_err(79); - } else if (f != 5 || __IN(y->class, 0x0300)) { + } else if (f != 4 || __IN(y->class, 0x0300)) { OPB_err(80); y->typ = OPT_inttyp; } @@ -437,10 +437,10 @@ void OPB_TypTest (OPT_Node *x, OPT_Object obj, BOOLEAN guard) TypTest__57_s = &_s; if (OPB_NotVar(*x)) { OPB_err(112); - } else if ((*x)->typ->form == 13) { + } else if ((*x)->typ->form == 11) { if (((*x)->typ->BaseTyp->comp != 4 && (*x)->typ != OPT_sysptrtyp)) { OPB_err(85); - } else if (obj->typ->form == 13) { + } else if (obj->typ->form == 11) { GTT__58((*x)->typ->BaseTyp, obj->typ->BaseTyp); } else { OPB_err(86); @@ -465,7 +465,7 @@ void OPB_In (OPT_Node *x, OPT_Node y) f = (*x)->typ->form; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if ((f == 5 && y->typ->form == 9)) { + } else if ((f == 4 && y->typ->form == 7)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (k < 0 || k > OPM_MaxSet) { @@ -504,7 +504,7 @@ static LONGINT OPB_log (LONGINT x) static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) { LONGREAL min, max, r; - if (f == 7) { + if (f == 5) { min = OPM_MinReal; max = OPM_MaxReal; } else { @@ -515,7 +515,7 @@ static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) if (r > max || r < min) { OPB_err(nr); x->realval = (LONGREAL)1; - } else if (f == 7) { + } else if (f == 5) { x->realval = x->realval; } x->intval = -1; @@ -567,21 +567,21 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 6: - if (!__IN(f, 0x01a0)) { + if (!__IN(f, 0x70)) { OPB_err(96); } break; case 7: - if (__IN(f, 0x03a0)) { + if (__IN(f, 0xf0)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-2147483647-1)) { OPB_err(203); } else { z->conval->intval = -z->conval->intval; OPB_SetIntType(z); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { z->conval->realval = -z->conval->realval; } else { z->conval->setval = ~z->conval->setval; @@ -595,9 +595,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 21: - if (__IN(f, 0x01a0)) { + if (__IN(f, 0x70)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-2147483647-1)) { OPB_err(203); } else { @@ -629,7 +629,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 23: - if (f == 5) { + if (f == 4) { if (z->class == 7) { z->conval->intval = OPB_BoolToInt(__ODD(z->conval->intval)); z->obj = NIL; @@ -644,9 +644,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) case 24: if ((((z->class == 7 && f == 3)) && z->conval->intval >= 32)) { OPB_CharToString(z); - f = 10; + f = 8; } - if (z->class < 7 || f == 10) { + if (z->class < 7 || f == 8) { z = NewOp__29(op, typ, z); } else { OPB_err(127); @@ -654,7 +654,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) z->typ = OPT_linttyp; break; case 25: - if ((f == 5 && z->class == 7)) { + if ((f == 4 && z->class == 7)) { if ((0 <= z->conval->intval && z->conval->intval <= -1)) { z = NewOp__29(op, typ, z); } else { @@ -681,7 +681,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) INTEGER g; OPT_Struct p = NIL, q = NIL, t = NIL; g = y->typ->form; - if (g == 13) { + if (g == 11) { p = x->typ->BaseTyp; q = y->typ->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -699,7 +699,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) } else { OPB_err(100); } - } else if (g != 11) { + } else if (g != 9) { OPB_err(100); } } @@ -716,7 +716,7 @@ void OPB_CheckParameters (OPT_Object fp, OPT_Object ap, BOOLEAN checkNames) at = at->BaseTyp; } if (ft != at) { - if ((ft->form == 14 && at->form == 14)) { + if ((ft->form == 12 && at->form == 12)) { if (ft->BaseTyp == at->BaseTyp) { OPB_CheckParameters(ft->link, at->link, 0); } else { @@ -777,7 +777,7 @@ static INTEGER ConstCmp__14 (void) case 0: res = 9; break; - case 1: case 3: case 4: case 5: + case 1: case 3: case 4: if ((*ConstOp__13_s->xval)->intval < (*ConstOp__13_s->yval)->intval) { res = 11; } else if ((*ConstOp__13_s->xval)->intval > (*ConstOp__13_s->yval)->intval) { @@ -786,7 +786,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 7: case 8: + case 5: case 6: if ((*ConstOp__13_s->xval)->realval < (*ConstOp__13_s->yval)->realval) { res = 11; } else if ((*ConstOp__13_s->xval)->realval > (*ConstOp__13_s->yval)->realval) { @@ -802,14 +802,14 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 9: + case 7: if ((*ConstOp__13_s->xval)->setval != (*ConstOp__13_s->yval)->setval) { res = 10; } else { res = 9; } break; - case 10: + case 8: if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) < 0) { res = 11; } else if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) > 0) { @@ -818,7 +818,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 11: case 13: case 14: + case 9: case 11: case 12: if ((*ConstOp__13_s->xval)->intval != (*ConstOp__13_s->yval)->intval) { res = 10; } else { @@ -856,7 +856,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) if (f != g) { switch (f) { case 3: - if (g == 10) { + if (g == 8) { OPB_CharToString(x); } else { OPB_err(100); @@ -864,17 +864,17 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 5: - if (g == 5) { + case 4: + if (g == 4) { if (x->typ->size <= y->typ->size) { x->typ = y->typ; } else { x->typ = OPT_IntType(x->typ->size); } - } else if (g == 7) { + } else if (g == 5) { x->typ = OPT_realtyp; xval->realval = xval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; xval->realval = xval->intval; } else { @@ -883,11 +883,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 7: - if (g == 5) { + case 5: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; } else { OPB_err(100); @@ -895,11 +895,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 8: - if (g == 5) { + case 6: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 7) { + } else if (g == 5) { y->typ = OPT_lrltyp; } else { OPB_err(100); @@ -907,26 +907,26 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 10: + case 8: if (g == 3) { OPB_CharToString(y); - g = 10; + g = 8; } else { OPB_err(100); y->typ = x->typ; __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 11: - if (!__IN(g, 0x6000)) { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; - case 13: + case 11: OPB_CheckPtr(x, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; @@ -940,7 +940,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } switch (op) { case 1: - if (f == 5) { + if (f == 4) { xv = xval->intval; yv = yval->intval; if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(2147483647, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-2147483647-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-2147483647-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-2147483647-1))) && yv != (-2147483647-1))) && -xv <= __DIV(2147483647, -yv))) { @@ -949,7 +949,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) <= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 / (LONGREAL)__ABS(yval->realval)) { xval->realval = xval->realval * yval->realval; @@ -957,23 +957,23 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & yval->setval); } else if (f != 0) { OPB_err(101); } break; case 2: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->realval = xval->intval / (REAL)yval->intval; - OPB_CheckRealType(7, 205, xval); + OPB_CheckRealType(5, 205, xval); } else { OPB_err(205); xval->realval = (LONGREAL)1; } x->typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) >= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 * __ABS(yval->realval)) { xval->realval = xval->realval / yval->realval; @@ -981,14 +981,14 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(205); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval ^ yval->setval; } else if (f != 0) { OPB_err(102); } break; case 3: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = __DIV(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1000,7 +1000,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = (int)__MOD(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1019,7 +1019,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 6: - if (f == 5) { + if (f == 4) { temp = (yval->intval >= 0 && xval->intval <= 2147483647 - yval->intval); if (temp || (yval->intval < 0 && xval->intval >= (-2147483647-1) - yval->intval)) { xval->intval += yval->intval; @@ -1027,7 +1027,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 - yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 - yval->realval)) { xval->realval = xval->realval + yval->realval; @@ -1035,21 +1035,21 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval | yval->setval; } else if (f != 0) { OPB_err(105); } break; case 7: - if (f == 5) { + if (f == 4) { if ((yval->intval >= 0 && xval->intval >= (-2147483647-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 2147483647 + yval->intval)) { xval->intval -= yval->intval; OPB_SetIntType(x); } else { OPB_err(207); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 + yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 + yval->realval)) { xval->realval = xval->realval - yval->realval; @@ -1057,7 +1057,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(207); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & ~yval->setval); } else if (f != 0) { OPB_err(106); @@ -1077,28 +1077,28 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) xval->intval = OPB_BoolToInt(ConstCmp__14() != 9); break; case 11: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 11); } break; case 12: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 13); } break; case 13: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 13); } break; case 14: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 11); @@ -1122,8 +1122,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) f = (*x)->typ->form; g = typ->form; if ((*x)->class == 7) { - if (f == 5) { - if (g == 5) { + if (f == 4) { + if (g == 4) { if (f > g) { OPB_SetIntType(*x); if ((*x)->typ->size > typ->size) { @@ -1131,7 +1131,7 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) (*x)->conval->intval = 1; } } - } else if (__IN(g, 0x0180)) { + } else if (__IN(g, 0x60)) { (*x)->conval->realval = (*x)->conval->intval; (*x)->conval->intval = -1; } else { @@ -1140,8 +1140,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) OPB_err(220); } } - } else if (__IN(f, 0x0180)) { - if (__IN(g, 0x0180)) { + } else if (__IN(f, 0x60)) { + if (__IN(g, 0x60)) { OPB_CheckRealType(g, 203, (*x)->conval); } else { r = (*x)->conval->realval; @@ -1190,25 +1190,25 @@ static BOOLEAN strings__41 (OPT_Node *x, OPT_Node *y) { BOOLEAN _o_result; BOOLEAN ok, xCharArr, yCharArr; - xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 10; - yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 10; + xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 8; + yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 8; if ((((xCharArr && *Op__38_s->g == 3)) && (*y)->class == 7)) { OPB_CharToString(*y); - *Op__38_s->g = 10; + *Op__38_s->g = 8; yCharArr = 1; } if ((((yCharArr && *Op__38_s->f == 3)) && (*x)->class == 7)) { OPB_CharToString(*x); - *Op__38_s->f = 10; + *Op__38_s->f = 8; xCharArr = 1; } ok = (xCharArr && yCharArr); if (ok) { - if ((*Op__38_s->f == 10 && (*x)->conval->intval2 == 1)) { + if ((*Op__38_s->f == 8 && (*x)->conval->intval2 == 1)) { (*x)->typ = OPT_chartyp; (*x)->conval->intval = 0; OPB_Index(&*y, OPB_NewIntConst(0)); - } else if ((*Op__38_s->g == 10 && (*y)->conval->intval2 == 1)) { + } else if ((*Op__38_s->g == 8 && (*y)->conval->intval2 == 1)) { (*y)->typ = OPT_chartyp; (*y)->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); @@ -1247,49 +1247,49 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) OPB_err(100); } break; + case 4: + if ((g == 4 && y->typ->size < z->typ->size)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x70)) { + OPB_Convert(&z, y->typ); + } else { + OPB_err(100); + } + break; case 5: - if ((g == 5 && y->typ->size < z->typ->size)) { + if (g == 4) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x01a0)) { + } else if (__IN(g, 0x60)) { OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 7: - if (g == 5) { + case 6: + if (__IN(g, 0x70)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x60)) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 8: - if (__IN(g, 0x01a0)) { - OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&y, z->typ); - } else { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; case 11: - if (!__IN(g, 0x6000)) { - OPB_err(100); - } - break; - case 13: OPB_CheckPtr(z, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; - case 10: + case 8: break; - case 15: + case 13: if (z->typ->comp == 4) { OPB_err(100); } @@ -1305,7 +1305,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) switch (op) { case 1: do_ = 1; - if (f == 5) { + if (f == 4) { if (z->class == 7) { val = z->conval->intval; if (val == 1) { @@ -1336,7 +1336,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) y->obj = NIL; } } - } else if (!__IN(f, 0x0381)) { + } else if (!__IN(f, 0xe1)) { OPB_err(105); typ = OPT_undftyp; } @@ -1345,18 +1345,18 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 2: - if (f == 5) { + if (f == 4) { if ((y->class == 7 && y->conval->intval == 0)) { OPB_err(205); } OPB_Convert(&z, OPT_realtyp); OPB_Convert(&y, OPT_realtyp); typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { if ((y->class == 7 && y->conval->realval == (LONGREAL)0)) { OPB_err(205); } - } else if ((f != 9 && f != 0)) { + } else if ((f != 7 && f != 0)) { OPB_err(102); typ = OPT_undftyp; } @@ -1364,7 +1364,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) break; case 3: do_ = 1; - if (f == 5) { + if (f == 4) { if (y->class == 7) { val = y->conval->intval; if (val == 0) { @@ -1387,7 +1387,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (y->class == 7) { if (y->conval->intval == 0) { OPB_err(205); @@ -1419,12 +1419,12 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 6: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(105); typ = OPT_undftyp; } do_ = 1; - if (f == 5) { + if (f == 4) { if ((z->class == 7 && z->conval->intval == 0)) { do_ = 0; z = y; @@ -1438,11 +1438,11 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 7: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(106); typ = OPT_undftyp; } - if ((f != 5 || y->class != 7) || y->conval->intval != 0) { + if ((f != 4 || y->class != 7) || y->conval->intval != 0) { NewOp__39(op, typ, &z, y); } break; @@ -1462,7 +1462,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 9: case 10: - if (__IN(f, 0x6bff) || strings__41(&z, &y)) { + if (__IN(f, 0x1aff) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPB_err(107); @@ -1471,7 +1471,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) NewOp__39(op, typ, &z, y); break; case 11: case 12: case 13: case 14: - if (__IN(f, 0x01f9) || strings__41(&z, &y)) { + if (__IN(f, 0x79) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPM_LogWLn(); @@ -1498,7 +1498,7 @@ void OPB_SetRange (OPT_Node *x, OPT_Node y) LONGINT k, l; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if (((*x)->typ->form == 5 && y->typ->form == 5)) { + } else if (((*x)->typ->form == 4 && y->typ->form == 4)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (0 > k || k > OPM_MaxSet) { @@ -1533,7 +1533,7 @@ void OPB_SetElem (OPT_Node *x) LONGINT k; if ((*x)->class == 8 || (*x)->class == 9) { OPB_err(126); - } else if ((*x)->typ->form != 5) { + } else if ((*x)->typ->form != 4) { OPB_err(93); } else if ((*x)->class == 7) { k = (*x)->conval->intval; @@ -1576,40 +1576,40 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWNum(ynode->typ->size, 0); OPM_LogWLn(); } - if (ynode->class == 8 || (ynode->class == 9 && f != 14)) { + if (ynode->class == 8 || (ynode->class == 9 && f != 12)) { OPB_err(126); } switch (f) { - case 0: case 10: + case 0: case 8: break; case 1: - if (!((__IN(g, 0x2a) && y->size == 1))) { + if (!((__IN(g, 0x1a) && y->size == 1))) { OPB_err(113); } break; - case 2: case 3: case 9: + case 2: case 3: case 7: if (g != f) { OPB_err(113); } break; + case 4: + if (g != 4 || x->size < y->size) { + OPB_err(113); + } + break; case 5: - if (g != 5 || x->size < y->size) { + if (!__IN(g, 0x30)) { OPB_err(113); } break; - case 7: - if (!__IN(g, 0xe0)) { + case 6: + if (!__IN(g, 0x70)) { OPB_err(113); } break; - case 8: - if (!__IN(g, 0x01e0)) { - OPB_err(113); - } - break; - case 13: - if ((x == y || g == 11) || (x == OPT_sysptrtyp && g == 13)) { - } else if (g == 13) { + case 11: + if ((x == y || g == 9) || (x == OPT_sysptrtyp && g == 11)) { + } else if (g == 11) { p = x->BaseTyp; q = y->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -1626,28 +1626,28 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPB_err(113); } break; - case 14: + case 12: if (ynode->class == 9) { OPB_CheckProc(x, ynode->obj); - } else if (x == y || g == 11) { + } else if (x == y || g == 9) { } else { OPB_err(113); } break; - case 12: case 11: + case 10: case 9: OPB_err(113); break; - case 15: + case 13: x->pvused = 1; if (x->comp == 2) { if ((ynode->class == 7 && g == 3)) { OPB_CharToString(ynode); y = ynode->typ; - g = 10; + g = 8; } if (x == y) { } else if (x->BaseTyp == OPT_chartyp) { - if (g == 10) { + if (g == 8) { if (ynode->conval->intval2 > x->n) { OPB_err(114); } @@ -1686,7 +1686,7 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWLn(); break; } - if ((((((ynode->class == 7 && g < f)) && __IN(g, 0xe0))) && __IN(f, 0x01e0))) { + if ((((((ynode->class == 7 && g < f)) && __IN(g, 0x30))) && __IN(f, 0x70))) { OPB_Convert(&ynode, x); } } @@ -1704,7 +1704,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) f = x->typ->form; switch (fctno) { case 0: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); } else { @@ -1719,7 +1719,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) typ = OPT_notyp; if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { if (x->readonly) { OPB_err(76); } @@ -1757,7 +1757,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 5: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { OPB_Convert(&x, OPT_linttyp); } else { OPB_err(111); @@ -1777,17 +1777,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(0); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMinimum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(0); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MinReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MinLReal, OPT_lrltyp); break; default: @@ -1808,17 +1808,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(255); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMaximum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(OPM_MaxSet); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MaxReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MaxLReal, OPT_lrltyp); break; default: @@ -1832,7 +1832,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 9: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x21)) { + } else if (__IN(f, 0x11)) { OPB_Convert(&x, OPT_chartyp); } else { OPB_err(111); @@ -1842,14 +1842,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 10: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, -1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 8) { + } else if (f == 6) { OPB_Convert(&x, OPT_realtyp); } else { OPB_err(111); @@ -1858,14 +1858,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 11: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, 1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 7) { + } else if (f == 5) { OPB_Convert(&x, OPT_lrltyp); } else if (f == 3) { OPB_Convert(&x, OPT_linttyp); @@ -1876,7 +1876,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 13: case 14: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else if (x->readonly) { OPB_err(76); @@ -1900,18 +1900,18 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 18: if ((x->class == 7 && f == 3)) { OPB_CharToString(x); - f = 10; + f = 8; } if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 10)) { + } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 8)) { OPB_err(111); } break; case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if (x->typ->size != OPM_LIntSize) { OPB_Convert(&x, OPT_linttyp); } @@ -1928,7 +1928,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) if (x->class != 8) { OPB_err(110); x = OPB_NewIntConst(1); - } else if (__IN(f, 0x63fe) || __IN(x->typ->comp, 0x14)) { + } else if (__IN(f, 0x18fe) || __IN(x->typ->comp, 0x14)) { (*OPB_typSize)(x->typ); x->typ->pvused = 1; x = OPB_NewIntConst(x->typ->size); @@ -1943,22 +1943,22 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (!__IN(f, 0x022a)) { + } else if (!__IN(f, 0x9a)) { OPB_err(111); } break; case 24: case 25: case 28: case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } break; case 26: case 27: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if (x->conval->intval < 0 || x->conval->intval > -1) { OPB_err(220); } @@ -1969,14 +1969,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 29: if (x->class != 8) { OPB_err(110); - } else if (__IN(f, 0x1401) || x->typ->comp == 3) { + } else if (__IN(f, 0x0501) || x->typ->comp == 3) { OPB_err(111); } break; case 30: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { } else { OPB_err(111); } @@ -2036,7 +2036,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; } else { if (x->typ != p->typ) { - if ((x->class == 7 && f == 5)) { + if ((x->class == 7 && f == 4)) { OPB_Convert(&x, p->typ); } else { OPB_err(111); @@ -2049,7 +2049,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 15: case 16: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (0 > x->conval->intval || x->conval->intval > OPM_MaxSet))) { OPB_err(202); } @@ -2060,7 +2060,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; break; case 17: - if (!(f == 5) || x->class != 7) { + if (!(f == 4) || x->class != 7) { OPB_err(69); } else if (x->typ->size == 1) { L = (SYSTEM_INT16)x->conval->intval; @@ -2109,7 +2109,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((p->class == 7 && x->class == 7)) { if (-OPB_maxExp > x->conval->intval || x->conval->intval > OPB_maxExp) { OPB_err(208); @@ -2137,7 +2137,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) if (x->class == 8 || x->class == 9) { OPB_err(126); } else if (p->typ->comp == 3) { - if (f == 5) { + if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2153,7 +2153,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else { if (fctno == 22) { @@ -2167,7 +2167,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 24: case 25: case 26: case 27: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x63ff)) { + } else if (__IN(f, 0x18ff)) { if (fctno == 24 || fctno == 26) { if (OPB_NotVar(x)) { OPB_err(112); @@ -2185,7 +2185,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 28: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(12, 26, p, x); } else { OPB_err(111); @@ -2193,7 +2193,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_booltyp; break; case 29: - if (((x->class == 8 || x->class == 9) || __IN(f, 0x1401)) || x->typ->comp == 3) { + if (((x->class == 8 || x->class == 9) || __IN(f, 0x0501)) || x->typ->comp == 3) { OPB_err(126); } if (x->typ->size < p->typ->size) { @@ -2209,7 +2209,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 30: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(19, 30, p, x); } else { OPB_err(111); @@ -2219,16 +2219,16 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } p->link = x; break; case 32: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); x->conval = OPT_NewConst(); @@ -2271,7 +2271,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) OPB_err(126); } else if (p->typ->comp != 3) { OPB_err(64); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2287,7 +2287,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) } else if ((fctno == 31 && n == 2)) { if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { node = OPT_NewNode(19); node->subcl = 31; node->right = p; @@ -2375,7 +2375,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((fvarpar && ftyp == OPT_bytetyp)) { - if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x2e) && atyp->size == 1))) { + if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x1e) && atyp->size == 1))) { if (__IN(18, OPM_opt)) { OPB_err(-301); } @@ -2384,7 +2384,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa if (ftyp->comp == 3) { OPB_DynArrParCheck(ftyp, atyp, fvarpar); } else if (ftyp != atyp) { - if ((((!fvarpar && ftyp->form == 13)) && atyp->form == 13)) { + if ((((!fvarpar && ftyp->form == 11)) && atyp->form == 11)) { ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((ftyp->comp == 4 && atyp->comp == 4)) { @@ -2408,7 +2408,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa static void OPB_CheckReceiver (OPT_Node *x, OPT_Object fp) { - if (fp->typ->form == 13) { + if (fp->typ->form == 11) { if ((*x)->class == 3) { *x = (*x)->left; } else { @@ -2425,7 +2425,7 @@ void OPB_PrepCall (OPT_Node *x, OPT_Object *fpar) OPB_CheckReceiver(&(*x)->left, *fpar); *fpar = (*fpar)->link; } - } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 14)) { + } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 12)) { *fpar = (*x)->typ->link; } else { OPB_err(121); @@ -2457,17 +2457,17 @@ void OPB_Param (OPT_Node ap, OPT_Object fp) if (q == NIL) { OPB_err(111); } - } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 13)) { - } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x2e) && ap->typ->size == 1)))))) { + } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 11)) { + } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x1e) && ap->typ->size == 1)))))) { OPB_err(123); - } else if ((fp->typ->form == 13 && ap->class == 5)) { + } else if ((fp->typ->form == 11 && ap->class == 5)) { OPB_err(123); } } else if (fp->typ->comp == 3) { if ((ap->class == 7 && ap->typ->form == 3)) { OPB_CharToString(ap); } - if ((ap->typ->form == 10 && fp->typ->BaseTyp->form == 3)) { + if ((ap->typ->form == 8 && fp->typ->BaseTyp->form == 3)) { } else if (ap->class >= 7) { OPB_err(59); } else { @@ -2575,7 +2575,7 @@ void OPB_Assign (OPT_Node *x, OPT_Node y) OPB_BindNodes(6, (*x)->typ, &z, NIL); *x = z; } - } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 10)) && y->conval->intval2 == 1)) { + } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 8)) && y->conval->intval2 == 1)) { y->typ = OPT_chartyp; y->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); diff --git a/bootstrap/windows-48/OPB.h b/bootstrap/windows-48/OPB.h index 385a9146..97c4485c 100644 --- a/bootstrap/windows-48/OPB.h +++ b/bootstrap/windows-48/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/windows-48/OPC.c b/bootstrap/windows-48/OPC.c index 45784a13..9f818a4a 100644 --- a/bootstrap/windows-48/OPC.c +++ b/bootstrap/windows-48/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "OPM.h" @@ -227,12 +227,12 @@ static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause) if (__IN(typ->comp, 0x0c)) { OPC_Stars(typ->BaseTyp, &*openClause); *openClause = typ->comp == 2; - } else if (typ->form == 14) { + } else if (typ->form == 12) { OPM_Write('('); OPM_Write('*'); } else { pointers = 0; - while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 13)) { + while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 11)) { pointers += 1; typ = typ->BaseTyp; } @@ -277,16 +277,16 @@ static void OPC_DeclareObj (OPT_Object dcl, BOOLEAN scopeDef) for (;;) { form = typ->form; comp = typ->comp; - if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 12) || comp == 4) { + if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 10) || comp == 4) { break; - } else if ((form == 13 && typ->BaseTyp->comp != 3)) { + } else if ((form == 11 && typ->BaseTyp->comp != 3)) { openClause = 1; - } else if (form == 14 || __IN(comp, 0x0c)) { + } else if (form == 12 || __IN(comp, 0x0c)) { if (openClause) { OPM_Write(')'); openClause = 0; } - if (form == 14) { + if (form == 12) { if (OPC_ansi) { OPM_Write(')'); OPC_AnsiParamList(typ->link, 0); @@ -331,19 +331,19 @@ static void OPC_DeclareBase (OPT_Object dcl) LONGINT off, n, dummy; typ = dcl->typ; prev = typ; - while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 12)) && !((typ->form == 13 && typ->BaseTyp->comp == 3)))) { + while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 10)) && !((typ->form == 11 && typ->BaseTyp->comp == 3)))) { prev = typ; typ = typ->BaseTyp; } obj = typ->strobj; - if (typ->form == 12) { + if (typ->form == 10) { OPM_WriteString((CHAR*)"void", 5); } else if ((obj != NIL && !OPC_Undefined(obj))) { OPC_Ident(obj); } else if (typ->comp == 4) { OPM_WriteString((CHAR*)"struct ", 8); OPC_Andent(typ); - if ((prev->form != 13 && (obj != NIL || dcl->name[0] == 0x00))) { + if ((prev->form != 11 && (obj != NIL || dcl->name[0] == 0x00))) { if ((typ->BaseTyp != NIL && typ->BaseTyp->strobj->vis != 0)) { OPM_WriteString((CHAR*)" { /* ", 7); OPC_Ident(typ->BaseTyp->strobj); @@ -357,7 +357,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_FieldList(typ, 1, &off, &n, &dummy); OPC_EndBlk0(); } - } else if ((typ->form == 13 && typ->BaseTyp->comp == 3)) { + } else if ((typ->form == 11 && typ->BaseTyp->comp == 3)) { typ = typ->BaseTyp->BaseTyp; nofdims = 1; while (typ->comp == 3) { @@ -372,7 +372,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_BegStat(); __NEW(obj, OPT_ObjDesc); __NEW(obj->typ, OPT_StrDesc); - obj->typ->form = 15; + obj->typ->form = 13; obj->typ->comp = 2; obj->typ->n = 1; obj->typ->BaseTyp = typ; @@ -393,7 +393,7 @@ LONGINT OPC_NofPtrs (OPT_Struct typ) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { _o_result = 1; return _o_result; } else if ((typ->comp == 4 && __MASK(typ->sysflag, -256) == 0)) { @@ -435,7 +435,7 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, LONGINT adr, LONGINT *cnt) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n, i; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { OPM_WriteInt(adr); OPM_WriteString((CHAR*)", ", 3); *cnt += 1; @@ -540,7 +540,7 @@ static void OPC_DeclareParams (OPT_Object par, BOOLEAN macro) if (macro) { OPM_WriteStringVar((void*)par->name, 256); } else { - if ((par->mode == 1 && par->typ->form == 7)) { + if ((par->mode == 1 && par->typ->form == 5)) { OPM_Write('_'); } OPC_Ident(par); @@ -612,7 +612,7 @@ OPT_Object OPC_BaseTProc (OPT_Object obj) OPT_Struct typ = NIL, base = NIL; LONGINT mno; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } base = typ->BaseTyp; @@ -635,7 +635,7 @@ static void OPC_DefineTProcMacros (OPT_Object obj, BOOLEAN *empty) OPC_Ident(obj); OPC_DeclareParams(obj->link, 1); OPM_WriteString((CHAR*)" __SEND(", 9); - if (obj->link->typ->form == 13) { + if (obj->link->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPC_Ident(obj->link); OPM_Write(')'); @@ -673,7 +673,7 @@ static void OPC_DefineType (OPT_Struct str) if (obj == NIL || OPC_Undefined(obj)) { if (obj != NIL) { if (obj->linkadr == 1) { - if (str->form != 13) { + if (str->form != 11) { OPM_Mark(244, str->txtpos); obj->linkadr = 2; } @@ -692,13 +692,13 @@ static void OPC_DefineType (OPT_Struct str) } field = field->link; } - } else if (str->form == 13) { + } else if (str->form == 11) { if (str->BaseTyp->comp != 4) { OPC_DefineType(str->BaseTyp); } } else if (__IN(str->comp, 0x0c)) { OPC_DefineType(str->BaseTyp); - } else if (str->form == 14) { + } else if (str->form == 12) { if (str->BaseTyp != OPT_notyp) { OPC_DefineType(str->BaseTyp); } @@ -889,7 +889,7 @@ LONGINT OPC_BaseAlignment (OPT_Struct typ) { LONGINT _o_result; LONGINT alignment; - if (typ->form == 15) { + if (typ->form == 13) { if (typ->comp == 4) { alignment = __MASK(typ->align, -65536); } else { @@ -1017,7 +1017,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_WriteString((CHAR*)"export ", 8); } } - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_WriteString((CHAR*)"double", 7); } else { OPC_DeclareBase(obj); @@ -1026,7 +1026,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_Write(','); } OPM_Write(' '); - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_Write('_'); } OPC_DeclareObj(obj, vis == 3); @@ -1043,7 +1043,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; - } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 13)) { + } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 11)) { OPM_WriteString((CHAR*)" = NIL", 7); } } @@ -1380,7 +1380,7 @@ void OPC_GenEnumPtrs (OPT_Object var) OPC_BegBlk(); } OPC_BegStat(); - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"P(", 3); OPC_Ident(var); OPM_Write(')'); @@ -1399,7 +1399,7 @@ void OPC_GenEnumPtrs (OPT_Object var) n = n * typ->n; typ = typ->BaseTyp; } - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"__ENUMP(", 9); OPC_Ident(var); OPC_Str1((CHAR*)", #, P)", 8, n); @@ -1562,7 +1562,7 @@ void OPC_EnterProc (OPT_Object proc) if (!OPC_ansi) { var = proc->link; while (var != NIL) { - if ((var->typ->form == 7 && var->mode == 1)) { + if ((var->typ->form == 5 && var->mode == 1)) { OPC_BegStat(); OPC_Ident(var->typ->strobj); OPM_Write(' '); @@ -1878,7 +1878,7 @@ void OPC_Case (LONGINT caseVal, INTEGER form) case 3: OPC_CharacterLiteral(caseVal); break; - case 5: + case 4: OPM_WriteInt(caseVal); break; default: @@ -1976,16 +1976,16 @@ void OPC_Constant (OPT_Const con, INTEGER form) case 3: OPC_CharacterLiteral(con->intval); break; - case 5: + case 4: OPM_WriteInt(con->intval); break; - case 7: + case 5: OPM_WriteReal(con->realval, 'f'); break; - case 8: + case 6: OPM_WriteReal(con->realval, 0x00); break; - case 9: + case 7: OPM_WriteString((CHAR*)"0x", 3); skipLeading = 1; s = con->setval; @@ -2008,10 +2008,10 @@ void OPC_Constant (OPT_Const con, INTEGER form) OPM_Write('0'); } break; - case 10: + case 8: OPC_StringLiteral(*con->ext, 256, con->intval2 - 1); break; - case 11: + case 9: OPM_WriteString((CHAR*)"NIL", 4); break; default: diff --git a/bootstrap/windows-48/OPC.h b/bootstrap/windows-48/OPC.h index 4243328e..38f95afe 100644 --- a/bootstrap/windows-48/OPC.h +++ b/bootstrap/windows-48/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/windows-48/OPM.c b/bootstrap/windows-48/OPM.c index 979d9598..f2da0fed 100644 --- a/bootstrap/windows-48/OPM.c +++ b/bootstrap/windows-48/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "Console.h" diff --git a/bootstrap/windows-48/OPM.h b/bootstrap/windows-48/OPM.h index f93bcd98..15a980a6 100644 --- a/bootstrap/windows-48/OPM.h +++ b/bootstrap/windows-48/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/windows-48/OPP.c b/bootstrap/windows-48/OPP.c index b0e235d3..21c21350 100644 --- a/bootstrap/windows-48/OPP.c +++ b/bootstrap/windows-48/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPB.h" #include "OPM.h" @@ -136,7 +136,7 @@ static void OPP_CheckSysFlag (INTEGER *sysflag, INTEGER default_) OPP_err(135); } OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { sf = x->conval->intval; if (sf < 0 || sf > 1) { OPP_err(220); @@ -158,7 +158,7 @@ static void OPP_RecordType (OPT_Struct *typ, OPT_Struct *banned) OPT_Object fld = NIL, first = NIL, last = NIL, base = NIL; OPT_Struct ftyp = NIL; INTEGER sysflag; - *typ = OPT_NewStr(15, 4); + *typ = OPT_NewStr(13, 4); (*typ)->BaseTyp = NIL; OPP_CheckSysFlag(&sysflag, -1); if (OPP_sym == 30) { @@ -253,7 +253,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) INTEGER sysflag; OPP_CheckSysFlag(&sysflag, 0); if (OPP_sym == 25) { - *typ = OPT_NewStr(15, 3); + *typ = OPT_NewStr(13, 3); (*typ)->mno = 0; (*typ)->sysflag = sysflag; OPS_Get(&OPP_sym); @@ -265,10 +265,10 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) (*typ)->n = 0; } } else { - *typ = OPT_NewStr(15, 2); + *typ = OPT_NewStr(13, 2); (*typ)->sysflag = sysflag; OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { n = x->conval->intval; if (n <= 0 || n > OPM_MaxIndex) { OPP_err(63); @@ -301,7 +301,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) static void OPP_PointerType (OPT_Struct *typ) { OPT_Object id = NIL; - *typ = OPT_NewStr(13, 1); + *typ = OPT_NewStr(11, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); OPP_CheckSym(28); if (OPP_sym == 38) { @@ -409,7 +409,7 @@ static void OPP_FormalParameters (OPT_Object *firstPar, OPT_Struct *resTyp) if (OPP_sym == 38) { OPP_qualident(&res); if (res->mode == 5) { - if (res->typ->form < 15) { + if (res->typ->form < 13) { *resTyp = res->typ; } else { OPP_err(54); @@ -459,7 +459,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) OPP_PointerType(&*typ); } else if (OPP_sym == 61) { OPS_Get(&OPP_sym); - *typ = OPT_NewStr(14, 1); + *typ = OPT_NewStr(12, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); if (OPP_sym == 30) { OPS_Get(&OPP_sym); @@ -488,7 +488,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) static void OPP_Type (OPT_Struct *typ, OPT_Struct *banned) { OPP_TypeDecl(&*typ, &*banned); - if (((((*typ)->form == 13 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { + if (((((*typ)->form == 11 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { OPP_err(0); } } @@ -503,7 +503,7 @@ static void OPP_selector (OPT_Node *x) if (OPP_sym == 31) { OPS_Get(&OPP_sym); for (;;) { - if (((*x)->typ != NIL && (*x)->typ->form == 13)) { + if (((*x)->typ != NIL && (*x)->typ->form == 11)) { OPB_DeRef(&*x); } OPP_Expression(&y); @@ -521,7 +521,7 @@ static void OPP_selector (OPT_Node *x) __COPY(OPS_name, name, 256); OPS_Get(&OPP_sym); if ((*x)->typ != NIL) { - if ((*x)->typ->form == 13) { + if ((*x)->typ->form == 11) { OPB_DeRef(&*x); } if ((*x)->typ->comp == 4) { @@ -543,7 +543,7 @@ static void OPP_selector (OPT_Node *x) OPP_err(75); } typ = y->obj->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField((*x)->obj->name, typ->BaseTyp, &proc); @@ -572,7 +572,7 @@ static void OPP_selector (OPT_Node *x) } else if (OPP_sym == 17) { OPS_Get(&OPP_sym); OPB_DeRef(&*x); - } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 14)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { + } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 12)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&obj); @@ -871,10 +871,10 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } else { *typ = obj->typ; *rec = *typ; - if ((*rec)->form == 13) { + if ((*rec)->form == 11) { *rec = (*rec)->BaseTyp; } - if (!((((*mode == 1 && (*typ)->form == 13)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { + if (!((((*mode == 1 && (*typ)->form == 11)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { OPP_err(70); *rec = NIL; } @@ -888,7 +888,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } OPP_CheckSym(22); if (*rec == NIL) { - *rec = OPT_NewStr(15, 4); + *rec = OPT_NewStr(13, 4); (*rec)->BaseTyp = NIL; } } @@ -896,7 +896,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St static BOOLEAN OPP_Extends (OPT_Struct x, OPT_Struct b) { BOOLEAN _o_result; - if ((b->form == 13 && x->form == 13)) { + if ((b->form == 11 && x->form == 11)) { b = b->BaseTyp; x = x->BaseTyp; } @@ -1173,14 +1173,14 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O for (;;) { OPP_ConstExpression(&x); f = x->typ->form; - if (__IN(f, 0x28)) { + if (__IN(f, 0x18)) { xval = x->conval->intval; } else { OPP_err(61); xval = 1; } - if (f == 5) { - if (!(LabelTyp->form == 5) || LabelTyp->size < x->typ->size) { + if (f == 4) { + if (!(LabelTyp->form == 4) || LabelTyp->size < x->typ->size) { OPP_err(60); } } else if ((SYSTEM_INT16)LabelTyp->form != f) { @@ -1190,7 +1190,7 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O OPS_Get(&OPP_sym); OPP_ConstExpression(&y); yval = y->conval->intval; - if (((SYSTEM_INT16)y->typ->form != f && !((f == 5 && y->typ->form == 5)))) { + if (((SYSTEM_INT16)y->typ->form != f && !((f == 4 && y->typ->form == 4)))) { OPP_err(60); } if (yval < xval) { @@ -1253,7 +1253,7 @@ static void CasePart__31 (OPT_Node *x) *StatSeq__30_s->pos = OPM_errpos; if ((*x)->class == 8 || (*x)->class == 9) { OPP_err(126); - } else if (!__IN((*x)->typ->form, 0x38)) { + } else if (!__IN((*x)->typ->form, 0x18)) { OPP_err(125); } OPP_CheckSym(25); @@ -1439,7 +1439,7 @@ static void OPP_StatSeq (OPT_Node *stat) OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&id); - if (!(id->typ->form == 5)) { + if (!(id->typ->form == 4)) { OPP_err(68); } OPP_CheckSym(34); @@ -1471,7 +1471,7 @@ static void OPP_StatSeq (OPT_Node *stat) SetPos__35(z); OPB_Link(&*stat, &last, z); y = OPB_NewLeaf(t); - } else if (!(y->typ->form == 5) || y->typ->size > x->left->typ->size) { + } else if (!(y->typ->form == 4) || y->typ->size > x->left->typ->size) { OPP_err(113); } OPB_Link(&*stat, &last, x); @@ -1526,7 +1526,7 @@ static void OPP_StatSeq (OPT_Node *stat) if (OPP_sym == 38) { OPP_qualident(&id); y = OPB_NewLeaf(id); - if ((((id != NIL && id->typ->form == 13)) && (id->mode == 2 || !id->leaf))) { + if ((((id != NIL && id->typ->form == 11)) && (id->mode == 2 || !id->leaf))) { OPP_err(245); } OPP_CheckSym(20); diff --git a/bootstrap/windows-48/OPP.h b/bootstrap/windows-48/OPP.h index 0ddbe4c3..8bed9493 100644 --- a/bootstrap/windows-48/OPP.h +++ b/bootstrap/windows-48/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/windows-48/OPS.c b/bootstrap/windows-48/OPS.c index 89c8242e..f197a5c6 100644 --- a/bootstrap/windows-48/OPS.c +++ b/bootstrap/windows-48/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #include "SYSTEM.h" #include "OPM.h" diff --git a/bootstrap/windows-48/OPS.h b/bootstrap/windows-48/OPS.h index 46e05201..1e99f5e9 100644 --- a/bootstrap/windows-48/OPS.h +++ b/bootstrap/windows-48/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/windows-48/OPT.c b/bootstrap/windows-48/OPT.c index 7398b44a..5b495ad5 100644 --- a/bootstrap/windows-48/OPT.c +++ b/bootstrap/windows-48/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPM.h" #include "OPS.h" @@ -173,7 +173,7 @@ OPT_Struct OPT_ShorterOrLongerType (OPT_Struct x, INTEGER dir) { OPT_Struct _o_result; INTEGER i; - __ASSERT(x->form == 5, 0); + __ASSERT(x->form == 4, 0); __ASSERT(dir == 1 || dir == -1, 0); __ASSERT(x->BaseTyp == OPT_undftyp, 0); i = 0; @@ -284,7 +284,7 @@ void OPT_Close (void) OPT_GlbMod[__X(i, 64)] = NIL; i += 1; } - i = 16; + i = 14; while (i < 255) { OPT_impCtxt.ref[__X(i, 255)] = NIL; OPT_impCtxt.old[__X(i, 255)] = NIL; @@ -483,14 +483,14 @@ void OPT_IdFPrint (OPT_Struct typ) OPT_FPrintName(&idfp, (void*)OPT_GlbMod[__X(typ->mno, 64)]->name, 256); OPT_FPrintName(&idfp, (void*)strobj->name, 256); } - if ((f == 13 || (c == 4 && btyp != NIL)) || c == 3) { + if ((f == 11 || (c == 4 && btyp != NIL)) || c == 3) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); } else if (c == 2) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); OPM_FPrint(&idfp, typ->n); - } else if (f == 14) { + } else if (f == 12) { OPT_FPrintSign(&idfp, btyp, typ->link); } typ->idfp = idfp; @@ -519,7 +519,7 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; FPrintHdFld__15(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -531,8 +531,8 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { - OPM_FPrint(&*FPrintStr__12_s->pvfp, 13); + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { + OPM_FPrint(&*FPrintStr__12_s->pvfp, 11); OPM_FPrint(&*FPrintStr__12_s->pvfp, adr); OPT_nofhdfld += 1; } @@ -595,7 +595,7 @@ void OPT_FPrintStr (OPT_Struct typ) f = typ->form; c = typ->comp; btyp = typ->BaseTyp; - if (f == 13) { + if (f == 11) { strobj = typ->strobj; bstrobj = btyp->strobj; if (((strobj == NIL || strobj->name[0] == 0x00) || bstrobj == NIL) || bstrobj->name[0] == 0x00) { @@ -603,7 +603,7 @@ void OPT_FPrintStr (OPT_Struct typ) OPM_FPrint(&pbfp, btyp->pbfp); pvfp = pbfp; } - } else if (f == 14) { + } else if (f == 12) { } else if (__IN(c, 0x0c)) { OPT_FPrintStr(btyp); OPM_FPrint(&pbfp, btyp->pvfp); @@ -649,23 +649,23 @@ void OPT_FPrintObj (OPT_Object obj) f = obj->typ->form; OPM_FPrint(&fprint, f); switch (f) { - case 2: case 3: case 5: + case 2: case 3: case 4: OPM_FPrint(&fprint, obj->conval->intval); break; - case 9: + case 7: OPM_FPrintSet(&fprint, obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_FPrintReal(&fprint, rval); break; - case 8: + case 6: OPM_FPrintLReal(&fprint, obj->conval->realval); break; - case 10: + case 8: OPT_FPrintName(&fprint, (void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -850,22 +850,22 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) OPM_SymRCh(&ch); conval->intval = (SYSTEM_INT16)ch; break; - case 5: + case 4: conval->intval = OPM_SymRInt(); break; - case 9: + case 7: OPM_SymRSet(&conval->setval); break; - case 7: + case 5: OPM_SymRReal(&rval); conval->realval = rval; conval->intval = -1; break; - case 8: + case 6: OPM_SymRLReal(&conval->realval); conval->intval = -1; break; - case 10: + case 8: ext = OPT_NewExt(); conval->ext = ext; i = 0; @@ -877,7 +877,7 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) conval->intval2 = i; conval->intval = -1; break; - case 11: + case 9: conval->intval = 0; break; default: @@ -979,7 +979,7 @@ static OPT_Object OPT_InTProc (SHORTINT mno) static OPT_Struct OPT_InTyp (LONGINT tag) { OPT_Struct _o_result; - if (tag == 5) { + if (tag == 4) { _o_result = OPT_IntType(OPM_SymRInt()); return _o_result; } else { @@ -1054,20 +1054,20 @@ static void OPT_InStruct (OPT_Struct *typ) } switch (tag) { case 36: - (*typ)->form = 13; + (*typ)->form = 11; (*typ)->size = OPM_PointerSize; (*typ)->n = 0; OPT_InStruct(&(*typ)->BaseTyp); break; case 37: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 2; OPT_InStruct(&(*typ)->BaseTyp); (*typ)->n = OPM_SymRInt(); (*OPT_typSize)(*typ); break; case 38: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 3; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp->comp == 3) { @@ -1078,7 +1078,7 @@ static void OPT_InStruct (OPT_Struct *typ) (*OPT_typSize)(*typ); break; case 39: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 4; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp == OPT_notyp) { @@ -1112,7 +1112,7 @@ static void OPT_InStruct (OPT_Struct *typ) } break; case 40: - (*typ)->form = 14; + (*typ)->form = 12; (*typ)->size = OPM_ProcSize; OPT_InSign(mno, &(*typ)->BaseTyp, &(*typ)->link); break; @@ -1191,7 +1191,7 @@ static OPT_Object OPT_InObj (SHORTINT mno) obj = OPT_NewObj(); obj->mnolev = -mno; obj->vis = 1; - if (tag <= 13) { + if (tag <= 11) { obj->mode = 3; obj->conval = OPT_NewConst(); OPT_InConstant(tag, obj->conval); @@ -1288,7 +1288,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done) obj->scope = OPT_syslink; obj->typ = OPT_notyp; } else { - OPT_impCtxt.nofr = 16; + OPT_impCtxt.nofr = 14; OPT_impCtxt.minr = 255; OPT_impCtxt.nofm = 0; OPT_impCtxt.self = __STRCMP(aliasName, "@self") == 0; @@ -1355,7 +1355,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; OPT_OutHdFld(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -1367,7 +1367,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { OPM_SymWInt(27); OPM_SymWInt(adr); OPT_nofhdfld += 1; @@ -1439,7 +1439,7 @@ static void OPT_OutStr (OPT_Struct typ) OPT_Object strobj = NIL; if (typ->ref < OPT_expCtxt.ref) { OPM_SymWInt(-typ->ref); - if (typ->ref == 5) { + if (typ->ref == 4) { OPM_SymWInt(typ->size); } } else { @@ -1474,15 +1474,15 @@ static void OPT_OutStr (OPT_Struct typ) OPM_SymWInt(typ->sysflag); } switch (typ->form) { - case 13: + case 11: OPM_SymWInt(36); OPT_OutStr(typ->BaseTyp); break; - case 14: + case 12: OPM_SymWInt(40); OPT_OutSign(typ->BaseTyp, typ->link); break; - case 15: + case 13: switch (typ->comp) { case 2: OPM_SymWInt(37); @@ -1537,24 +1537,24 @@ static void OPT_OutConstant (OPT_Object obj) case 2: case 3: OPM_SymWCh((CHAR)obj->conval->intval); break; - case 5: + case 4: OPM_SymWInt(obj->conval->intval); OPM_SymWInt(obj->typ->size); break; - case 9: + case 7: OPM_SymWSet(obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_SymWReal(rval); break; - case 8: + case 6: OPM_SymWLReal(obj->conval->realval); break; - case 10: + case 8: OPT_OutName((void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -1668,7 +1668,7 @@ void OPT_Export (BOOLEAN *ext, BOOLEAN *new) OPM_SymWInt(16); OPT_OutName((void*)OPT_SelfName, 256); OPT_expCtxt.reffp = 0; - OPT_expCtxt.ref = 16; + OPT_expCtxt.ref = 14; OPT_expCtxt.nofm = 1; OPT_expCtxt.locmno[0] = 0; i = 1; @@ -1844,16 +1844,16 @@ export void *OPT__init(void) OPM_errpos = 0; OPT_InitStruct(&OPT_undftyp, 0); OPT_undftyp->BaseTyp = OPT_undftyp; - OPT_InitStruct(&OPT_notyp, 12); - OPT_InitStruct(&OPT_stringtyp, 10); - OPT_InitStruct(&OPT_niltyp, 11); + OPT_InitStruct(&OPT_notyp, 10); + OPT_InitStruct(&OPT_stringtyp, 8); + OPT_InitStruct(&OPT_niltyp, 9); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); - OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp); - OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_PointerSize, &OPT_ainttyp); - OPT_EnterTyp((CHAR*)"INT8", 5, 1, &OPT_int8typ); - OPT_EnterTyp((CHAR*)"INT16", 5, 2, &OPT_int16typ); - OPT_EnterTyp((CHAR*)"INT32", 5, 4, &OPT_int32typ); - OPT_EnterTyp((CHAR*)"INT64", 5, 8, &OPT_int64typ); + OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); + OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp); + OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); + OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); + OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); + OPT_EnterTyp((CHAR*)"INT64", 4, 8, &OPT_int64typ); OPT_EnterProc((CHAR*)"ADR", 20); OPT_EnterProc((CHAR*)"CC", 21); OPT_EnterProc((CHAR*)"LSH", 22); @@ -1871,12 +1871,12 @@ export void *OPT__init(void) OPT_topScope->right = NIL; OPT_EnterTyp((CHAR*)"BOOLEAN", 2, OPM_BoolSize, &OPT_booltyp); OPT_EnterTyp((CHAR*)"CHAR", 3, OPM_CharSize, &OPT_chartyp); - OPT_EnterTyp((CHAR*)"SET", 9, OPM_SetSize, &OPT_settyp); - OPT_EnterTyp((CHAR*)"REAL", 7, OPM_RealSize, &OPT_realtyp); - OPT_EnterTyp((CHAR*)"INTEGER", 5, OPM_IntSize, &OPT_inttyp); - OPT_EnterTyp((CHAR*)"LONGINT", 5, OPM_LIntSize, &OPT_linttyp); - OPT_EnterTyp((CHAR*)"LONGREAL", 8, OPM_LRealSize, &OPT_lrltyp); - OPT_EnterTyp((CHAR*)"SHORTINT", 5, OPM_SIntSize, &OPT_sinttyp); + OPT_EnterTyp((CHAR*)"SET", 7, OPM_SetSize, &OPT_settyp); + OPT_EnterTyp((CHAR*)"REAL", 5, OPM_RealSize, &OPT_realtyp); + OPT_EnterTyp((CHAR*)"INTEGER", 4, OPM_IntSize, &OPT_inttyp); + OPT_EnterTyp((CHAR*)"LONGINT", 4, OPM_LIntSize, &OPT_linttyp); + OPT_EnterTyp((CHAR*)"LONGREAL", 6, OPM_LRealSize, &OPT_lrltyp); + OPT_EnterTyp((CHAR*)"SHORTINT", 4, OPM_SIntSize, &OPT_sinttyp); OPT_EnterBoolConst((CHAR*)"FALSE", 0); OPT_EnterBoolConst((CHAR*)"TRUE", 1); OPT_EnterProc((CHAR*)"HALT", 0); @@ -1904,14 +1904,14 @@ export void *OPT__init(void) OPT_impCtxt.ref[1] = OPT_bytetyp; OPT_impCtxt.ref[2] = OPT_booltyp; OPT_impCtxt.ref[3] = OPT_chartyp; - OPT_impCtxt.ref[5] = OPT_inttyp; - OPT_impCtxt.ref[7] = OPT_realtyp; - OPT_impCtxt.ref[8] = OPT_lrltyp; - OPT_impCtxt.ref[9] = OPT_settyp; - OPT_impCtxt.ref[10] = OPT_stringtyp; - OPT_impCtxt.ref[11] = OPT_niltyp; - OPT_impCtxt.ref[12] = OPT_notyp; - OPT_impCtxt.ref[13] = OPT_sysptrtyp; + OPT_impCtxt.ref[4] = OPT_inttyp; + OPT_impCtxt.ref[5] = OPT_realtyp; + OPT_impCtxt.ref[6] = OPT_lrltyp; + OPT_impCtxt.ref[7] = OPT_settyp; + OPT_impCtxt.ref[8] = OPT_stringtyp; + OPT_impCtxt.ref[9] = OPT_niltyp; + OPT_impCtxt.ref[10] = OPT_notyp; + OPT_impCtxt.ref[11] = OPT_sysptrtyp; OPT_IntTypes[1] = OPT_sinttyp; OPT_IntTypes[2] = OPT_inttyp; OPT_IntTypes[3] = OPT_linttyp; diff --git a/bootstrap/windows-48/OPT.h b/bootstrap/windows-48/OPT.h index 3e352ca3..307b94e2 100644 --- a/bootstrap/windows-48/OPT.h +++ b/bootstrap/windows-48/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/windows-48/OPV.c b/bootstrap/windows-48/OPV.c index 7538f014..df62e985 100644 --- a/bootstrap/windows-48/OPV.c +++ b/bootstrap/windows-48/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "OPC.h" #include "OPM.h" @@ -122,14 +122,14 @@ void OPV_TypSize (OPT_Struct typ) } else if (c == 2) { OPV_TypSize(typ->BaseTyp); typ->size = typ->n * typ->BaseTyp->size; - } else if (f == 13) { + } else if (f == 11) { typ->size = OPM_PointerSize; if (typ->BaseTyp == OPT_undftyp) { OPM_Mark(128, typ->n); } else { OPV_TypSize(typ->BaseTyp); } - } else if (f == 14) { + } else if (f == 12) { typ->size = OPM_ProcSize; } else if (c == 3) { btyp = typ->BaseTyp; @@ -162,7 +162,7 @@ static void OPV_GetTProcNum (OPT_Object obj) oldPos = OPM_errpos; OPM_errpos = obj->scope->adr; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(obj->name, typ->BaseTyp, &redef); @@ -236,7 +236,7 @@ static void OPV_Traverse (OPT_Object obj, OPT_Object outerScope, BOOLEAN exporte if ((mode == 5 && (obj->vis != 0) == exported)) { typ = obj->typ; OPV_TypSize(obj->typ); - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } if (typ->comp == 4) { @@ -348,7 +348,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN case 12: switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -357,7 +357,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 2: - if (form == 9) { + if (form == 7) { _o_result = 3; return _o_result; } else { @@ -370,7 +370,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN return _o_result; break; case 6: - if (form == 9) { + if (form == 7) { _o_result = 2; return _o_result; } else { @@ -379,7 +379,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 7: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -463,7 +463,7 @@ static BOOLEAN OPV_SideEffects (OPT_Node n) static void OPV_Entier (OPT_Node n, INTEGER prec) { - if (__IN(n->typ->form, 0x0180)) { + if (__IN(n->typ->form, 0x60)) { OPM_WriteString((CHAR*)"__ENTIER(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -502,11 +502,11 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) INTEGER from, to; from = n->typ->form; to = newtype->form; - if (to == 9) { + if (to == 7) { OPM_WriteString((CHAR*)"__SETOF(", 9); OPV_Entier(n, -1); OPM_Write(')'); - } else if (to == 5) { + } else if (to == 4) { if ((newtype->size < n->typ->size && __IN(2, OPM_opt))) { OPM_WriteString((CHAR*)"__SHORT", 8); if (OPV_SideEffects(n)) { @@ -541,7 +541,7 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) static void OPV_TypeOf (OPT_Node n) { - if (n->typ->form == 13) { + if (n->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -793,14 +793,14 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } else if (OPV_ansi) { if ((__IN(comp, 0x0c) && n->class == 7)) { OPM_WriteString((CHAR*)"(CHAR*)", 8); - } else if ((((form == 13 && typ != n->typ)) && n->typ != OPT_niltyp)) { + } else if ((((form == 11 && typ != n->typ)) && n->typ != OPT_niltyp)) { OPM_WriteString((CHAR*)"(void*)", 8); } } else { - if ((__IN(form, 0x0180) && n->typ->form == 5)) { + if ((__IN(form, 0x60) && n->typ->form == 4)) { OPM_WriteString((CHAR*)"(double)", 9); prec = 9; - } else if (form == 5) { + } else if (form == 4) { OPV_SizeCast(n->typ->size, typ->size); } } @@ -811,7 +811,7 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } if ((((mode == 2 && n->class == 11)) && n->subcl == 29)) { OPV_expr(n->left, prec); - } else if ((form == 5 && n->class == 7)) { + } else if ((form == 4 && n->class == 7)) { OPV_ParIntLiteral(n->conval->intval, n->typ->size); } else { OPV_expr(n, prec); @@ -860,7 +860,7 @@ static OPT_Object OPV_SuperProc (OPT_Node n) OPT_Object obj = NIL; OPT_Struct typ = NIL; typ = n->right->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(n->left->obj->name, typ->BaseTyp, &obj); @@ -901,7 +901,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); break; case 7: - if (form == 9) { + if (form == 7) { OPM_Write('~'); } else { OPM_Write('-'); @@ -929,7 +929,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 21: if (OPV_SideEffects(l)) { - if (l->typ->form < 7) { + if (l->typ->form < 5) { if (l->typ->size <= 4) { OPM_WriteString((CHAR*)"(int)", 6); } @@ -958,18 +958,18 @@ static void OPV_expr (OPT_Node n, INTEGER prec) if (l->class == 1) { OPC_CompleteIdent(l->obj); } else { - if ((l->typ->form != 10 && !__IN(l->typ->comp, 0x0c))) { + if ((l->typ->form != 8 && !__IN(l->typ->comp, 0x0c))) { OPM_Write('&'); } OPV_expr(l, exprPrec); } break; case 29: - if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x6220) && __IN(l->typ->form, 0x6220))) && n->typ->size == l->typ->size)) { + if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x1890) && __IN(l->typ->form, 0x1890))) && n->typ->size == l->typ->size)) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); - if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) { + if (__IN(n->typ->form, 0x1800) || __IN(l->typ->form, 0x1800)) { OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", 16); } OPV_expr(l, exprPrec); @@ -1079,7 +1079,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 9: case 10: case 11: case 12: case 13: case 14: - if (__IN(l->typ->form, 0x8400)) { + if (__IN(l->typ->form, 0x2100)) { OPM_WriteString((CHAR*)"__STRCMP(", 10); OPV_expr(l, -1); OPM_WriteString((CHAR*)", ", 3); @@ -1091,31 +1091,31 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); OPC_Cmp(subclass); typ = l->typ; - if ((((((typ->form == 13 && r->typ->form != 11)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { + if ((((((typ->form == 11 && r->typ->form != 9)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { OPM_WriteString((CHAR*)"(void *) ", 10); } OPV_expr(r, exprPrec); } break; default: - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write('('); } OPV_expr(l, exprPrec); switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ", 4); } else { OPM_WriteString((CHAR*)" * ", 4); } break; case 2: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" ^ ", 4); } else { OPM_WriteString((CHAR*)" / ", 4); - if (r->obj == NIL || r->obj->typ->form == 5) { + if (r->obj == NIL || r->obj->typ->form == 4) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); @@ -1126,14 +1126,14 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPM_WriteString((CHAR*)" && ", 5); break; case 6: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" | ", 4); } else { OPM_WriteString((CHAR*)" + ", 4); } break; case 7: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ~", 5); } else { OPM_WriteString((CHAR*)" - ", 4); @@ -1149,7 +1149,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; } OPV_expr(r, exprPrec); - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write(')'); } break; @@ -1323,7 +1323,7 @@ static void OPV_NewArr (OPT_Node d, OPT_Node x) if ((base->comp == 4 && OPC_NofPtrs(base) != 0)) { OPC_Ident(base->strobj); OPM_WriteString((CHAR*)"__typ", 6); - } else if (base->form == 13) { + } else if (base->form == 11) { OPM_WriteString((CHAR*)"POINTER__typ", 13); } else { OPM_WriteString((CHAR*)"NIL", 4); @@ -1429,11 +1429,11 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } OPM_Write(')'); } else { - if ((((((l->typ->form == 13 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { + if ((((((l->typ->form == 11 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { l->obj->adr = 0; OPV_design(l, -1); l->obj->adr = 1; - if (r->typ->form != 11) { + if (r->typ->form != 9) { OPM_WriteString((CHAR*)" = (void*)", 11); } else { OPM_WriteString((CHAR*)" = ", 4); @@ -1444,7 +1444,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } if (l->typ == r->typ) { OPV_expr(r, -1); - } else if ((((l->typ->form == 13 && r->typ->form != 11)) && l->typ->strobj != NIL)) { + } else if ((((l->typ->form == 11 && r->typ->form != 9)) && l->typ->strobj != NIL)) { OPM_Write('('); OPC_Ident(l->typ->strobj); OPM_Write(')'); @@ -1629,7 +1629,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } else { if (n->left != NIL) { OPM_WriteString((CHAR*)"_o_result = ", 13); - if ((n->left->typ->form == 13 && n->obj->typ != n->left->typ)) { + if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) { OPM_WriteString((CHAR*)"(void*)", 8); OPV_expr(n->left, 10); } else { diff --git a/bootstrap/windows-48/OPV.h b/bootstrap/windows-48/OPV.h index 0299d34b..06bc39f1 100644 --- a/bootstrap/windows-48/OPV.h +++ b/bootstrap/windows-48/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/windows-48/Platform.c b/bootstrap/windows-48/Platform.c index 60cb401c..c1158d0f 100644 --- a/bootstrap/windows-48/Platform.c +++ b/bootstrap/windows-48/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" typedef diff --git a/bootstrap/windows-48/Platform.h b/bootstrap/windows-48/Platform.h index d0a62b87..7deb4830 100644 --- a/bootstrap/windows-48/Platform.h +++ b/bootstrap/windows-48/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/windows-48/Reals.c b/bootstrap/windows-48/Reals.c index bea1f4aa..28a855aa 100644 --- a/bootstrap/windows-48/Reals.c +++ b/bootstrap/windows-48/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" diff --git a/bootstrap/windows-48/Reals.h b/bootstrap/windows-48/Reals.h index 6eeb5a87..65543fac 100644 --- a/bootstrap/windows-48/Reals.h +++ b/bootstrap/windows-48/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/windows-48/Strings.c b/bootstrap/windows-48/Strings.c index f1d4f53d..834c1fb1 100644 --- a/bootstrap/windows-48/Strings.c +++ b/bootstrap/windows-48/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" diff --git a/bootstrap/windows-48/Strings.h b/bootstrap/windows-48/Strings.h index 43656e74..2edcc736 100644 --- a/bootstrap/windows-48/Strings.h +++ b/bootstrap/windows-48/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/windows-48/Texts.c b/bootstrap/windows-48/Texts.c index bd5d1115..dddea925 100644 --- a/bootstrap/windows-48/Texts.c +++ b/bootstrap/windows-48/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Files.h" #include "Modules.h" diff --git a/bootstrap/windows-48/Texts.h b/bootstrap/windows-48/Texts.h index be79016b..5499c3d0 100644 --- a/bootstrap/windows-48/Texts.h +++ b/bootstrap/windows-48/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/windows-48/Vishap.c b/bootstrap/windows-48/Vishap.c index 7c16c24d..030b94f6 100644 --- a/bootstrap/windows-48/Vishap.c +++ b/bootstrap/windows-48/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkamSf */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkamSf */ #include "SYSTEM.h" #include "Configuration.h" #include "Heap.h" diff --git a/bootstrap/windows-48/errors.c b/bootstrap/windows-48/errors.c index 7a91fc31..3f916fe9 100644 --- a/bootstrap/windows-48/errors.c +++ b/bootstrap/windows-48/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" typedef diff --git a/bootstrap/windows-48/errors.h b/bootstrap/windows-48/errors.h index 4a787a17..2afac320 100644 --- a/bootstrap/windows-48/errors.h +++ b/bootstrap/windows-48/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/windows-48/extTools.c b/bootstrap/windows-48/extTools.c index cfb79ac9..bfab2dc6 100644 --- a/bootstrap/windows-48/extTools.c +++ b/bootstrap/windows-48/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Configuration.h" #include "Console.h" diff --git a/bootstrap/windows-48/extTools.h b/bootstrap/windows-48/extTools.h index fb0797f3..ca635519 100644 --- a/bootstrap/windows-48/extTools.h +++ b/bootstrap/windows-48/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/windows-48/vt100.c b/bootstrap/windows-48/vt100.c index dfe62efa..84707926 100644 --- a/bootstrap/windows-48/vt100.c +++ b/bootstrap/windows-48/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #include "SYSTEM.h" #include "Console.h" #include "Strings.h" diff --git a/bootstrap/windows-48/vt100.h b/bootstrap/windows-48/vt100.h index 73d985c9..6266a678 100644 --- a/bootstrap/windows-48/vt100.h +++ b/bootstrap/windows-48/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef vt100__h #define vt100__h diff --git a/bootstrap/windows-88/Configuration.c b/bootstrap/windows-88/Configuration.c index 5a7e6896..f4abd052 100644 --- a/bootstrap/windows-88/Configuration.c +++ b/bootstrap/windows-88/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" @@ -14,6 +14,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/08/31] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/01] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/windows-88/Configuration.h b/bootstrap/windows-88/Configuration.h index b38a0aa6..c756e930 100644 --- a/bootstrap/windows-88/Configuration.h +++ b/bootstrap/windows-88/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/windows-88/Console.c b/bootstrap/windows-88/Console.c index af2ecbd7..7269d448 100644 --- a/bootstrap/windows-88/Console.c +++ b/bootstrap/windows-88/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Platform.h" diff --git a/bootstrap/windows-88/Console.h b/bootstrap/windows-88/Console.h index 22d598fb..8d9e2fb5 100644 --- a/bootstrap/windows-88/Console.h +++ b/bootstrap/windows-88/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/windows-88/Files.c b/bootstrap/windows-88/Files.c index 4d32ed53..5ec9a8a2 100644 --- a/bootstrap/windows-88/Files.c +++ b/bootstrap/windows-88/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" diff --git a/bootstrap/windows-88/Files.h b/bootstrap/windows-88/Files.h index fa7db0e9..c2853bea 100644 --- a/bootstrap/windows-88/Files.h +++ b/bootstrap/windows-88/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/windows-88/Heap.c b/bootstrap/windows-88/Heap.c index a5063871..5822f690 100644 --- a/bootstrap/windows-88/Heap.c +++ b/bootstrap/windows-88/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/windows-88/Heap.h b/bootstrap/windows-88/Heap.h index eebee23c..5e7c01fb 100644 --- a/bootstrap/windows-88/Heap.h +++ b/bootstrap/windows-88/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tskSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tskSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/windows-88/Modules.c b/bootstrap/windows-88/Modules.c index 5929cd57..004f1f8b 100644 --- a/bootstrap/windows-88/Modules.c +++ b/bootstrap/windows-88/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Console.h" diff --git a/bootstrap/windows-88/Modules.h b/bootstrap/windows-88/Modules.h index 03458258..6f5e4cad 100644 --- a/bootstrap/windows-88/Modules.h +++ b/bootstrap/windows-88/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/windows-88/OPB.c b/bootstrap/windows-88/OPB.c index fef28dff..eacff2d0 100644 --- a/bootstrap/windows-88/OPB.c +++ b/bootstrap/windows-88/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPM.h" @@ -318,7 +318,7 @@ void OPB_DeRef (OPT_Node *x) typ = (*x)->typ; if ((*x)->class >= 7) { OPB_err(78); - } else if (typ->form == 13) { + } else if (typ->form == 11) { if (typ == OPT_sysptrtyp) { OPB_err(57); } @@ -341,7 +341,7 @@ void OPB_Index (OPT_Node *x, OPT_Node y) f = y->typ->form; if ((*x)->class >= 7) { OPB_err(79); - } else if (f != 5 || __IN(y->class, 0x0300)) { + } else if (f != 4 || __IN(y->class, 0x0300)) { OPB_err(80); y->typ = OPT_inttyp; } @@ -438,10 +438,10 @@ void OPB_TypTest (OPT_Node *x, OPT_Object obj, BOOLEAN guard) TypTest__57_s = &_s; if (OPB_NotVar(*x)) { OPB_err(112); - } else if ((*x)->typ->form == 13) { + } else if ((*x)->typ->form == 11) { if (((*x)->typ->BaseTyp->comp != 4 && (*x)->typ != OPT_sysptrtyp)) { OPB_err(85); - } else if (obj->typ->form == 13) { + } else if (obj->typ->form == 11) { GTT__58((*x)->typ->BaseTyp, obj->typ->BaseTyp); } else { OPB_err(86); @@ -466,7 +466,7 @@ void OPB_In (OPT_Node *x, OPT_Node y) f = (*x)->typ->form; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if ((f == 5 && y->typ->form == 9)) { + } else if ((f == 4 && y->typ->form == 7)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (k < 0 || k > (SYSTEM_INT64)OPM_MaxSet) { @@ -505,7 +505,7 @@ static LONGINT OPB_log (LONGINT x) static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) { LONGREAL min, max, r; - if (f == 7) { + if (f == 5) { min = OPM_MinReal; max = OPM_MaxReal; } else { @@ -516,7 +516,7 @@ static void OPB_CheckRealType (INTEGER f, INTEGER nr, OPT_Const x) if (r > max || r < min) { OPB_err(nr); x->realval = (LONGREAL)1; - } else if (f == 7) { + } else if (f == 5) { x->realval = x->realval; } x->intval = -1; @@ -568,21 +568,21 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 6: - if (!__IN(f, 0x01a0)) { + if (!__IN(f, 0x70)) { OPB_err(96); } break; case 7: - if (__IN(f, 0x03a0)) { + if (__IN(f, 0xf0)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-9223372036854775807-1)) { OPB_err(203); } else { z->conval->intval = -z->conval->intval; OPB_SetIntType(z); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { z->conval->realval = -z->conval->realval; } else { z->conval->setval = ~z->conval->setval; @@ -596,9 +596,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 21: - if (__IN(f, 0x01a0)) { + if (__IN(f, 0x70)) { if (z->class == 7) { - if (f == 5) { + if (f == 4) { if (z->conval->intval == (-9223372036854775807-1)) { OPB_err(203); } else { @@ -630,7 +630,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) } break; case 23: - if (f == 5) { + if (f == 4) { if (z->class == 7) { z->conval->intval = OPB_BoolToInt(__ODD(z->conval->intval)); z->obj = NIL; @@ -645,9 +645,9 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) case 24: if ((((z->class == 7 && f == 3)) && z->conval->intval >= 32)) { OPB_CharToString(z); - f = 10; + f = 8; } - if (z->class < 7 || f == 10) { + if (z->class < 7 || f == 8) { z = NewOp__29(op, typ, z); } else { OPB_err(127); @@ -655,7 +655,7 @@ void OPB_MOp (SHORTINT op, OPT_Node *x) z->typ = OPT_linttyp; break; case 25: - if ((f == 5 && z->class == 7)) { + if ((f == 4 && z->class == 7)) { if ((0 <= z->conval->intval && z->conval->intval <= -1)) { z = NewOp__29(op, typ, z); } else { @@ -682,7 +682,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) INTEGER g; OPT_Struct p = NIL, q = NIL, t = NIL; g = y->typ->form; - if (g == 13) { + if (g == 11) { p = x->typ->BaseTyp; q = y->typ->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -700,7 +700,7 @@ static void OPB_CheckPtr (OPT_Node x, OPT_Node y) } else { OPB_err(100); } - } else if (g != 11) { + } else if (g != 9) { OPB_err(100); } } @@ -717,7 +717,7 @@ void OPB_CheckParameters (OPT_Object fp, OPT_Object ap, BOOLEAN checkNames) at = at->BaseTyp; } if (ft != at) { - if ((ft->form == 14 && at->form == 14)) { + if ((ft->form == 12 && at->form == 12)) { if (ft->BaseTyp == at->BaseTyp) { OPB_CheckParameters(ft->link, at->link, 0); } else { @@ -778,7 +778,7 @@ static INTEGER ConstCmp__14 (void) case 0: res = 9; break; - case 1: case 3: case 4: case 5: + case 1: case 3: case 4: if ((*ConstOp__13_s->xval)->intval < (*ConstOp__13_s->yval)->intval) { res = 11; } else if ((*ConstOp__13_s->xval)->intval > (*ConstOp__13_s->yval)->intval) { @@ -787,7 +787,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 7: case 8: + case 5: case 6: if ((*ConstOp__13_s->xval)->realval < (*ConstOp__13_s->yval)->realval) { res = 11; } else if ((*ConstOp__13_s->xval)->realval > (*ConstOp__13_s->yval)->realval) { @@ -803,14 +803,14 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 9: + case 7: if ((*ConstOp__13_s->xval)->setval != (*ConstOp__13_s->yval)->setval) { res = 10; } else { res = 9; } break; - case 10: + case 8: if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) < 0) { res = 11; } else if (__STRCMP(*(*ConstOp__13_s->xval)->ext, *(*ConstOp__13_s->yval)->ext) > 0) { @@ -819,7 +819,7 @@ static INTEGER ConstCmp__14 (void) res = 9; } break; - case 11: case 13: case 14: + case 9: case 11: case 12: if ((*ConstOp__13_s->xval)->intval != (*ConstOp__13_s->yval)->intval) { res = 10; } else { @@ -857,7 +857,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) if (f != g) { switch (f) { case 3: - if (g == 10) { + if (g == 8) { OPB_CharToString(x); } else { OPB_err(100); @@ -865,17 +865,17 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 5: - if (g == 5) { + case 4: + if (g == 4) { if (x->typ->size <= y->typ->size) { x->typ = y->typ; } else { x->typ = OPT_IntType(x->typ->size); } - } else if (g == 7) { + } else if (g == 5) { x->typ = OPT_realtyp; xval->realval = xval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; xval->realval = xval->intval; } else { @@ -884,11 +884,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 7: - if (g == 5) { + case 5: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 8) { + } else if (g == 6) { x->typ = OPT_lrltyp; } else { OPB_err(100); @@ -896,11 +896,11 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 8: - if (g == 5) { + case 6: + if (g == 4) { y->typ = x->typ; yval->realval = yval->intval; - } else if (g == 7) { + } else if (g == 5) { y->typ = OPT_lrltyp; } else { OPB_err(100); @@ -908,26 +908,26 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 10: + case 8: if (g == 3) { OPB_CharToString(y); - g = 10; + g = 8; } else { OPB_err(100); y->typ = x->typ; __GUARDEQP(yval, OPT_ConstDesc) = *xval; } break; - case 11: - if (!__IN(g, 0x6000)) { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; - case 13: + case 11: OPB_CheckPtr(x, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; @@ -941,7 +941,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } switch (op) { case 1: - if (f == 5) { + if (f == 4) { xv = xval->intval; yv = yval->intval; if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807-1))) && yv != (-9223372036854775807-1))) && -xv <= __DIV(9223372036854775807, -yv))) { @@ -950,7 +950,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) <= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 / (LONGREAL)__ABS(yval->realval)) { xval->realval = xval->realval * yval->realval; @@ -958,23 +958,23 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(204); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & yval->setval); } else if (f != 0) { OPB_err(101); } break; case 2: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->realval = xval->intval / (REAL)yval->intval; - OPB_CheckRealType(7, 205, xval); + OPB_CheckRealType(5, 205, xval); } else { OPB_err(205); xval->realval = (LONGREAL)1; } x->typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = __ABS(yval->realval) >= (LONGREAL)1; if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 * __ABS(yval->realval)) { xval->realval = xval->realval / yval->realval; @@ -982,14 +982,14 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(205); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval ^ yval->setval; } else if (f != 0) { OPB_err(102); } break; case 3: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = __DIV(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1001,7 +1001,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (yval->intval != 0) { xval->intval = __MOD(xval->intval, yval->intval); OPB_SetIntType(x); @@ -1020,7 +1020,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } break; case 6: - if (f == 5) { + if (f == 4) { temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807 - yval->intval); if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807-1) - yval->intval)) { xval->intval += yval->intval; @@ -1028,7 +1028,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 - yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 - yval->realval)) { xval->realval = xval->realval + yval->realval; @@ -1036,21 +1036,21 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(206); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = xval->setval | yval->setval; } else if (f != 0) { OPB_err(105); } break; case 7: - if (f == 5) { + if (f == 4) { if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807 + yval->intval)) { xval->intval -= yval->intval; OPB_SetIntType(x); } else { OPB_err(207); } - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { temp = (yval->realval >= (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 + yval->realval); if (temp || (yval->realval < (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 + yval->realval)) { xval->realval = xval->realval - yval->realval; @@ -1058,7 +1058,7 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) } else { OPB_err(207); } - } else if (f == 9) { + } else if (f == 7) { xval->setval = (xval->setval & ~yval->setval); } else if (f != 0) { OPB_err(106); @@ -1078,28 +1078,28 @@ static void OPB_ConstOp (INTEGER op, OPT_Node x, OPT_Node y) xval->intval = OPB_BoolToInt(ConstCmp__14() != 9); break; case 11: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 11); } break; case 12: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 13); } break; case 13: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() == 13); } break; case 14: - if (__IN(f, 0x2a04)) { + if (__IN(f, 0x0a84)) { OPB_err(108); } else { xval->intval = OPB_BoolToInt(ConstCmp__14() != 11); @@ -1123,8 +1123,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) f = (*x)->typ->form; g = typ->form; if ((*x)->class == 7) { - if (f == 5) { - if (g == 5) { + if (f == 4) { + if (g == 4) { if (f > g) { OPB_SetIntType(*x); if ((*x)->typ->size > typ->size) { @@ -1132,7 +1132,7 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) (*x)->conval->intval = 1; } } - } else if (__IN(g, 0x0180)) { + } else if (__IN(g, 0x60)) { (*x)->conval->realval = (*x)->conval->intval; (*x)->conval->intval = -1; } else { @@ -1141,8 +1141,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ) OPB_err(220); } } - } else if (__IN(f, 0x0180)) { - if (__IN(g, 0x0180)) { + } else if (__IN(f, 0x60)) { + if (__IN(g, 0x60)) { OPB_CheckRealType(g, 203, (*x)->conval); } else { r = (*x)->conval->realval; @@ -1191,25 +1191,25 @@ static BOOLEAN strings__41 (OPT_Node *x, OPT_Node *y) { BOOLEAN _o_result; BOOLEAN ok, xCharArr, yCharArr; - xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 10; - yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 10; + xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 8; + yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 8; if ((((xCharArr && *Op__38_s->g == 3)) && (*y)->class == 7)) { OPB_CharToString(*y); - *Op__38_s->g = 10; + *Op__38_s->g = 8; yCharArr = 1; } if ((((yCharArr && *Op__38_s->f == 3)) && (*x)->class == 7)) { OPB_CharToString(*x); - *Op__38_s->f = 10; + *Op__38_s->f = 8; xCharArr = 1; } ok = (xCharArr && yCharArr); if (ok) { - if ((*Op__38_s->f == 10 && (*x)->conval->intval2 == 1)) { + if ((*Op__38_s->f == 8 && (*x)->conval->intval2 == 1)) { (*x)->typ = OPT_chartyp; (*x)->conval->intval = 0; OPB_Index(&*y, OPB_NewIntConst(0)); - } else if ((*Op__38_s->g == 10 && (*y)->conval->intval2 == 1)) { + } else if ((*Op__38_s->g == 8 && (*y)->conval->intval2 == 1)) { (*y)->typ = OPT_chartyp; (*y)->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); @@ -1248,49 +1248,49 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) OPB_err(100); } break; + case 4: + if ((g == 4 && y->typ->size < z->typ->size)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x70)) { + OPB_Convert(&z, y->typ); + } else { + OPB_err(100); + } + break; case 5: - if ((g == 5 && y->typ->size < z->typ->size)) { + if (g == 4) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x01a0)) { + } else if (__IN(g, 0x60)) { OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 7: - if (g == 5) { + case 6: + if (__IN(g, 0x70)) { + OPB_Convert(&y, z->typ); + } else if (__IN(g, 0x60)) { OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&z, y->typ); } else { OPB_err(100); } break; - case 8: - if (__IN(g, 0x01a0)) { - OPB_Convert(&y, z->typ); - } else if (__IN(g, 0x0180)) { - OPB_Convert(&y, z->typ); - } else { + case 9: + if (!__IN(g, 0x1800)) { OPB_err(100); } break; case 11: - if (!__IN(g, 0x6000)) { - OPB_err(100); - } - break; - case 13: OPB_CheckPtr(z, y); break; - case 14: - if (g != 11) { + case 12: + if (g != 9) { OPB_err(100); } break; - case 10: + case 8: break; - case 15: + case 13: if (z->typ->comp == 4) { OPB_err(100); } @@ -1306,7 +1306,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) switch (op) { case 1: do_ = 1; - if (f == 5) { + if (f == 4) { if (z->class == 7) { val = z->conval->intval; if (val == 1) { @@ -1337,7 +1337,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) y->obj = NIL; } } - } else if (!__IN(f, 0x0381)) { + } else if (!__IN(f, 0xe1)) { OPB_err(105); typ = OPT_undftyp; } @@ -1346,18 +1346,18 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 2: - if (f == 5) { + if (f == 4) { if ((y->class == 7 && y->conval->intval == 0)) { OPB_err(205); } OPB_Convert(&z, OPT_realtyp); OPB_Convert(&y, OPT_realtyp); typ = OPT_realtyp; - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { if ((y->class == 7 && y->conval->realval == (LONGREAL)0)) { OPB_err(205); } - } else if ((f != 9 && f != 0)) { + } else if ((f != 7 && f != 0)) { OPB_err(102); typ = OPT_undftyp; } @@ -1365,7 +1365,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) break; case 3: do_ = 1; - if (f == 5) { + if (f == 4) { if (y->class == 7) { val = y->conval->intval; if (val == 0) { @@ -1388,7 +1388,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 4: - if (f == 5) { + if (f == 4) { if (y->class == 7) { if (y->conval->intval == 0) { OPB_err(205); @@ -1420,12 +1420,12 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 6: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(105); typ = OPT_undftyp; } do_ = 1; - if (f == 5) { + if (f == 4) { if ((z->class == 7 && z->conval->intval == 0)) { do_ = 0; z = y; @@ -1439,11 +1439,11 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 7: - if (!__IN(f, 0x03e1)) { + if (!__IN(f, 0xf1)) { OPB_err(106); typ = OPT_undftyp; } - if ((f != 5 || y->class != 7) || y->conval->intval != 0) { + if ((f != 4 || y->class != 7) || y->conval->intval != 0) { NewOp__39(op, typ, &z, y); } break; @@ -1463,7 +1463,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) } break; case 9: case 10: - if (__IN(f, 0x6bff) || strings__41(&z, &y)) { + if (__IN(f, 0x1aff) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPB_err(107); @@ -1472,7 +1472,7 @@ void OPB_Op (SHORTINT op, OPT_Node *x, OPT_Node y) NewOp__39(op, typ, &z, y); break; case 11: case 12: case 13: case 14: - if (__IN(f, 0x01f9) || strings__41(&z, &y)) { + if (__IN(f, 0x79) || strings__41(&z, &y)) { typ = OPT_booltyp; } else { OPM_LogWLn(); @@ -1499,7 +1499,7 @@ void OPB_SetRange (OPT_Node *x, OPT_Node y) LONGINT k, l; if ((((*x)->class == 8 || (*x)->class == 9) || y->class == 8) || y->class == 9) { OPB_err(126); - } else if (((*x)->typ->form == 5 && y->typ->form == 5)) { + } else if (((*x)->typ->form == 4 && y->typ->form == 4)) { if ((*x)->class == 7) { k = (*x)->conval->intval; if (0 > k || k > (SYSTEM_INT64)OPM_MaxSet) { @@ -1534,7 +1534,7 @@ void OPB_SetElem (OPT_Node *x) LONGINT k; if ((*x)->class == 8 || (*x)->class == 9) { OPB_err(126); - } else if ((*x)->typ->form != 5) { + } else if ((*x)->typ->form != 4) { OPB_err(93); } else if ((*x)->class == 7) { k = (*x)->conval->intval; @@ -1577,40 +1577,40 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWNum(ynode->typ->size, 0); OPM_LogWLn(); } - if (ynode->class == 8 || (ynode->class == 9 && f != 14)) { + if (ynode->class == 8 || (ynode->class == 9 && f != 12)) { OPB_err(126); } switch (f) { - case 0: case 10: + case 0: case 8: break; case 1: - if (!((__IN(g, 0x2a) && y->size == 1))) { + if (!((__IN(g, 0x1a) && y->size == 1))) { OPB_err(113); } break; - case 2: case 3: case 9: + case 2: case 3: case 7: if (g != f) { OPB_err(113); } break; + case 4: + if (g != 4 || x->size < y->size) { + OPB_err(113); + } + break; case 5: - if (g != 5 || x->size < y->size) { + if (!__IN(g, 0x30)) { OPB_err(113); } break; - case 7: - if (!__IN(g, 0xe0)) { + case 6: + if (!__IN(g, 0x70)) { OPB_err(113); } break; - case 8: - if (!__IN(g, 0x01e0)) { - OPB_err(113); - } - break; - case 13: - if ((x == y || g == 11) || (x == OPT_sysptrtyp && g == 13)) { - } else if (g == 13) { + case 11: + if ((x == y || g == 9) || (x == OPT_sysptrtyp && g == 11)) { + } else if (g == 11) { p = x->BaseTyp; q = y->BaseTyp; if ((p->comp == 4 && q->comp == 4)) { @@ -1627,28 +1627,28 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPB_err(113); } break; - case 14: + case 12: if (ynode->class == 9) { OPB_CheckProc(x, ynode->obj); - } else if (x == y || g == 11) { + } else if (x == y || g == 9) { } else { OPB_err(113); } break; - case 12: case 11: + case 10: case 9: OPB_err(113); break; - case 15: + case 13: x->pvused = 1; if (x->comp == 2) { if ((ynode->class == 7 && g == 3)) { OPB_CharToString(ynode); y = ynode->typ; - g = 10; + g = 8; } if (x == y) { } else if (x->BaseTyp == OPT_chartyp) { - if (g == 10) { + if (g == 8) { if (ynode->conval->intval2 > x->n) { OPB_err(114); } @@ -1687,7 +1687,7 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode) OPM_LogWLn(); break; } - if ((((((ynode->class == 7 && g < f)) && __IN(g, 0xe0))) && __IN(f, 0x01e0))) { + if ((((((ynode->class == 7 && g < f)) && __IN(g, 0x30))) && __IN(f, 0x70))) { OPB_Convert(&ynode, x); } } @@ -1705,7 +1705,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) f = x->typ->form; switch (fctno) { case 0: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); } else { @@ -1720,7 +1720,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) typ = OPT_notyp; if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { if (x->readonly) { OPB_err(76); } @@ -1758,7 +1758,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 5: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x0180)) { + } else if (__IN(f, 0x60)) { OPB_Convert(&x, OPT_linttyp); } else { OPB_err(111); @@ -1778,17 +1778,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(0); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMinimum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(0); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MinReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MinLReal, OPT_lrltyp); break; default: @@ -1809,17 +1809,17 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) x = OPB_NewIntConst(255); x->typ = OPT_chartyp; break; - case 5: + case 4: x = OPB_NewIntConst(OPM_SignedMaximum(x->typ->size)); break; - case 9: + case 7: x = OPB_NewIntConst(OPM_MaxSet); x->typ = OPT_inttyp; break; - case 7: + case 5: x = OPB_NewRealConst(OPM_MaxReal, OPT_realtyp); break; - case 8: + case 6: x = OPB_NewRealConst(OPM_MaxLReal, OPT_lrltyp); break; default: @@ -1833,7 +1833,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 9: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x21)) { + } else if (__IN(f, 0x11)) { OPB_Convert(&x, OPT_chartyp); } else { OPB_err(111); @@ -1843,14 +1843,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 10: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, -1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 8) { + } else if (f == 6) { OPB_Convert(&x, OPT_realtyp); } else { OPB_err(111); @@ -1859,14 +1859,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 11: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { typ = OPT_ShorterOrLongerType(x->typ, 1); if (typ == NIL) { OPB_err(111); } else { OPB_Convert(&x, typ); } - } else if (f == 7) { + } else if (f == 5) { OPB_Convert(&x, OPT_lrltyp); } else if (f == 3) { OPB_Convert(&x, OPT_linttyp); @@ -1877,7 +1877,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 13: case 14: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else if (x->readonly) { OPB_err(76); @@ -1901,18 +1901,18 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 18: if ((x->class == 7 && f == 3)) { OPB_CharToString(x); - f = 10; + f = 8; } if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 10)) { + } else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 8)) { OPB_err(111); } break; case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if (x->typ->size != (SYSTEM_INT64)OPM_LIntSize) { OPB_Convert(&x, OPT_linttyp); } @@ -1929,7 +1929,7 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) if (x->class != 8) { OPB_err(110); x = OPB_NewIntConst(1); - } else if (__IN(f, 0x63fe) || __IN(x->typ->comp, 0x14)) { + } else if (__IN(f, 0x18fe) || __IN(x->typ->comp, 0x14)) { (*OPB_typSize)(x->typ); x->typ->pvused = 1; x = OPB_NewIntConst(x->typ->size); @@ -1944,22 +1944,22 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (!__IN(f, 0x022a)) { + } else if (!__IN(f, 0x9a)) { OPB_err(111); } break; case 24: case 25: case 28: case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == (SYSTEM_INT64)OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == (SYSTEM_INT64)OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } break; case 26: case 27: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if (x->conval->intval < 0 || x->conval->intval > -1) { OPB_err(220); } @@ -1970,14 +1970,14 @@ void OPB_StPar0 (OPT_Node *par0, INTEGER fctno) case 29: if (x->class != 8) { OPB_err(110); - } else if (__IN(f, 0x1401) || x->typ->comp == 3) { + } else if (__IN(f, 0x0501) || x->typ->comp == 3) { OPB_err(111); } break; case 30: if (OPB_NotVar(x)) { OPB_err(112); - } else if (f == 13) { + } else if (f == 11) { } else { OPB_err(111); } @@ -2037,7 +2037,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; } else { if (x->typ != p->typ) { - if ((x->class == 7 && f == 5)) { + if ((x->class == 7 && f == 4)) { OPB_Convert(&x, p->typ); } else { OPB_err(111); @@ -2050,7 +2050,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 15: case 16: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (0 > x->conval->intval || x->conval->intval > (SYSTEM_INT64)OPM_MaxSet))) { OPB_err(202); } @@ -2061,7 +2061,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_notyp; break; case 17: - if (!(f == 5) || x->class != 7) { + if (!(f == 4) || x->class != 7) { OPB_err(69); } else if (x->typ->size == 1) { L = (SYSTEM_INT32)x->conval->intval; @@ -2110,7 +2110,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 19: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { if ((p->class == 7 && x->class == 7)) { if (-OPB_maxExp > x->conval->intval || x->conval->intval > OPB_maxExp) { OPB_err(208); @@ -2138,7 +2138,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) if (x->class == 8 || x->class == 9) { OPB_err(126); } else if (p->typ->comp == 3) { - if (f == 5) { + if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2154,7 +2154,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 22: case 23: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f != 5) { + } else if (f != 4) { OPB_err(111); } else { if (fctno == 22) { @@ -2168,7 +2168,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 24: case 25: case 26: case 27: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (__IN(f, 0x63ff)) { + } else if (__IN(f, 0x18ff)) { if (fctno == 24 || fctno == 26) { if (OPB_NotVar(x)) { OPB_err(112); @@ -2186,7 +2186,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 28: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(12, 26, p, x); } else { OPB_err(111); @@ -2194,7 +2194,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) p->typ = OPT_booltyp; break; case 29: - if (((x->class == 8 || x->class == 9) || __IN(f, 0x1401)) || x->typ->comp == 3) { + if (((x->class == 8 || x->class == 9) || __IN(f, 0x0501)) || x->typ->comp == 3) { OPB_err(126); } if (x->typ->size < p->typ->size) { @@ -2210,7 +2210,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 30: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { p = NewOp__53(19, 30, p, x); } else { OPB_err(111); @@ -2220,16 +2220,16 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, SHORTINT fctno) case 31: if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if ((((x->class == 7 && f == 5)) && x->typ->size < OPT_linttyp->size)) { + } else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) { OPB_Convert(&x, OPT_linttyp); - } else if (!((__IN(x->typ->form, 0x2020) && x->typ->size == (SYSTEM_INT64)OPM_PointerSize))) { + } else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == (SYSTEM_INT64)OPM_PointerSize))) { OPB_err(111); x->typ = OPT_linttyp; } p->link = x; break; case 32: - if ((f == 5 && x->class == 7)) { + if ((f == 4 && x->class == 7)) { if ((0 <= x->conval->intval && x->conval->intval <= 255)) { OPB_BindNodes(28, OPT_notyp, &x, x); x->conval = OPT_NewConst(); @@ -2272,7 +2272,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) OPB_err(126); } else if (p->typ->comp != 3) { OPB_err(64); - } else if (f == 5) { + } else if (f == 4) { if ((x->class == 7 && (x->conval->intval <= 0 || x->conval->intval > OPM_MaxIndex))) { OPB_err(63); } @@ -2288,7 +2288,7 @@ void OPB_StParN (OPT_Node *par0, OPT_Node x, INTEGER fctno, INTEGER n) } else if ((fctno == 31 && n == 2)) { if (x->class == 8 || x->class == 9) { OPB_err(126); - } else if (f == 5) { + } else if (f == 4) { node = OPT_NewNode(19); node->subcl = 31; node->right = p; @@ -2376,7 +2376,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((fvarpar && ftyp == OPT_bytetyp)) { - if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x2e) && atyp->size == 1))) { + if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x1e) && atyp->size == 1))) { if (__IN(18, OPM_opt)) { OPB_err(-301); } @@ -2385,7 +2385,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa if (ftyp->comp == 3) { OPB_DynArrParCheck(ftyp, atyp, fvarpar); } else if (ftyp != atyp) { - if ((((!fvarpar && ftyp->form == 13)) && atyp->form == 13)) { + if ((((!fvarpar && ftyp->form == 11)) && atyp->form == 11)) { ftyp = ftyp->BaseTyp; atyp = atyp->BaseTyp; if ((ftyp->comp == 4 && atyp->comp == 4)) { @@ -2409,7 +2409,7 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa static void OPB_CheckReceiver (OPT_Node *x, OPT_Object fp) { - if (fp->typ->form == 13) { + if (fp->typ->form == 11) { if ((*x)->class == 3) { *x = (*x)->left; } else { @@ -2426,7 +2426,7 @@ void OPB_PrepCall (OPT_Node *x, OPT_Object *fpar) OPB_CheckReceiver(&(*x)->left, *fpar); *fpar = (*fpar)->link; } - } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 14)) { + } else if (((((*x)->class != 8 && (*x)->typ != NIL)) && (*x)->typ->form == 12)) { *fpar = (*x)->typ->link; } else { OPB_err(121); @@ -2458,17 +2458,17 @@ void OPB_Param (OPT_Node ap, OPT_Object fp) if (q == NIL) { OPB_err(111); } - } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 13)) { - } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x2e) && ap->typ->size == 1)))))) { + } else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 11)) { + } else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x1e) && ap->typ->size == 1)))))) { OPB_err(123); - } else if ((fp->typ->form == 13 && ap->class == 5)) { + } else if ((fp->typ->form == 11 && ap->class == 5)) { OPB_err(123); } } else if (fp->typ->comp == 3) { if ((ap->class == 7 && ap->typ->form == 3)) { OPB_CharToString(ap); } - if ((ap->typ->form == 10 && fp->typ->BaseTyp->form == 3)) { + if ((ap->typ->form == 8 && fp->typ->BaseTyp->form == 3)) { } else if (ap->class >= 7) { OPB_err(59); } else { @@ -2576,7 +2576,7 @@ void OPB_Assign (OPT_Node *x, OPT_Node y) OPB_BindNodes(6, (*x)->typ, &z, NIL); *x = z; } - } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 10)) && y->conval->intval2 == 1)) { + } else if (((((((*x)->typ->comp == 2 && (*x)->typ->BaseTyp == OPT_chartyp)) && y->typ->form == 8)) && y->conval->intval2 == 1)) { y->typ = OPT_chartyp; y->conval->intval = 0; OPB_Index(&*x, OPB_NewIntConst(0)); diff --git a/bootstrap/windows-88/OPB.h b/bootstrap/windows-88/OPB.h index 0b71f987..7b980a10 100644 --- a/bootstrap/windows-88/OPB.h +++ b/bootstrap/windows-88/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/windows-88/OPC.c b/bootstrap/windows-88/OPC.c index b8a0608e..ad70616c 100644 --- a/bootstrap/windows-88/OPC.c +++ b/bootstrap/windows-88/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" @@ -228,12 +228,12 @@ static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause) if (__IN(typ->comp, 0x0c)) { OPC_Stars(typ->BaseTyp, &*openClause); *openClause = typ->comp == 2; - } else if (typ->form == 14) { + } else if (typ->form == 12) { OPM_Write('('); OPM_Write('*'); } else { pointers = 0; - while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 13)) { + while (((typ->strobj == NIL || typ->strobj->name[0] == 0x00) && typ->form == 11)) { pointers += 1; typ = typ->BaseTyp; } @@ -278,16 +278,16 @@ static void OPC_DeclareObj (OPT_Object dcl, BOOLEAN scopeDef) for (;;) { form = typ->form; comp = typ->comp; - if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 12) || comp == 4) { + if (((typ->strobj != NIL && typ->strobj->name[0] != 0x00) || form == 10) || comp == 4) { break; - } else if ((form == 13 && typ->BaseTyp->comp != 3)) { + } else if ((form == 11 && typ->BaseTyp->comp != 3)) { openClause = 1; - } else if (form == 14 || __IN(comp, 0x0c)) { + } else if (form == 12 || __IN(comp, 0x0c)) { if (openClause) { OPM_Write(')'); openClause = 0; } - if (form == 14) { + if (form == 12) { if (OPC_ansi) { OPM_Write(')'); OPC_AnsiParamList(typ->link, 0); @@ -332,19 +332,19 @@ static void OPC_DeclareBase (OPT_Object dcl) LONGINT off, n, dummy; typ = dcl->typ; prev = typ; - while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 12)) && !((typ->form == 13 && typ->BaseTyp->comp == 3)))) { + while ((((((((typ->strobj == NIL || typ->comp == 3) || OPC_Undefined(typ->strobj)) && typ->comp != 4)) && typ->form != 10)) && !((typ->form == 11 && typ->BaseTyp->comp == 3)))) { prev = typ; typ = typ->BaseTyp; } obj = typ->strobj; - if (typ->form == 12) { + if (typ->form == 10) { OPM_WriteString((CHAR*)"void", 5); } else if ((obj != NIL && !OPC_Undefined(obj))) { OPC_Ident(obj); } else if (typ->comp == 4) { OPM_WriteString((CHAR*)"struct ", 8); OPC_Andent(typ); - if ((prev->form != 13 && (obj != NIL || dcl->name[0] == 0x00))) { + if ((prev->form != 11 && (obj != NIL || dcl->name[0] == 0x00))) { if ((typ->BaseTyp != NIL && typ->BaseTyp->strobj->vis != 0)) { OPM_WriteString((CHAR*)" { /* ", 7); OPC_Ident(typ->BaseTyp->strobj); @@ -358,7 +358,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_FieldList(typ, 1, &off, &n, &dummy); OPC_EndBlk0(); } - } else if ((typ->form == 13 && typ->BaseTyp->comp == 3)) { + } else if ((typ->form == 11 && typ->BaseTyp->comp == 3)) { typ = typ->BaseTyp->BaseTyp; nofdims = 1; while (typ->comp == 3) { @@ -373,7 +373,7 @@ static void OPC_DeclareBase (OPT_Object dcl) OPC_BegStat(); __NEW(obj, OPT_ObjDesc); __NEW(obj->typ, OPT_StrDesc); - obj->typ->form = 15; + obj->typ->form = 13; obj->typ->comp = 2; obj->typ->n = 1; obj->typ->BaseTyp = typ; @@ -394,7 +394,7 @@ LONGINT OPC_NofPtrs (OPT_Struct typ) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { _o_result = 1; return _o_result; } else if ((typ->comp == 4 && __MASK(typ->sysflag, -256) == 0)) { @@ -436,7 +436,7 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, LONGINT adr, LONGINT *cnt) OPT_Object fld = NIL; OPT_Struct btyp = NIL; LONGINT n, i; - if ((typ->form == 13 && typ->sysflag == 0)) { + if ((typ->form == 11 && typ->sysflag == 0)) { OPM_WriteInt(adr); OPM_WriteString((CHAR*)", ", 3); *cnt += 1; @@ -541,7 +541,7 @@ static void OPC_DeclareParams (OPT_Object par, BOOLEAN macro) if (macro) { OPM_WriteStringVar((void*)par->name, 256); } else { - if ((par->mode == 1 && par->typ->form == 7)) { + if ((par->mode == 1 && par->typ->form == 5)) { OPM_Write('_'); } OPC_Ident(par); @@ -613,7 +613,7 @@ OPT_Object OPC_BaseTProc (OPT_Object obj) OPT_Struct typ = NIL, base = NIL; LONGINT mno; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } base = typ->BaseTyp; @@ -636,7 +636,7 @@ static void OPC_DefineTProcMacros (OPT_Object obj, BOOLEAN *empty) OPC_Ident(obj); OPC_DeclareParams(obj->link, 1); OPM_WriteString((CHAR*)" __SEND(", 9); - if (obj->link->typ->form == 13) { + if (obj->link->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPC_Ident(obj->link); OPM_Write(')'); @@ -674,7 +674,7 @@ static void OPC_DefineType (OPT_Struct str) if (obj == NIL || OPC_Undefined(obj)) { if (obj != NIL) { if (obj->linkadr == 1) { - if (str->form != 13) { + if (str->form != 11) { OPM_Mark(244, str->txtpos); obj->linkadr = 2; } @@ -693,13 +693,13 @@ static void OPC_DefineType (OPT_Struct str) } field = field->link; } - } else if (str->form == 13) { + } else if (str->form == 11) { if (str->BaseTyp->comp != 4) { OPC_DefineType(str->BaseTyp); } } else if (__IN(str->comp, 0x0c)) { OPC_DefineType(str->BaseTyp); - } else if (str->form == 14) { + } else if (str->form == 12) { if (str->BaseTyp != OPT_notyp) { OPC_DefineType(str->BaseTyp); } @@ -890,7 +890,7 @@ LONGINT OPC_BaseAlignment (OPT_Struct typ) { LONGINT _o_result; LONGINT alignment; - if (typ->form == 15) { + if (typ->form == 13) { if (typ->comp == 4) { alignment = __MASK(typ->align, -65536); } else { @@ -1018,7 +1018,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_WriteString((CHAR*)"export ", 8); } } - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_WriteString((CHAR*)"double", 7); } else { OPC_DeclareBase(obj); @@ -1027,7 +1027,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPM_Write(','); } OPM_Write(' '); - if ((((vis == 2 && obj->mode == 1)) && base->form == 7)) { + if ((((vis == 2 && obj->mode == 1)) && base->form == 5)) { OPM_Write('_'); } OPC_DeclareObj(obj, vis == 3); @@ -1044,7 +1044,7 @@ static void OPC_IdentList (OPT_Object obj, INTEGER vis) OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; - } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 13)) { + } else if ((((((OPC_ptrinit && vis == 0)) && obj->mnolev > 0)) && obj->typ->form == 11)) { OPM_WriteString((CHAR*)" = NIL", 7); } } @@ -1381,7 +1381,7 @@ void OPC_GenEnumPtrs (OPT_Object var) OPC_BegBlk(); } OPC_BegStat(); - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"P(", 3); OPC_Ident(var); OPM_Write(')'); @@ -1400,7 +1400,7 @@ void OPC_GenEnumPtrs (OPT_Object var) n = n * typ->n; typ = typ->BaseTyp; } - if (typ->form == 13) { + if (typ->form == 11) { OPM_WriteString((CHAR*)"__ENUMP(", 9); OPC_Ident(var); OPC_Str1((CHAR*)", #, P)", 8, n); @@ -1563,7 +1563,7 @@ void OPC_EnterProc (OPT_Object proc) if (!OPC_ansi) { var = proc->link; while (var != NIL) { - if ((var->typ->form == 7 && var->mode == 1)) { + if ((var->typ->form == 5 && var->mode == 1)) { OPC_BegStat(); OPC_Ident(var->typ->strobj); OPM_Write(' '); @@ -1879,7 +1879,7 @@ void OPC_Case (LONGINT caseVal, INTEGER form) case 3: OPC_CharacterLiteral(caseVal); break; - case 5: + case 4: OPM_WriteInt(caseVal); break; default: @@ -1977,16 +1977,16 @@ void OPC_Constant (OPT_Const con, INTEGER form) case 3: OPC_CharacterLiteral(con->intval); break; - case 5: + case 4: OPM_WriteInt(con->intval); break; - case 7: + case 5: OPM_WriteReal(con->realval, 'f'); break; - case 8: + case 6: OPM_WriteReal(con->realval, 0x00); break; - case 9: + case 7: OPM_WriteString((CHAR*)"0x", 3); skipLeading = 1; s = con->setval; @@ -2009,10 +2009,10 @@ void OPC_Constant (OPT_Const con, INTEGER form) OPM_Write('0'); } break; - case 10: + case 8: OPC_StringLiteral(*con->ext, 256, con->intval2 - 1); break; - case 11: + case 9: OPM_WriteString((CHAR*)"NIL", 4); break; default: diff --git a/bootstrap/windows-88/OPC.h b/bootstrap/windows-88/OPC.h index 21b48db8..bb250e9a 100644 --- a/bootstrap/windows-88/OPC.h +++ b/bootstrap/windows-88/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/windows-88/OPM.c b/bootstrap/windows-88/OPM.c index 450ed83d..228e7978 100644 --- a/bootstrap/windows-88/OPM.c +++ b/bootstrap/windows-88/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" diff --git a/bootstrap/windows-88/OPM.h b/bootstrap/windows-88/OPM.h index 5363c227..6bbab25d 100644 --- a/bootstrap/windows-88/OPM.h +++ b/bootstrap/windows-88/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/windows-88/OPP.c b/bootstrap/windows-88/OPP.c index becc2507..9337c539 100644 --- a/bootstrap/windows-88/OPP.c +++ b/bootstrap/windows-88/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPB.h" @@ -137,7 +137,7 @@ static void OPP_CheckSysFlag (INTEGER *sysflag, INTEGER default_) OPP_err(135); } OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { sf = x->conval->intval; if (sf < 0 || sf > 1) { OPP_err(220); @@ -159,7 +159,7 @@ static void OPP_RecordType (OPT_Struct *typ, OPT_Struct *banned) OPT_Object fld = NIL, first = NIL, last = NIL, base = NIL; OPT_Struct ftyp = NIL; INTEGER sysflag; - *typ = OPT_NewStr(15, 4); + *typ = OPT_NewStr(13, 4); (*typ)->BaseTyp = NIL; OPP_CheckSysFlag(&sysflag, -1); if (OPP_sym == 30) { @@ -254,7 +254,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) INTEGER sysflag; OPP_CheckSysFlag(&sysflag, 0); if (OPP_sym == 25) { - *typ = OPT_NewStr(15, 3); + *typ = OPT_NewStr(13, 3); (*typ)->mno = 0; (*typ)->sysflag = sysflag; OPS_Get(&OPP_sym); @@ -266,10 +266,10 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) (*typ)->n = 0; } } else { - *typ = OPT_NewStr(15, 2); + *typ = OPT_NewStr(13, 2); (*typ)->sysflag = sysflag; OPP_ConstExpression(&x); - if (x->typ->form == 5) { + if (x->typ->form == 4) { n = x->conval->intval; if (n <= 0 || n > OPM_MaxIndex) { OPP_err(63); @@ -302,7 +302,7 @@ static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned) static void OPP_PointerType (OPT_Struct *typ) { OPT_Object id = NIL; - *typ = OPT_NewStr(13, 1); + *typ = OPT_NewStr(11, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); OPP_CheckSym(28); if (OPP_sym == 38) { @@ -410,7 +410,7 @@ static void OPP_FormalParameters (OPT_Object *firstPar, OPT_Struct *resTyp) if (OPP_sym == 38) { OPP_qualident(&res); if (res->mode == 5) { - if (res->typ->form < 15) { + if (res->typ->form < 13) { *resTyp = res->typ; } else { OPP_err(54); @@ -460,7 +460,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) OPP_PointerType(&*typ); } else if (OPP_sym == 61) { OPS_Get(&OPP_sym); - *typ = OPT_NewStr(14, 1); + *typ = OPT_NewStr(12, 1); OPP_CheckSysFlag(&(*typ)->sysflag, 0); if (OPP_sym == 30) { OPS_Get(&OPP_sym); @@ -489,7 +489,7 @@ static void OPP_TypeDecl (OPT_Struct *typ, OPT_Struct *banned) static void OPP_Type (OPT_Struct *typ, OPT_Struct *banned) { OPP_TypeDecl(&*typ, &*banned); - if (((((*typ)->form == 13 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { + if (((((*typ)->form == 11 && (*typ)->BaseTyp == OPT_undftyp)) && (*typ)->strobj == NIL)) { OPP_err(0); } } @@ -504,7 +504,7 @@ static void OPP_selector (OPT_Node *x) if (OPP_sym == 31) { OPS_Get(&OPP_sym); for (;;) { - if (((*x)->typ != NIL && (*x)->typ->form == 13)) { + if (((*x)->typ != NIL && (*x)->typ->form == 11)) { OPB_DeRef(&*x); } OPP_Expression(&y); @@ -522,7 +522,7 @@ static void OPP_selector (OPT_Node *x) __COPY(OPS_name, name, 256); OPS_Get(&OPP_sym); if ((*x)->typ != NIL) { - if ((*x)->typ->form == 13) { + if ((*x)->typ->form == 11) { OPB_DeRef(&*x); } if ((*x)->typ->comp == 4) { @@ -544,7 +544,7 @@ static void OPP_selector (OPT_Node *x) OPP_err(75); } typ = y->obj->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField((*x)->obj->name, typ->BaseTyp, &proc); @@ -573,7 +573,7 @@ static void OPP_selector (OPT_Node *x) } else if (OPP_sym == 17) { OPS_Get(&OPP_sym); OPB_DeRef(&*x); - } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 14)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { + } else if ((((((OPP_sym == 30 && (*x)->class < 7)) && (*x)->typ->form != 12)) && ((*x)->obj == NIL || (*x)->obj->mode != 13))) { OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&obj); @@ -872,10 +872,10 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } else { *typ = obj->typ; *rec = *typ; - if ((*rec)->form == 13) { + if ((*rec)->form == 11) { *rec = (*rec)->BaseTyp; } - if (!((((*mode == 1 && (*typ)->form == 13)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { + if (!((((*mode == 1 && (*typ)->form == 11)) && (*rec)->comp == 4) || (*mode == 2 && (*typ)->comp == 4))) { OPP_err(70); *rec = NIL; } @@ -889,7 +889,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St } OPP_CheckSym(22); if (*rec == NIL) { - *rec = OPT_NewStr(15, 4); + *rec = OPT_NewStr(13, 4); (*rec)->BaseTyp = NIL; } } @@ -897,7 +897,7 @@ static void OPP_Receiver (SHORTINT *mode, OPS_Name name, OPT_Struct *typ, OPT_St static BOOLEAN OPP_Extends (OPT_Struct x, OPT_Struct b) { BOOLEAN _o_result; - if ((b->form == 13 && x->form == 13)) { + if ((b->form == 11 && x->form == 11)) { b = b->BaseTyp; x = x->BaseTyp; } @@ -1174,14 +1174,14 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O for (;;) { OPP_ConstExpression(&x); f = x->typ->form; - if (__IN(f, 0x28)) { + if (__IN(f, 0x18)) { xval = x->conval->intval; } else { OPP_err(61); xval = 1; } - if (f == 5) { - if (!(LabelTyp->form == 5) || LabelTyp->size < x->typ->size) { + if (f == 4) { + if (!(LabelTyp->form == 4) || LabelTyp->size < x->typ->size) { OPP_err(60); } } else if (LabelTyp->form != f) { @@ -1191,7 +1191,7 @@ static void OPP_CaseLabelList (OPT_Node *lab, OPT_Struct LabelTyp, INTEGER *n, O OPS_Get(&OPP_sym); OPP_ConstExpression(&y); yval = y->conval->intval; - if ((y->typ->form != f && !((f == 5 && y->typ->form == 5)))) { + if ((y->typ->form != f && !((f == 4 && y->typ->form == 4)))) { OPP_err(60); } if (yval < xval) { @@ -1254,7 +1254,7 @@ static void CasePart__31 (OPT_Node *x) *StatSeq__30_s->pos = OPM_errpos; if ((*x)->class == 8 || (*x)->class == 9) { OPP_err(126); - } else if (!__IN((*x)->typ->form, 0x38)) { + } else if (!__IN((*x)->typ->form, 0x18)) { OPP_err(125); } OPP_CheckSym(25); @@ -1440,7 +1440,7 @@ static void OPP_StatSeq (OPT_Node *stat) OPS_Get(&OPP_sym); if (OPP_sym == 38) { OPP_qualident(&id); - if (!(id->typ->form == 5)) { + if (!(id->typ->form == 4)) { OPP_err(68); } OPP_CheckSym(34); @@ -1472,7 +1472,7 @@ static void OPP_StatSeq (OPT_Node *stat) SetPos__35(z); OPB_Link(&*stat, &last, z); y = OPB_NewLeaf(t); - } else if (!(y->typ->form == 5) || y->typ->size > x->left->typ->size) { + } else if (!(y->typ->form == 4) || y->typ->size > x->left->typ->size) { OPP_err(113); } OPB_Link(&*stat, &last, x); @@ -1527,7 +1527,7 @@ static void OPP_StatSeq (OPT_Node *stat) if (OPP_sym == 38) { OPP_qualident(&id); y = OPB_NewLeaf(id); - if ((((id != NIL && id->typ->form == 13)) && (id->mode == 2 || !id->leaf))) { + if ((((id != NIL && id->typ->form == 11)) && (id->mode == 2 || !id->leaf))) { OPP_err(245); } OPP_CheckSym(20); diff --git a/bootstrap/windows-88/OPP.h b/bootstrap/windows-88/OPP.h index 7a12f897..863db6d6 100644 --- a/bootstrap/windows-88/OPP.h +++ b/bootstrap/windows-88/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/windows-88/OPS.c b/bootstrap/windows-88/OPS.c index 2ee978f2..e575dfe6 100644 --- a/bootstrap/windows-88/OPS.c +++ b/bootstrap/windows-88/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPM.h" diff --git a/bootstrap/windows-88/OPS.h b/bootstrap/windows-88/OPS.h index a8dccfed..a60ffe74 100644 --- a/bootstrap/windows-88/OPS.h +++ b/bootstrap/windows-88/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin tspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin tspkaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/windows-88/OPT.c b/bootstrap/windows-88/OPT.c index f8762935..35088301 100644 --- a/bootstrap/windows-88/OPT.c +++ b/bootstrap/windows-88/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPM.h" @@ -174,7 +174,7 @@ OPT_Struct OPT_ShorterOrLongerType (OPT_Struct x, INTEGER dir) { OPT_Struct _o_result; INTEGER i; - __ASSERT(x->form == 5, 0); + __ASSERT(x->form == 4, 0); __ASSERT(dir == 1 || dir == -1, 0); __ASSERT(x->BaseTyp == OPT_undftyp, 0); i = 0; @@ -285,7 +285,7 @@ void OPT_Close (void) OPT_GlbMod[__X(i, 64)] = NIL; i += 1; } - i = 16; + i = 14; while (i < 255) { OPT_impCtxt.ref[__X(i, 255)] = NIL; OPT_impCtxt.old[__X(i, 255)] = NIL; @@ -484,14 +484,14 @@ void OPT_IdFPrint (OPT_Struct typ) OPT_FPrintName(&idfp, (void*)OPT_GlbMod[__X(typ->mno, 64)]->name, 256); OPT_FPrintName(&idfp, (void*)strobj->name, 256); } - if ((f == 13 || (c == 4 && btyp != NIL)) || c == 3) { + if ((f == 11 || (c == 4 && btyp != NIL)) || c == 3) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); } else if (c == 2) { OPT_IdFPrint(btyp); OPM_FPrint(&idfp, btyp->idfp); OPM_FPrint(&idfp, typ->n); - } else if (f == 14) { + } else if (f == 12) { OPT_FPrintSign(&idfp, btyp, typ->link); } typ->idfp = idfp; @@ -520,7 +520,7 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; FPrintHdFld__15(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -532,8 +532,8 @@ static void FPrintHdFld__15 (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { - OPM_FPrint(&*FPrintStr__12_s->pvfp, 13); + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { + OPM_FPrint(&*FPrintStr__12_s->pvfp, 11); OPM_FPrint(&*FPrintStr__12_s->pvfp, adr); OPT_nofhdfld += 1; } @@ -596,7 +596,7 @@ void OPT_FPrintStr (OPT_Struct typ) f = typ->form; c = typ->comp; btyp = typ->BaseTyp; - if (f == 13) { + if (f == 11) { strobj = typ->strobj; bstrobj = btyp->strobj; if (((strobj == NIL || strobj->name[0] == 0x00) || bstrobj == NIL) || bstrobj->name[0] == 0x00) { @@ -604,7 +604,7 @@ void OPT_FPrintStr (OPT_Struct typ) OPM_FPrint(&pbfp, btyp->pbfp); pvfp = pbfp; } - } else if (f == 14) { + } else if (f == 12) { } else if (__IN(c, 0x0c)) { OPT_FPrintStr(btyp); OPM_FPrint(&pbfp, btyp->pvfp); @@ -650,23 +650,23 @@ void OPT_FPrintObj (OPT_Object obj) f = obj->typ->form; OPM_FPrint(&fprint, f); switch (f) { - case 2: case 3: case 5: + case 2: case 3: case 4: OPM_FPrint(&fprint, obj->conval->intval); break; - case 9: + case 7: OPM_FPrintSet(&fprint, obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_FPrintReal(&fprint, rval); break; - case 8: + case 6: OPM_FPrintLReal(&fprint, obj->conval->realval); break; - case 10: + case 8: OPT_FPrintName(&fprint, (void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -851,22 +851,22 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) OPM_SymRCh(&ch); conval->intval = ch; break; - case 5: + case 4: conval->intval = OPM_SymRInt(); break; - case 9: + case 7: OPM_SymRSet(&conval->setval); break; - case 7: + case 5: OPM_SymRReal(&rval); conval->realval = rval; conval->intval = -1; break; - case 8: + case 6: OPM_SymRLReal(&conval->realval); conval->intval = -1; break; - case 10: + case 8: ext = OPT_NewExt(); conval->ext = ext; i = 0; @@ -878,7 +878,7 @@ static void OPT_InConstant (LONGINT f, OPT_Const conval) conval->intval2 = i; conval->intval = -1; break; - case 11: + case 9: conval->intval = 0; break; default: @@ -980,7 +980,7 @@ static OPT_Object OPT_InTProc (SHORTINT mno) static OPT_Struct OPT_InTyp (LONGINT tag) { OPT_Struct _o_result; - if (tag == 5) { + if (tag == 4) { _o_result = OPT_IntType(OPM_SymRInt()); return _o_result; } else { @@ -1055,20 +1055,20 @@ static void OPT_InStruct (OPT_Struct *typ) } switch (tag) { case 36: - (*typ)->form = 13; + (*typ)->form = 11; (*typ)->size = OPM_PointerSize; (*typ)->n = 0; OPT_InStruct(&(*typ)->BaseTyp); break; case 37: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 2; OPT_InStruct(&(*typ)->BaseTyp); (*typ)->n = OPM_SymRInt(); (*OPT_typSize)(*typ); break; case 38: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 3; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp->comp == 3) { @@ -1079,7 +1079,7 @@ static void OPT_InStruct (OPT_Struct *typ) (*OPT_typSize)(*typ); break; case 39: - (*typ)->form = 15; + (*typ)->form = 13; (*typ)->comp = 4; OPT_InStruct(&(*typ)->BaseTyp); if ((*typ)->BaseTyp == OPT_notyp) { @@ -1113,7 +1113,7 @@ static void OPT_InStruct (OPT_Struct *typ) } break; case 40: - (*typ)->form = 14; + (*typ)->form = 12; (*typ)->size = OPM_ProcSize; OPT_InSign(mno, &(*typ)->BaseTyp, &(*typ)->link); break; @@ -1192,7 +1192,7 @@ static OPT_Object OPT_InObj (SHORTINT mno) obj = OPT_NewObj(); obj->mnolev = -mno; obj->vis = 1; - if (tag <= 13) { + if (tag <= 11) { obj->mode = 3; obj->conval = OPT_NewConst(); OPT_InConstant(tag, obj->conval); @@ -1289,7 +1289,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done) obj->scope = OPT_syslink; obj->typ = OPT_notyp; } else { - OPT_impCtxt.nofr = 16; + OPT_impCtxt.nofr = 14; OPT_impCtxt.minr = 255; OPT_impCtxt.nofm = 0; OPT_impCtxt.self = __STRCMP(aliasName, "@self") == 0; @@ -1356,7 +1356,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) n = btyp->n * n; btyp = btyp->BaseTyp; } - if (btyp->form == 13 || btyp->comp == 4) { + if (btyp->form == 11 || btyp->comp == 4) { j = OPT_nofhdfld; OPT_OutHdFld(btyp, fld, adr); if (j != OPT_nofhdfld) { @@ -1368,7 +1368,7 @@ static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, LONGINT adr) } } } - } else if (typ->form == 13 || __STRCMP(fld->name, "@ptr") == 0) { + } else if (typ->form == 11 || __STRCMP(fld->name, "@ptr") == 0) { OPM_SymWInt(27); OPM_SymWInt(adr); OPT_nofhdfld += 1; @@ -1440,7 +1440,7 @@ static void OPT_OutStr (OPT_Struct typ) OPT_Object strobj = NIL; if (typ->ref < OPT_expCtxt.ref) { OPM_SymWInt(-typ->ref); - if (typ->ref == 5) { + if (typ->ref == 4) { OPM_SymWInt(typ->size); } } else { @@ -1475,15 +1475,15 @@ static void OPT_OutStr (OPT_Struct typ) OPM_SymWInt(typ->sysflag); } switch (typ->form) { - case 13: + case 11: OPM_SymWInt(36); OPT_OutStr(typ->BaseTyp); break; - case 14: + case 12: OPM_SymWInt(40); OPT_OutSign(typ->BaseTyp, typ->link); break; - case 15: + case 13: switch (typ->comp) { case 2: OPM_SymWInt(37); @@ -1538,24 +1538,24 @@ static void OPT_OutConstant (OPT_Object obj) case 2: case 3: OPM_SymWCh((CHAR)obj->conval->intval); break; - case 5: + case 4: OPM_SymWInt(obj->conval->intval); OPM_SymWInt(obj->typ->size); break; - case 9: + case 7: OPM_SymWSet(obj->conval->setval); break; - case 7: + case 5: rval = obj->conval->realval; OPM_SymWReal(rval); break; - case 8: + case 6: OPM_SymWLReal(obj->conval->realval); break; - case 10: + case 8: OPT_OutName((void*)*obj->conval->ext, 256); break; - case 11: + case 9: break; default: OPT_err(127); @@ -1669,7 +1669,7 @@ void OPT_Export (BOOLEAN *ext, BOOLEAN *new) OPM_SymWInt(16); OPT_OutName((void*)OPT_SelfName, 256); OPT_expCtxt.reffp = 0; - OPT_expCtxt.ref = 16; + OPT_expCtxt.ref = 14; OPT_expCtxt.nofm = 1; OPT_expCtxt.locmno[0] = 0; i = 1; @@ -1845,16 +1845,16 @@ export void *OPT__init(void) OPM_errpos = 0; OPT_InitStruct(&OPT_undftyp, 0); OPT_undftyp->BaseTyp = OPT_undftyp; - OPT_InitStruct(&OPT_notyp, 12); - OPT_InitStruct(&OPT_stringtyp, 10); - OPT_InitStruct(&OPT_niltyp, 11); + OPT_InitStruct(&OPT_notyp, 10); + OPT_InitStruct(&OPT_stringtyp, 8); + OPT_InitStruct(&OPT_niltyp, 9); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); - OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp); - OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_PointerSize, &OPT_ainttyp); - OPT_EnterTyp((CHAR*)"INT8", 5, 1, &OPT_int8typ); - OPT_EnterTyp((CHAR*)"INT16", 5, 2, &OPT_int16typ); - OPT_EnterTyp((CHAR*)"INT32", 5, 4, &OPT_int32typ); - OPT_EnterTyp((CHAR*)"INT64", 5, 8, &OPT_int64typ); + OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); + OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp); + OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); + OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); + OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); + OPT_EnterTyp((CHAR*)"INT64", 4, 8, &OPT_int64typ); OPT_EnterProc((CHAR*)"ADR", 20); OPT_EnterProc((CHAR*)"CC", 21); OPT_EnterProc((CHAR*)"LSH", 22); @@ -1872,12 +1872,12 @@ export void *OPT__init(void) OPT_topScope->right = NIL; OPT_EnterTyp((CHAR*)"BOOLEAN", 2, OPM_BoolSize, &OPT_booltyp); OPT_EnterTyp((CHAR*)"CHAR", 3, OPM_CharSize, &OPT_chartyp); - OPT_EnterTyp((CHAR*)"SET", 9, OPM_SetSize, &OPT_settyp); - OPT_EnterTyp((CHAR*)"REAL", 7, OPM_RealSize, &OPT_realtyp); - OPT_EnterTyp((CHAR*)"INTEGER", 5, OPM_IntSize, &OPT_inttyp); - OPT_EnterTyp((CHAR*)"LONGINT", 5, OPM_LIntSize, &OPT_linttyp); - OPT_EnterTyp((CHAR*)"LONGREAL", 8, OPM_LRealSize, &OPT_lrltyp); - OPT_EnterTyp((CHAR*)"SHORTINT", 5, OPM_SIntSize, &OPT_sinttyp); + OPT_EnterTyp((CHAR*)"SET", 7, OPM_SetSize, &OPT_settyp); + OPT_EnterTyp((CHAR*)"REAL", 5, OPM_RealSize, &OPT_realtyp); + OPT_EnterTyp((CHAR*)"INTEGER", 4, OPM_IntSize, &OPT_inttyp); + OPT_EnterTyp((CHAR*)"LONGINT", 4, OPM_LIntSize, &OPT_linttyp); + OPT_EnterTyp((CHAR*)"LONGREAL", 6, OPM_LRealSize, &OPT_lrltyp); + OPT_EnterTyp((CHAR*)"SHORTINT", 4, OPM_SIntSize, &OPT_sinttyp); OPT_EnterBoolConst((CHAR*)"FALSE", 0); OPT_EnterBoolConst((CHAR*)"TRUE", 1); OPT_EnterProc((CHAR*)"HALT", 0); @@ -1905,14 +1905,14 @@ export void *OPT__init(void) OPT_impCtxt.ref[1] = OPT_bytetyp; OPT_impCtxt.ref[2] = OPT_booltyp; OPT_impCtxt.ref[3] = OPT_chartyp; - OPT_impCtxt.ref[5] = OPT_inttyp; - OPT_impCtxt.ref[7] = OPT_realtyp; - OPT_impCtxt.ref[8] = OPT_lrltyp; - OPT_impCtxt.ref[9] = OPT_settyp; - OPT_impCtxt.ref[10] = OPT_stringtyp; - OPT_impCtxt.ref[11] = OPT_niltyp; - OPT_impCtxt.ref[12] = OPT_notyp; - OPT_impCtxt.ref[13] = OPT_sysptrtyp; + OPT_impCtxt.ref[4] = OPT_inttyp; + OPT_impCtxt.ref[5] = OPT_realtyp; + OPT_impCtxt.ref[6] = OPT_lrltyp; + OPT_impCtxt.ref[7] = OPT_settyp; + OPT_impCtxt.ref[8] = OPT_stringtyp; + OPT_impCtxt.ref[9] = OPT_niltyp; + OPT_impCtxt.ref[10] = OPT_notyp; + OPT_impCtxt.ref[11] = OPT_sysptrtyp; OPT_IntTypes[1] = OPT_sinttyp; OPT_IntTypes[2] = OPT_inttyp; OPT_IntTypes[3] = OPT_linttyp; diff --git a/bootstrap/windows-88/OPT.h b/bootstrap/windows-88/OPT.h index acf2e9e9..c3fdc0cf 100644 --- a/bootstrap/windows-88/OPT.h +++ b/bootstrap/windows-88/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/windows-88/OPV.c b/bootstrap/windows-88/OPV.c index b5cebda5..c769935e 100644 --- a/bootstrap/windows-88/OPV.c +++ b/bootstrap/windows-88/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "OPC.h" @@ -123,14 +123,14 @@ void OPV_TypSize (OPT_Struct typ) } else if (c == 2) { OPV_TypSize(typ->BaseTyp); typ->size = typ->n * typ->BaseTyp->size; - } else if (f == 13) { + } else if (f == 11) { typ->size = OPM_PointerSize; if (typ->BaseTyp == OPT_undftyp) { OPM_Mark(128, typ->n); } else { OPV_TypSize(typ->BaseTyp); } - } else if (f == 14) { + } else if (f == 12) { typ->size = OPM_ProcSize; } else if (c == 3) { btyp = typ->BaseTyp; @@ -163,7 +163,7 @@ static void OPV_GetTProcNum (OPT_Object obj) oldPos = OPM_errpos; OPM_errpos = obj->scope->adr; typ = obj->link->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(obj->name, typ->BaseTyp, &redef); @@ -237,7 +237,7 @@ static void OPV_Traverse (OPT_Object obj, OPT_Object outerScope, BOOLEAN exporte if ((mode == 5 && (obj->vis != 0) == exported)) { typ = obj->typ; OPV_TypSize(obj->typ); - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } if (typ->comp == 4) { @@ -349,7 +349,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN case 12: switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -358,7 +358,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 2: - if (form == 9) { + if (form == 7) { _o_result = 3; return _o_result; } else { @@ -371,7 +371,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN return _o_result; break; case 6: - if (form == 9) { + if (form == 7) { _o_result = 2; return _o_result; } else { @@ -380,7 +380,7 @@ static INTEGER OPV_Precedence (INTEGER class, INTEGER subclass, INTEGER form, IN } break; case 7: - if (form == 9) { + if (form == 7) { _o_result = 4; return _o_result; } else { @@ -464,7 +464,7 @@ static BOOLEAN OPV_SideEffects (OPT_Node n) static void OPV_Entier (OPT_Node n, INTEGER prec) { - if (__IN(n->typ->form, 0x0180)) { + if (__IN(n->typ->form, 0x60)) { OPM_WriteString((CHAR*)"__ENTIER(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -503,11 +503,11 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) INTEGER from, to; from = n->typ->form; to = newtype->form; - if (to == 9) { + if (to == 7) { OPM_WriteString((CHAR*)"__SETOF(", 9); OPV_Entier(n, -1); OPM_Write(')'); - } else if (to == 5) { + } else if (to == 4) { if ((newtype->size < n->typ->size && __IN(2, OPM_opt))) { OPM_WriteString((CHAR*)"__SHORT", 8); if (OPV_SideEffects(n)) { @@ -542,7 +542,7 @@ static void OPV_Convert (OPT_Node n, OPT_Struct newtype, INTEGER prec) static void OPV_TypeOf (OPT_Node n) { - if (n->typ->form == 13) { + if (n->typ->form == 11) { OPM_WriteString((CHAR*)"__TYPEOF(", 10); OPV_expr(n, -1); OPM_Write(')'); @@ -794,14 +794,14 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } else if (OPV_ansi) { if ((__IN(comp, 0x0c) && n->class == 7)) { OPM_WriteString((CHAR*)"(CHAR*)", 8); - } else if ((((form == 13 && typ != n->typ)) && n->typ != OPT_niltyp)) { + } else if ((((form == 11 && typ != n->typ)) && n->typ != OPT_niltyp)) { OPM_WriteString((CHAR*)"(void*)", 8); } } else { - if ((__IN(form, 0x0180) && n->typ->form == 5)) { + if ((__IN(form, 0x60) && n->typ->form == 4)) { OPM_WriteString((CHAR*)"(double)", 9); prec = 9; - } else if (form == 5) { + } else if (form == 4) { OPV_SizeCast(n->typ->size, typ->size); } } @@ -812,7 +812,7 @@ static void OPV_ActualPar (OPT_Node n, OPT_Object fp) } if ((((mode == 2 && n->class == 11)) && n->subcl == 29)) { OPV_expr(n->left, prec); - } else if ((form == 5 && n->class == 7)) { + } else if ((form == 4 && n->class == 7)) { OPV_ParIntLiteral(n->conval->intval, n->typ->size); } else { OPV_expr(n, prec); @@ -861,7 +861,7 @@ static OPT_Object OPV_SuperProc (OPT_Node n) OPT_Object obj = NIL; OPT_Struct typ = NIL; typ = n->right->typ; - if (typ->form == 13) { + if (typ->form == 11) { typ = typ->BaseTyp; } OPT_FindField(n->left->obj->name, typ->BaseTyp, &obj); @@ -902,7 +902,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); break; case 7: - if (form == 9) { + if (form == 7) { OPM_Write('~'); } else { OPM_Write('-'); @@ -930,7 +930,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 21: if (OPV_SideEffects(l)) { - if (l->typ->form < 7) { + if (l->typ->form < 5) { if (l->typ->size <= 4) { OPM_WriteString((CHAR*)"(int)", 6); } @@ -959,18 +959,18 @@ static void OPV_expr (OPT_Node n, INTEGER prec) if (l->class == 1) { OPC_CompleteIdent(l->obj); } else { - if ((l->typ->form != 10 && !__IN(l->typ->comp, 0x0c))) { + if ((l->typ->form != 8 && !__IN(l->typ->comp, 0x0c))) { OPM_Write('&'); } OPV_expr(l, exprPrec); } break; case 29: - if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x6220) && __IN(l->typ->form, 0x6220))) && n->typ->size == l->typ->size)) { + if (!__IN(l->class, 0x17) || (((__IN(n->typ->form, 0x1890) && __IN(l->typ->form, 0x1890))) && n->typ->size == l->typ->size)) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); - if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) { + if (__IN(n->typ->form, 0x1800) || __IN(l->typ->form, 0x1800)) { OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", 16); } OPV_expr(l, exprPrec); @@ -1080,7 +1080,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; case 9: case 10: case 11: case 12: case 13: case 14: - if (__IN(l->typ->form, 0x8400)) { + if (__IN(l->typ->form, 0x2100)) { OPM_WriteString((CHAR*)"__STRCMP(", 10); OPV_expr(l, -1); OPM_WriteString((CHAR*)", ", 3); @@ -1092,31 +1092,31 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPV_expr(l, exprPrec); OPC_Cmp(subclass); typ = l->typ; - if ((((((typ->form == 13 && r->typ->form != 11)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { + if ((((((typ->form == 11 && r->typ->form != 9)) && r->typ != typ)) && r->typ != OPT_sysptrtyp)) { OPM_WriteString((CHAR*)"(void *) ", 10); } OPV_expr(r, exprPrec); } break; default: - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write('('); } OPV_expr(l, exprPrec); switch (subclass) { case 1: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ", 4); } else { OPM_WriteString((CHAR*)" * ", 4); } break; case 2: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" ^ ", 4); } else { OPM_WriteString((CHAR*)" / ", 4); - if (r->obj == NIL || r->obj->typ->form == 5) { + if (r->obj == NIL || r->obj->typ->form == 4) { OPM_Write('('); OPC_Ident(n->typ->strobj); OPM_Write(')'); @@ -1127,14 +1127,14 @@ static void OPV_expr (OPT_Node n, INTEGER prec) OPM_WriteString((CHAR*)" && ", 5); break; case 6: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" | ", 4); } else { OPM_WriteString((CHAR*)" + ", 4); } break; case 7: - if (form == 9) { + if (form == 7) { OPM_WriteString((CHAR*)" & ~", 5); } else { OPM_WriteString((CHAR*)" - ", 4); @@ -1150,7 +1150,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec) break; } OPV_expr(r, exprPrec); - if (subclass == 5 || (form == 9 && (subclass == 1 || subclass == 7))) { + if (subclass == 5 || (form == 7 && (subclass == 1 || subclass == 7))) { OPM_Write(')'); } break; @@ -1324,7 +1324,7 @@ static void OPV_NewArr (OPT_Node d, OPT_Node x) if ((base->comp == 4 && OPC_NofPtrs(base) != 0)) { OPC_Ident(base->strobj); OPM_WriteString((CHAR*)"__typ", 6); - } else if (base->form == 13) { + } else if (base->form == 11) { OPM_WriteString((CHAR*)"POINTER__typ", 13); } else { OPM_WriteString((CHAR*)"NIL", 4); @@ -1430,11 +1430,11 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } OPM_Write(')'); } else { - if ((((((l->typ->form == 13 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { + if ((((((l->typ->form == 11 && l->obj != NIL)) && l->obj->adr == 1)) && l->obj->mode == 1)) { l->obj->adr = 0; OPV_design(l, -1); l->obj->adr = 1; - if (r->typ->form != 11) { + if (r->typ->form != 9) { OPM_WriteString((CHAR*)" = (void*)", 11); } else { OPM_WriteString((CHAR*)" = ", 4); @@ -1445,7 +1445,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } if (l->typ == r->typ) { OPV_expr(r, -1); - } else if ((((l->typ->form == 13 && r->typ->form != 11)) && l->typ->strobj != NIL)) { + } else if ((((l->typ->form == 11 && r->typ->form != 9)) && l->typ->strobj != NIL)) { OPM_Write('('); OPC_Ident(l->typ->strobj); OPM_Write(')'); @@ -1630,7 +1630,7 @@ static void OPV_stat (OPT_Node n, OPT_Object outerProc) } else { if (n->left != NIL) { OPM_WriteString((CHAR*)"_o_result = ", 13); - if ((n->left->typ->form == 13 && n->obj->typ != n->left->typ)) { + if ((n->left->typ->form == 11 && n->obj->typ != n->left->typ)) { OPM_WriteString((CHAR*)"(void*)", 8); OPV_expr(n->left, 10); } else { diff --git a/bootstrap/windows-88/OPV.h b/bootstrap/windows-88/OPV.h index 351ef416..914ff060 100644 --- a/bootstrap/windows-88/OPV.h +++ b/bootstrap/windows-88/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/windows-88/Platform.c b/bootstrap/windows-88/Platform.c index efbe5376..3f699c1c 100644 --- a/bootstrap/windows-88/Platform.c +++ b/bootstrap/windows-88/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/windows-88/Platform.h b/bootstrap/windows-88/Platform.h index 45566c5d..cff07fba 100644 --- a/bootstrap/windows-88/Platform.h +++ b/bootstrap/windows-88/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/windows-88/Reals.c b/bootstrap/windows-88/Reals.c index 0652d6b4..98719812 100644 --- a/bootstrap/windows-88/Reals.c +++ b/bootstrap/windows-88/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/windows-88/Reals.h b/bootstrap/windows-88/Reals.h index 9836b502..87c9aa45 100644 --- a/bootstrap/windows-88/Reals.h +++ b/bootstrap/windows-88/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/windows-88/Strings.c b/bootstrap/windows-88/Strings.c index ad6ecbeb..24999430 100644 --- a/bootstrap/windows-88/Strings.c +++ b/bootstrap/windows-88/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/windows-88/Strings.h b/bootstrap/windows-88/Strings.h index f836f9f9..9c2bad27 100644 --- a/bootstrap/windows-88/Strings.h +++ b/bootstrap/windows-88/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/windows-88/Texts.c b/bootstrap/windows-88/Texts.c index 01c67abc..ff526cbc 100644 --- a/bootstrap/windows-88/Texts.c +++ b/bootstrap/windows-88/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Files.h" diff --git a/bootstrap/windows-88/Texts.h b/bootstrap/windows-88/Texts.h index 699c0323..f36b27cf 100644 --- a/bootstrap/windows-88/Texts.h +++ b/bootstrap/windows-88/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/windows-88/Vishap.c b/bootstrap/windows-88/Vishap.c index ffe27b0f..65dd2639 100644 --- a/bootstrap/windows-88/Vishap.c +++ b/bootstrap/windows-88/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkamSf */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkamSf */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" diff --git a/bootstrap/windows-88/errors.c b/bootstrap/windows-88/errors.c index 57e3252c..dc5320bb 100644 --- a/bootstrap/windows-88/errors.c +++ b/bootstrap/windows-88/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" diff --git a/bootstrap/windows-88/errors.h b/bootstrap/windows-88/errors.h index abc550ac..d15a472c 100644 --- a/bootstrap/windows-88/errors.h +++ b/bootstrap/windows-88/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/windows-88/extTools.c b/bootstrap/windows-88/extTools.c index 4e7d428f..566e2b5c 100644 --- a/bootstrap/windows-88/extTools.c +++ b/bootstrap/windows-88/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Configuration.h" diff --git a/bootstrap/windows-88/extTools.h b/bootstrap/windows-88/extTools.h index b5b2af96..161e273a 100644 --- a/bootstrap/windows-88/extTools.h +++ b/bootstrap/windows-88/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/windows-88/vt100.c b/bootstrap/windows-88/vt100.c index 037caf04..b9fb5373 100644 --- a/bootstrap/windows-88/vt100.c +++ b/bootstrap/windows-88/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #define LARGE #include "SYSTEM.h" #include "Console.h" diff --git a/bootstrap/windows-88/vt100.h b/bootstrap/windows-88/vt100.h index 0b63640a..745ff709 100644 --- a/bootstrap/windows-88/vt100.h +++ b/bootstrap/windows-88/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/08/31] for gcc LP64 on cygwin xtspkaSfF */ +/* voc 1.95 [2016/09/01] for gcc LP64 on cygwin xtspkaSfF */ #ifndef vt100__h #define vt100__h diff --git a/src/test/confidence/planned-binary-change b/src/test/confidence/planned-binary-change index 78981922..61780798 100644 --- a/src/test/confidence/planned-binary-change +++ b/src/test/confidence/planned-binary-change @@ -1 +1 @@ -a +b