Pab/gen documentation 2/travis

.travis.yml

@@ -1,11 +1,33 @@
 language: c
-script: dpkg-buildpackage -b -us -uc
 
-install:
-   - sudo apt-get install libgmp-dev
+jobs:
+  include:
+    - os: macos
+      script: sh ./build-macos.sh
+      compiler: clang
+
+    - os: linux
+      script: dpkg-buildpackage -b -us -uc
+      compiler: gcc
+      install:
+        - sudo apt-get install libgmp-dev
+        - sudo apt-get install fakeroot
+        - sudo apt-get install debhelper
+	- sudo apt-get install texlive-binaries
+	- sudo apt-get install texlive-latex-base
+	- sudo apt-get install fig2ps
+
+#    - os: linux
+#      compiler: clang
+#      script: dpkg-buildpackage -b -us -uc
+#      install:
+#        - sudo apt-get install libgmp-dev
+#        - sudo apt-get install fakeroot
+#        - sudo apt-get install debhelper
 
 # whitelist
 branches:
    only:
       - master
       - /.*\/staging/
+      - /.*\/travis/

aldor/.gitignore

@@ -19,6 +19,8 @@ Makefile
 *.class
 *.al
 *.ao
+*.asy
+*.abn
 *.dep
 *.fm
 *.log

aldor/aldor/lib/java/Makefile.am

@@ -1 +1,6 @@
-SUBDIRS=src
+SUBDIRS=src test
+
+@BUILD_JAVA_TRUE@JAVA_TARGET = src/foamj.jar
+
+datalibdir = $(datadir)/lib
+datalib_DATA =  $(JAVA_TARGET)

aldor/aldor/lib/java/src/foamj/AbstractValue.java

@@ -3,19 +3,67 @@
 import java.math.BigInteger;
 
 public abstract class AbstractValue implements Value {
-	public Word asWord() { throw new CastException(this); }
-	public int  toSInt() { throw new CastException(this); }
-    public short toHInt() { throw new CastException(this); }
-    public BigInteger toBInt() { throw new CastException(this); }
-	public double toDFlo() { throw new CastException(this); }
-	public float  toSFlo() { throw new CastException(this); }
-	public Object  toArray() { throw new CastException(this); }
-	public Record toRecord() { throw new CastException(this); }
-	public Clos   toClos() { throw new CastException(this); }
-	public boolean toBool() { throw new CastException(this); }
-	public MultiRecord toMulti() { throw new CastException(this); }
-    public char toChar() { throw new CastException(this); }
-    public Object toPtr() { throw new CastException(this); }
-    public Env toEnv() { throw new CastException(this); }
-    public byte toByte() { throw new CastException(this); }
-}
+    public Word asWord() {
+        throw new CastException(this);
+    }
+
+    public int toSInt() {
+        throw new CastException(this);
+    }
+
+    public short toHInt() {
+        throw new CastException(this);
+    }
+
+    public BigInteger toBInt() {
+        throw new CastException(this);
+    }
+
+    public double toDFlo() {
+        throw new CastException(this);
+    }
+
+    public float toSFlo() {
+        throw new CastException(this);
+    }
+
+    public Object toArray() {
+        throw new CastException(this);
+    }
+
+    public <T> T toJavaObj() {
+        throw new CastException(this);
+    }
+
+    public Record toRecord() {
+        throw new CastException(this);
+    }
+
+    public Clos toClos() {
+        throw new CastException(this);
+    }
+
+    public boolean toBool() {
+        throw new CastException(this);
+    }
+
+    public MultiRecord toMulti() {
+        throw new CastException(this);
+    }
+
+    public char toChar() {
+        throw new CastException(this);
+    }
+
+    public Object toPtr() {
+        throw new CastException(this);
+    }
+
+    public Env toEnv() {
+        throw new CastException(this);
+    }
+
+    public byte toByte() {
+        throw new CastException(this);
+    }
+}

aldor/aldor/lib/java/src/foamj/AldorObject.java

@@ -0,0 +1,3 @@
+package foamj;
+
+public class AldorObject {}

aldor/aldor/lib/java/src/foamj/CastException.java

@@ -3,11 +3,11 @@
 @SuppressWarnings("serial")
 public class CastException extends RuntimeException {
 
-	public CastException(AbstractValue abstractValue) {
-		this("Casting: " + abstractValue.getClass().getName());
-	}
+    public CastException(AbstractValue abstractValue) {
+        this("Casting: " + abstractValue.getClass().getName());
+    }
 
-	public CastException(String string) {
-		super(string);
-	}
+    public CastException(String string) {
+        super(string);
+    }
 }

