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

Stepping toward generalised ReadNum.

Browse source
This commit is contained in:
David Brown 2016-09-30 17:19:26 +01:00
parent 6dedf34785
commit 3dc5049d5a
24 changed files with 156 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/compiler/OPM.Mod
View file

@ -592,27 +592,21 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
BEGIN Files.Read(oldSF, ch)
END SymRCh;
(* todo - combine RInt64 and RInt *)
PROCEDURE SymRInt*(): LONGINT;
VAR k: LONGINT;
BEGIN Files.ReadNum(oldSF, k); RETURN k
END SymRInt;
(* todo
PROCEDURE SymRInt64*(): SYSTEM.INT64;
VAR k: SYSTEM.INT64;
BEGIN Files.ReadNum(oldSF, k); RETURN k
END SymRInt64;
*)
PROCEDURE SymRInt64*(): SYSTEM.INT64;
BEGIN RETURN SymRInt()
BEGIN Files.ReadNum64(oldSF, k); RETURN k
END SymRInt64;
(* todo
PROCEDURE SymRSet*(VAR s: SYSTEM.SET64);
BEGIN Files.ReadNum(oldSF, SYSTEM.VAL(SYSTEM.INT64, s))
END SymRSet;
*)
(* todo - combine RSet64 and RSet *)
PROCEDURE SymRSet64*(VAR s: SYSTEM.SET64);
BEGIN Files.ReadNum64(oldSF, s)
END SymRSet64;
PROCEDURE SymRSet*(VAR s: SET);
BEGIN Files.ReadNum(oldSF, SYSTEM.VAL(LONGINT, s))

10
src/runtime/Files.Mod
View file

@ -654,16 +654,6 @@ Especially Length would become fairly complex.
UNTIL b
END ReadLine;
(*
PROCEDURE ReadNum* (VAR R: Rider; VAR x: LONGINT);
VAR s: SHORTINT; ch: CHAR; n: LONGINT;
BEGIN s := 0; n := 0; Read(R, ch);
WHILE ORD(ch) >= 128 DO INC(n, ASH(ORD(ch) - 128, s) ); INC(s, 7); Read(R, ch) END;
INC(n, ASH(ORD(ch) MOD 64 - ORD(ch) DIV 64 * 64, s) );
x := n
END ReadNum;
*)
PROCEDURE ReadNum*(VAR R: Rider; VAR x: ARRAY OF SYSTEM.BYTE);
VAR s, b: SYSTEM.INT8; q: SYSTEM.INT64;
BEGIN s := 0; q := 0; Read(R, b);

8
src/system/Files.Mod
View file

@ -654,16 +654,16 @@ Especially Length would become fairly complex.
UNTIL b
END ReadLine;
(* todo
PROCEDURE ReadNum*(VAR R: Rider; VAR x: ARRAY OF SYSTEM.BYTE);
(* todo combine ReadNum and ReadNum64 *)
PROCEDURE ReadNum64*(VAR R: Rider; VAR x: ARRAY OF SYSTEM.BYTE);
VAR s, b: SYSTEM.INT8; q: SYSTEM.INT64;
BEGIN s := 0; q := 0; Read(R, b);
WHILE b >= 128 DO INC(q, ASH(b-128, s)); INC(s, 7); Read(R, b) END;
INC(q, ASH(b MOD 64 - b DIV 64 * 64, s));
ASSERT(LEN(x) <= 8);
SYSTEM.MOVE(SYSTEM.ADR(q), SYSTEM.ADR(x), LEN(x)) (* Assumes little endian representation of q and x. *)
END ReadNum;
*)
END ReadNum64;
PROCEDURE ReadNum* (VAR R: Rider; VAR x: LONGINT);
VAR s: SHORTINT; ch: CHAR; n: LONGINT;

2
src/tools/make/oberon.mk
View file

@ -155,7 +155,7 @@ installable:
# May require root access.
install:
@printf "\nInstalling into \"$(INSTALLDIR)\"\n"
@rm -rf "$(INSTALLDIR)/bin" "$(INSTALLDIR)/2 "$(INSTALLDIR)/C
@rm -rf "$(INSTALLDIR)"
@mkdir -p "$(INSTALLDIR)/bin"
@cp $(OBECOMP) "$(INSTALLDIR)/bin/$(OBECOMP)"