Add Math.Mod and remove redundant * in DEFINITION modules

Author: lboasso

Makefile

@@ -3,10 +3,10 @@
 
 JAVA_SOURCES = src/java/Files_FileDesc.java src/java/Files.java \
                src/java/OberonRuntime.java src/java/Os.java src/java/Out.java \
-               src/java/In.java
+               src/java/In.java src/java/Math.java
 MOD_SOURCES = src/Out.Mod src/Os.Mod src/Files.Mod src/Strings.Mod src/OJS.Mod \
               src/CpCache.Mod src/Opcodes.Mod src/ClassFormat.Mod src/OJB.Mod \
-              src/OJG.Mod src/OJP.Mod src/oberonc.Mod src/In.Mod
+              src/OJG.Mod src/OJP.Mod src/oberonc.Mod src/In.Mod src/Math.Mod
 
 build:
 	mkdir -p out/
@@ -31,7 +31,7 @@ runFern:
 	mkdir -p examples/fern/out/
 	javac -cp $(OBERON_BIN) -d examples/fern/out examples/fern/java/*.java
 	java -cp $(OBERON_BIN) oberonc examples/fern/out \
-	  examples/fern/MathUtil.Mod examples/fern/RandomNumbers.Mod \
+	  examples/fern/RandomNumbers.Mod \
 	  examples/fern/XYplane.Mod examples/fern/IFS.Mod
 	java -cp $(OBERON_BIN):examples/fern/out IFS
 

bin/Files.class

@@ -1,5 +1,5 @@
 MODULE RandomNumbers;
-  IMPORT MathUtil;
+  IMPORT Math;
 
   VAR Z: INTEGER;
 
@@ -16,7 +16,7 @@ MODULE RandomNumbers;
 
   PROCEDURE Exp*(mu: REAL): REAL;
   BEGIN
-    RETURN -MathUtil.ln(Uniform())/mu
+    RETURN -Math.ln(Uniform())/mu
   END Exp;
 
   PROCEDURE InitSeed*(seed: INTEGER);

bin/In.class

@@ -7,7 +7,7 @@
 import javax.swing.JPanel;
 import javax.swing.WindowConstants;
 
-public class XYplane {
+public final class XYplane {
   public static final int erase = 0;
   public static final int draw = 1;
   public static int X, Y, W, H;
@@ -16,6 +16,9 @@ public class XYplane {
   private static final int white = Color.WHITE.getRGB();
   private static final int black = Color.BLACK.getRGB();
 
+  // Ensure non-instantiability
+  private XYplane() {}
+
   public static void Open() {
     W = 800;
     H = 800;

bin/Math.class

@@ -1,7 +1,7 @@
 @echo off
 
-set JAVA_SOURCES=src/java/Files_FileDesc.java src/java/Files.java src/java/OberonRuntime.java src/java/Os.java src/java/Out.java
-set MOD_SOURCES=src/Out.Mod src/Os.Mod src/Files.Mod src/Strings.Mod src/OJS.Mod src/CpCache.Mod src/Opcodes.Mod src/ClassFormat.Mod src/OJB.Mod src/OJG.Mod src/OJP.Mod src/oberonc.Mod
+set JAVA_SOURCES=src/java/Files_FileDesc.java src/java/Files.java src/java/OberonRuntime.java src/java/Os.java src/java/Out.java src/java/In.java src/java/Math.java
+set MOD_SOURCES=src/Out.Mod src/Os.Mod src/Files.Mod src/Strings.Mod src/OJS.Mod src/CpCache.Mod src/Opcodes.Mod src/ClassFormat.Mod src/OJB.Mod src/OJG.Mod src/OJP.Mod src/oberonc.Mod src/In.Mod src/Math.Mod
 
 
 if "%~1"=="" goto build
@@ -30,14 +30,14 @@ goto end
 :runFern
 mkdir "examples/fern/out/"
 javac -cp %OBERON_BIN% -d examples/fern/out examples/fern/java/*.java
-java -cp %OBERON_BIN% oberonc examples/fern/out examples/fern/MathUtil.Mod examples/fern/RandomNumbers.Mod examples/fern/XYplane.Mod examples/fern/IFS.Mod
+java -cp %OBERON_BIN% oberonc examples/fern/out examples/fern/RandomNumbers.Mod examples/fern/XYplane.Mod examples/fern/IFS.Mod
 java -cp %OBERON_BIN%;examples/fern/out IFS
 goto end
 
 :test
 mkdir "tests/out/"
 javac -cp %OBERON_BIN% -d tests/out tests/TestRunner.java
-java -cp %OBERON_BIN%;tests/out TestRunner
+java -Dfile.encoding=UTF-8 -cp %OBERON_BIN%;tests/out TestRunner
 goto end
 
 :clean

bin/Math.smb

@@ -6,42 +6,42 @@
 
 DEFINITION Files;
   CONST
-    OK* = 0;
-    EOF* = -1;
-    IOERROR* = -2;
-    UTF8ERROR* = -3;
+    OK = 0;
+    EOF = -1;
+    IOERROR = -2;
+    UTF8ERROR = -3;
 
   TYPE
-    File* = POINTER TO FileDesc;
+    File = POINTER TO FileDesc;
     FileDesc = RECORD END;
   VAR
-    SEPARATOR*: ARRAY 2 OF CHAR;
+    SEPARATOR: ARRAY 2 OF CHAR;
 
-  PROCEDURE Create*(name: ARRAY OF CHAR): File;
-  PROCEDURE Open*(name: ARRAY OF CHAR): File;
-  PROCEDURE Close*(file: File);
+  PROCEDURE Create(name: ARRAY OF CHAR): File;
+  PROCEDURE Open(name: ARRAY OF CHAR): File;
+  PROCEDURE Close(file: File);
 
-  PROCEDURE WriteAsciiStr*(file: File; str: ARRAY OF CHAR);
-  PROCEDURE WriteStr*(file: File; str: ARRAY OF CHAR);
-  PROCEDURE Write*(file: File; b: BYTE);
-  PROCEDURE WriteChar*(file: File; c: CHAR);
-  PROCEDURE WriteBytes*(file: File; b: ARRAY OF BYTE);
-  PROCEDURE WriteNBytes*(file: File; b: ARRAY OF BYTE; len: INTEGER);
-  PROCEDURE WriteInt*(file: File; x: INTEGER);
-  PROCEDURE WriteNum*(file: File; x: INTEGER);
+  PROCEDURE WriteAsciiStr(file: File; str: ARRAY OF CHAR);
+  PROCEDURE WriteStr(file: File; str: ARRAY OF CHAR);
+  PROCEDURE Write(file: File; b: BYTE);
+  PROCEDURE WriteChar(file: File; c: CHAR);
+  PROCEDURE WriteBytes(file: File; b: ARRAY OF BYTE);
+  PROCEDURE WriteNBytes(file: File; b: ARRAY OF BYTE; len: INTEGER);
+  PROCEDURE WriteInt(file: File; x: INTEGER);
+  PROCEDURE WriteNum(file: File; x: INTEGER);
 
-  PROCEDURE ReadNum*(file: File): INTEGER;
-  PROCEDURE Read*(file: File): BYTE;
-  PROCEDURE ReadChar*(file: File): CHAR;
-  PROCEDURE ReadInt*(file: File): INTEGER;
-  PROCEDURE ReadBytes*(file: File; VAR b: ARRAY OF BYTE; VAR n: INTEGER);
-  PROCEDURE ReadAsciiStr*(file: File; VAR str: ARRAY OF CHAR);
-  PROCEDURE ReadStr*(file: File; VAR str: ARRAY OF CHAR): INTEGER;
+  PROCEDURE ReadNum(file: File): INTEGER;
+  PROCEDURE Read(file: File): BYTE;
+  PROCEDURE ReadChar(file: File): CHAR;
+  PROCEDURE ReadInt(file: File): INTEGER;
+  PROCEDURE ReadBytes(file: File; VAR b: ARRAY OF BYTE; VAR n: INTEGER);
+  PROCEDURE ReadAsciiStr(file: File; VAR str: ARRAY OF CHAR);
+  PROCEDURE ReadStr(file: File; VAR str: ARRAY OF CHAR): INTEGER;
 
-  PROCEDURE Status*(file: File): INTEGER;
-  PROCEDURE Rename*(from, to: ARRAY OF CHAR): INTEGER;
-  PROCEDURE Exists*(name: ARRAY OF CHAR): BOOLEAN;
-  PROCEDURE Delete*(name: ARRAY OF CHAR): INTEGER;
-  PROCEDURE Seek*(file: File; pos: INTEGER): INTEGER;
-  PROCEDURE Size*(file: File): INTEGER;
+  PROCEDURE Status(file: File): INTEGER;
+  PROCEDURE Rename(from, to: ARRAY OF CHAR): INTEGER;
+  PROCEDURE Exists(name: ARRAY OF CHAR): BOOLEAN;
+  PROCEDURE Delete(name: ARRAY OF CHAR): INTEGER;
+  PROCEDURE Seek(file: File; pos: INTEGER): INTEGER;
+  PROCEDURE Size(file: File): INTEGER;
 END Files.

bin/Os.class

@@ -17,9 +17,9 @@
   discarded.
 *)
 DEFINITION In;
-  VAR Done*: BOOLEAN;
-  PROCEDURE Char*(VAR ch: CHAR);
-  PROCEDURE String*(VAR str: ARRAY OF CHAR);
-  PROCEDURE Real*(VAR x: REAL);
-  PROCEDURE Int*(VAR x: INTEGER);
+  VAR Done: BOOLEAN;
+  PROCEDURE Char(VAR ch: CHAR);
+  PROCEDURE String(VAR str: ARRAY OF CHAR);
+  PROCEDURE Real(VAR x: REAL);
+  PROCEDURE Int(VAR x: INTEGER);
 END In.

bin/Out.class

@@ -0,0 +1,82 @@
+(*
+  Copyright 2020 Luca Boasso. All rights reserved.
+  Use of this source code is governed by a MIT
+  license that can be found in the LICENSE file.
+*)
+
+(* Math provides a basic set of general purpose mathematical functions using
+   REAL arithmetic. It implements the interface described in "The Oakwood
+   Guidelines for Oberon-2 Compiler Developers". *)
+DEFINITION Math;
+  CONST
+    pi = 3.14159265358979323846;
+    e = 2.71828182845904523536;
+
+  (* sqrt returns the square root of x, where x must be positive *)
+  PROCEDURE sqrt(x: REAL): REAL;
+
+  (* power returns base raised to the power of x. *)
+  PROCEDURE power(x, base: REAL): REAL;
+
+  (* exp returns Math.e raised to the power of x: power(x, e)*)
+  PROCEDURE exp(x: REAL): REAL;
+
+  (* ln returns the natural logarithm (base e) of x. *)
+  PROCEDURE ln(x: REAL): REAL;
+
+  (* log returns the logarithm of x base b. All positive arguments are allowed.
+     The base b must be positive.*)
+  PROCEDURE log(x, b: REAL): REAL;
+
+  (* If the fraction part of x is in range 0.0 to 0.5 (excluded) then the result
+     of round is the largest integer not greater than x, otherwise the result
+     is x rounded up to the next highest whole number.
+     Note that integer values cannot always be exactly represented in REAL
+     format. *)
+  PROCEDURE round(x: REAL): REAL;
+
+  (* sin returns the sine value of x, where x is in radians. *)
+  PROCEDURE sin(x: REAL): REAL;
+
+  (* cos returns the cosine value of x, where x is in radians. *)
+  PROCEDURE cos(x: REAL): REAL;
+
+  (* tan returns the tangent value of x, where x is in radians. *)
+  PROCEDURE tan(x: REAL): REAL;
+
+  (* arcsin returns the arcsine value in radians of x, where x is
+     in the sine value. *)
+  PROCEDURE arcsin(x: REAL): REAL;
+
+  (* arcos returns the arcos value in radians of x, where x is
+    in the cosine value. *)
+  PROCEDURE arccos(x: REAL): REAL;
+
+  (* arctan returns the arctan value in radians of x, where x is
+    in the tangent value. *)
+  PROCEDURE arctan(x: REAL): REAL;
+
+  (* arctan2 returns the quadrant-correct arc tangent atan(x/y).
+     If the denominator y is zero, then the numerator x must not be zero.
+     All arguments are legal except x = y = 0. *)
+  PROCEDURE arctan2(x, y: REAL): REAL;
+
+  (* sinh returns the hyperbolic sine of x. *)
+  PROCEDURE sinh(x: REAL): REAL;
+
+  (* cosh returns the hyperbolic cosine of x. *)
+  PROCEDURE cosh(x: REAL): REAL;
+
+  (* tanh returns the hyperbolic tangent of x. *)
+  PROCEDURE tanh(x: REAL): REAL;
+
+  (* arcsinh returns the arc hyperbolic sine of x. *)
+  PROCEDURE arcsinh(x: REAL): REAL;
+
+  (* arccosh returns the arc hyperbolic cosine of x. All arguments greater than
+     or equal to 1 are legal. *)
+  PROCEDURE arccosh(x: REAL): REAL;
+
+  (* arctanh returns the arc hyperbolic tangent of x. *)
+  PROCEDURE arctanh(x: REAL): REAL;
+END Math.

examples/fern/MathUtil.Mod

@@ -5,8 +5,8 @@
 *)
 
 DEFINITION Os;
-  PROCEDURE GetEnv*(VAR out: ARRAY OF CHAR; name: ARRAY OF CHAR);
+  PROCEDURE GetEnv(VAR out: ARRAY OF CHAR; name: ARRAY OF CHAR);
 
   (* Get time in seconds since 2010-01-01-UTC *)
-  PROCEDURE CurrentTime*(): INTEGER;
-END Os.
+  PROCEDURE CurrentTime(): INTEGER;
+END Os.

examples/fern/RandomNumbers.Mod

@@ -6,10 +6,10 @@
 
 (* Simple procedures to print to standard output *)
 DEFINITION Out;
-  PROCEDURE Char*(ch: CHAR);
-  PROCEDURE String*(str: ARRAY OF CHAR);
-  PROCEDURE Real*(x: REAL; n: INTEGER);
-  PROCEDURE Int*(x, n: INTEGER);
-  PROCEDURE Ln*;
-  PROCEDURE Hex*(x: INTEGER);
+  PROCEDURE Char(ch: CHAR);
+  PROCEDURE String(str: ARRAY OF CHAR);
+  PROCEDURE Real(x: REAL; n: INTEGER);
+  PROCEDURE Int(x, n: INTEGER);
+  PROCEDURE Ln;
+  PROCEDURE Hex(x: INTEGER);
 END Out.

examples/fern/java/MathUtil.java

@@ -11,7 +11,7 @@
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
-public class Files {
+public final class Files {
   public static final int OK = 0;
   public static final int EOF = -1;
   public static final int IOERROR = -2;

examples/fern/java/XYplane.java

@@ -10,6 +10,8 @@ public final class In {
 
   static public boolean Done;
   static private Scanner scanner;
+
+  // Ensure non-instantiability
   private In() {}
 
   static {