First SInt/Int/LInt simplification.

This commit is contained in:
David Brown 2016-08-13 17:49:08 +01:00
parent 188836d25a
commit b2263d933e
2 changed files with 11 additions and 8 deletions

View file

@ -874,10 +874,10 @@ MODULE OPB; (* RC 6.3.89 / 21.2.94 *) (* object model 17.1.93 *)
| OPM.Byte: IF ~(g IN {OPM.Byte, OPM.Char, OPM.SInt}) THEN err(113) END | OPM.Byte: IF ~(g IN {OPM.Byte, OPM.Char, OPM.SInt}) THEN err(113) END
| OPM.Bool, | OPM.Bool,
OPM.Char, OPM.Char,
OPM.SInt,
OPM.Set: IF g # f THEN err(113) END OPM.Set: IF g # f THEN err(113) END
| OPM.Int: IF ~(g IN {OPM.SInt, OPM.Int}) THEN err(113) END | OPM.SInt,
| OPM.LInt: IF ~(g IN OPM.intSet) THEN err(113) END OPM.Int,
OPM.LInt: IF ~(g IN OPM.intSet) OR (x.size < y.size) THEN err(113) END
| OPM.Real: IF ~(g IN {OPM.SInt..OPM.Real}) THEN err(113) END | OPM.Real: IF ~(g IN {OPM.SInt..OPM.Real}) THEN err(113) END
| OPM.LReal: IF ~(g IN {OPM.SInt..OPM.LReal}) THEN err(113) END | OPM.LReal: IF ~(g IN {OPM.SInt..OPM.LReal}) THEN err(113) END
| OPM.Pointer: IF (x = y) OR (g = OPM.NilTyp) OR (x = OPT.sysptrtyp) & (g = OPM.Pointer) THEN (* ok *) | OPM.Pointer: IF (x = y) OR (g = OPM.NilTyp) OR (x = OPT.sysptrtyp) & (g = OPM.Pointer) THEN (* ok *)

View file

@ -375,13 +375,16 @@ sourcechanges:
RUNTEST = COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
confidence: confidence:
@printf "\n\n--- Confidence tests ---\n\n" @printf "\n\n--- Confidence tests ---\n\n"
cd src/test/confidence/hello; COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)" cd src/test/confidence/hello; $(RUNTEST)
cd src/test/confidence/language; COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)" cd src/test/confidence/intsyntax; $(RUNTEST)
if [ "$(PLATFORM)" != "windows" ] ; then cd src/test/confidence/signal; COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"; fi cd src/test/confidence/language; $(RUNTEST)
cd src/test/confidence/lola; COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)" if [ "$(PLATFORM)" != "windows" ] ; then cd src/test/confidence/signal; $(RUNTEST); fi
cd src/test/confidence/arrayassignment; COMPILER=$(COMPILER) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)" cd src/test/confidence/lola; $(RUNTEST)
cd src/test/confidence/arrayassignment; $(RUNTEST)
@printf "\n\n--- Confidence tests passed ---\n\n" @printf "\n\n--- Confidence tests passed ---\n\n"