aldor/aldor/lib/java/src/foamj/Clos.java

@@ -1,62 +1,65 @@
 package foamj;
 
-import java.util.Arrays;
-
-
 public class Clos extends AbstractValue implements Word, Value {
     private Env env;
     private Fn fn;
     private Word info;
-    
+
     public Clos(Env env, Fn fn) {
-    	this.env = env;
-    	this.fn = fn;
+        this.env = env;
+        this.fn = fn;
+    }
+
+    public Value call(Value... vals) {
+        //System.out.println("(Calling: " + fn.getName() + " " + Arrays.asList(vals));
+        Value v = fn.ocall(env, vals);
+        //System.out.println(" Return: " + v + ")");
+
+        return v;
     }
 
-    public Value call(Value ... vals) {
-	//System.out.println("(Calling: " + fn.getName() + " " + Arrays.asList(vals));
-	Value v = fn.ocall(env, vals);
-	//System.out.println(" Return: " + v + ")");
-
-		return v;
+    public static Clos fromValue(Value v) {
+        return (Clos) v;
     }
-
-    public static Clos fromValue(Value v) { return (Clos) v; }
-
+
     public String toString() {
-    	return "{Clos: " + fn + ", " + env.getId() + "}";
+        return "{Clos: " + fn + ", " + env.getId() + "}";
     }
-    
+
     public Fn getProg() {
-    	return fn;
+        return fn;
     }
 
     public Env getEnv() {
-    	return env;
+        return env;
     }
-    
+
     public void setProg(Fn fn) {
-    	this.fn = fn;
+        this.fn = fn;
     }
-    
+
     public void setEnv(Env env) {
-    	this.env = env;
+        this.env = env;
+    }
+
+    public void setInfo(Word info) {
+        this.info = info;
     }
 
-	public void setInfo(Word info) {
-		this.info = info;
-	}
+    public Word getInfo() {
+        return info;
+    }
 
-	public Word getInfo() {
-		return info;
-	}
-
-	public Clos   toClos() { return this; }
+    public Clos toClos() {
+        return this;
+    }
 
-	public Word asWord() { return this; }
+    public Word asWord() {
+        return this;
+    }
 
-	@Override
-	public Value toValue() {
-		return this;
-	}
+    @Override
+    public Value toValue() {
+        return this;
+    }
 }

aldor/aldor/lib/java/src/foamj/Env.java

@@ -1,51 +1,55 @@
 package foamj;
 
 public class Env extends AbstractValue implements Value {
-	private EnvRecord thisLvl;
-	private Env parent;
-	private Word info;
-	private int id;
-	private static int count = 0;
-
-	public Env(EnvRecord lvl, Env parent) {
-		this.thisLvl = lvl;
-		this.parent = parent;
-		this.id = count++;
-	}
-	
+    private EnvRecord thisLvl;
+    private Env parent;
+    private Word info;
+    private int id;
+    private static int count = 0;
+
+    public Env(EnvRecord lvl, Env parent) {
+        this.thisLvl = lvl;
+        this.parent = parent;
+        this.id = count++;
+    }
+
     public Env nthParent(int idx) {
-    	Env e = this;
-    	while (idx != 0) {
-    		e = e.parent;
-    		idx--;
-    	}
-    	return e;
+        Env e = this;
+        while (idx != 0) {
+            e = e.parent;
+            idx--;
+        }
+        return e;
+    }
+
+    public Env toEnv() {
+        return this;
     }
-    public Env toEnv() { return this; }
 
     public EnvRecord level() {
-    	return thisLvl;
+        return thisLvl;
     }
-    
+
     public Env parent() {
-    	return parent;
+        return parent;
     }
 
     public void ensure() {
-		if (info != null) {
-			((Clos) info).call();
-		}
+        if (info != null) {
+            ((Clos) info).call();
+        }
     }
-	public void setInfo(Word info) {
-		this.info = info;
-	}
 
-	public Word getInfo() {
-		return info;
-	}
+    public void setInfo(Word info) {
+        this.info = info;
+    }
 
-	public String getId() {
-		return ""+id;
-	}
+    public Word getInfo() {
+        return info;
+    }
+
+    public String getId() {
+        return "" + id;
+    }
 
 }

aldor/aldor/lib/java/src/foamj/EnvRecord.java

@@ -1,8 +1,8 @@
 package foamj;
 
 public class EnvRecord extends Record {
-	
-	public EnvRecord(Format fmt) {
-		super(fmt);
-	}
+
+    public EnvRecord(Format fmt) {
+        super(fmt);
+    }
 }