Merge pull request #20 from mtrberzi/real-typevalue

Add primitive type for real numbers

.gitignore

@@ -13,6 +13,11 @@
 nbproject/private/
 .nb-gradle
 
+# Eclipse project files
+.classpath
+.project
+.settings
+
 ## generic files
 *~
 *.lock

build.gradle

@@ -11,7 +11,7 @@ targetCompatibility = 1.8
 
 group = "org.manifold"
 // name = "manifold-core"
-version = '0.2.0-SNAPSHOT'
+version = '0.3.0-SNAPSHOT'
 
 jar {
   manifest {

src/main/java/org/manifold/compiler/RealTypeValue.java

@@ -0,0 +1,17 @@
+package org.manifold.compiler;
+
+public class RealTypeValue extends TypeValue {
+  private static final RealTypeValue instance = new RealTypeValue();
+
+  private RealTypeValue() {
+
+  }
+
+  public static RealTypeValue getInstance() {
+    return instance;
+  }
+
+  public void accept(SchematicValueVisitor visitor) {
+    visitor.visit(this);
+  }
+}

src/main/java/org/manifold/compiler/RealValue.java

@@ -0,0 +1,27 @@
+package org.manifold.compiler;
+
+public class RealValue extends Value {
+  private final Double val;
+  public RealValue(Double val){
+    super(RealTypeValue.getInstance());
+    this.val = val;
+  }
+
+  @Override
+  public boolean isElaborationtimeKnowable() {
+    return true;
+  }
+
+  @Override
+  public boolean isRuntimeKnowable() {
+    return false;
+  }
+
+  public void accept(SchematicValueVisitor visitor) {
+    visitor.visit(this);
+  }
+
+  public double toDouble() {
+    return val;
+  }
+}

src/main/java/org/manifold/compiler/SchematicValueVisitor.java

@@ -38,4 +38,8 @@ public interface SchematicValueVisitor {
 
   void visit(ArrayValue arrayValue);
 
+  void visit(RealTypeValue realTypeValue);
+
+  void visit(RealValue realValue);
+
 }

src/main/java/org/manifold/compiler/middle/Schematic.java

@@ -15,6 +15,7 @@
 import org.manifold.compiler.NodeTypeValue;
 import org.manifold.compiler.NodeValue;
 import org.manifold.compiler.PortTypeValue;
+import org.manifold.compiler.RealTypeValue;
 import org.manifold.compiler.StringTypeValue;
 import org.manifold.compiler.TypeValue;
 import org.manifold.compiler.UndeclaredIdentifierException;
@@ -72,18 +73,19 @@ public Schematic(String name) {
 
   /*
    * Add "library standard" type definitions for basic types such as integer,
-   * string, and boolean. Every class in .intermediate.types should be
-   * represented in here.
+   * string, and boolean.
    */
   private void populateDefaultType() {
     TypeValue boolType = BooleanTypeValue.getInstance();
     TypeValue intType = IntegerTypeValue.getInstance();
     TypeValue stringType = StringTypeValue.getInstance();
+    TypeValue realType = RealTypeValue.getInstance();
 
     try {
       addUserDefinedType("Bool", boolType);
       addUserDefinedType("Int", intType);
       addUserDefinedType("String", stringType);
+      addUserDefinedType("Real", realType);
     } catch (MultipleDefinitionException mde) {
       // this should not actually be possible unless there is something wrong
       // with the compiler itself

src/test/java/org/manifold/compiler/TestAtomicTypes.java

@@ -1,6 +1,8 @@
 package org.manifold.compiler;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 
 import org.junit.Test;
 
@@ -11,16 +13,19 @@ public void testEquality() {
     BooleanTypeValue p1 = BooleanTypeValue.getInstance();
     IntegerTypeValue p2 = IntegerTypeValue.getInstance();
     StringTypeValue p3 = StringTypeValue.getInstance();
+    RealTypeValue p4 = RealTypeValue.getInstance();
 
     // Primitive types are singletons.
     assertEquals(p1, BooleanTypeValue.getInstance());
     assertEquals(p2, IntegerTypeValue.getInstance());
     assertEquals(p3, StringTypeValue.getInstance());
+    assertEquals(p4, RealTypeValue.getInstance());
 
     // Two types are equal iff they are the same object
     assertNotEquals(p1, p2);
     assertNotEquals(p1, p3);
     assertNotEquals(p2, p3);
+    assertNotEquals(p3, p4);
 
     // Equality function doesn't fail for null.
     assertFalse(p1.equals(null));