Extra numeric and reader functionality and tests

Author: mikera

convex-core/src/main/java/convex/core/data/AString.java

@@ -125,6 +125,11 @@ public int getBytes(byte[] dest, int destOffset) {
 		return toBlob().getBytes(dest, destOffset);
 	}
 
+	/**
+	 * Returns the Java String representing the UTF-8 content of this AString
+	 * 
+	 * NOTE: this is not round-trippable through the CVX Reader, intended for output purposes only.
+	 */
 	@Override 
 	public String toString() {
 		int n=Utils.checkedInt(count());

convex-core/src/main/java/convex/core/data/prim/ANumeric.java

@@ -35,6 +35,18 @@ public abstract class ANumeric extends APrimitive implements Comparable<ANumeric
 	 * @return Signum of the numeric value
 	 */
 	public abstract APrimitive signum();
+	
+	/**
+	 * Returns true if this numeric value is negative. Note zero and NaN are not negative
+	 * @return true if negative
+	 */
+	public abstract boolean isNegative();
+
+	/**
+	 * Returns true if this numeric value is positive. Note zero and NaN are not positive
+	 * @return true if negative
+	 */
+	public abstract boolean isPositive();
 
 
 	/**

convex-core/src/main/java/convex/core/data/prim/CVMBigInteger.java

@@ -146,6 +146,16 @@ public CVMLong signum() {
 		if (data!=null) return CVMLong.forSignum(data.signum());
 		return CVMLong.forSignum(blob.byteAt(0));
 	}
+	
+	@Override
+	public boolean isNegative() {
+		return signum().equals(CVMLong.MINUS_ONE);
+	}
+
+	@Override
+	public boolean isPositive() {
+		return signum().equals(CVMLong.ONE);
+	}
 
 	@Override
 	public int estimatedEncodingSize() {
@@ -432,4 +442,6 @@ public boolean isLong() {
 
 
 
+
+
 }

convex-core/src/main/java/convex/core/data/prim/CVMDouble.java

@@ -269,7 +269,14 @@ public boolean isZero() {
 		return value==0.0;
 	}
 
+	@Override
+	public boolean isNegative() {
+		return value<0;
+	}
 
-
+	@Override
+	public boolean isPositive() {
+		return value>0;
+	}
 
 }

convex-core/src/main/java/convex/core/data/prim/CVMLong.java

@@ -453,6 +453,16 @@ public boolean isLong() {
 		return true;
 	}
 
+	@Override
+	public boolean isNegative() {
+		return value<0;
+	}
+
+	@Override
+	public boolean isPositive() {
+		return value>0;
+	}
+
 
 
 }

convex-core/src/main/java/convex/core/json/JSONReader.java

@@ -121,7 +121,7 @@ public void exitNumber(NumberContext ctx) {
 
 		@Override
 		public void exitString(StringContext ctx) {
-			String text=ctx.getText();
+			String text=ctx.getStart().getText();
 			String content=text.substring(1, text.length()-1);
 			push(JSONUtils.unescape(content));
 		}

convex-core/src/test/java/convex/core/lang/NumericsTest.java

@@ -459,13 +459,24 @@ public static void doNumberTests(ANumeric a) {
 	}
 
 	public static void doIntegerTests(AInteger a) {
-		assertEquals(a.abs(),RT.multiply(a.signum(),a));
+		CVMLong signum=a.signum();
+		assertEquals(a.abs(),RT.multiply(signum,a));
+		if (signum.equals(CVMLong.ONE)) {
+			assertTrue(a.isPositive());
+		} else if (signum.equals(CVMLong.MINUS_ONE)) {
+			assertTrue(a.isNegative());
+		} else {
+			assertTrue(a.isZero());
+		}
 
 		doGenericNumberTests(a);
 	}
 
 	public static void doDoubleTests(CVMDouble a) {
-		assertEquals(a.abs(),RT.multiply(a.signum(),a));
+		CVMDouble signum = a.signum();
+		assertEquals(a.abs(),RT.multiply(signum,a));
+		
+		assertEquals(Math.signum(a.doubleValue()),signum.doubleValue());
 
 		doGenericNumberTests(a);
 	}

convex-core/src/test/java/convex/core/utils/JSONUtilsTest.java

@@ -155,6 +155,8 @@ public void testJSONObjects() {
 		assertEquals(Strings.COLON,JSONReader.read("\":\""));
 		assertEquals(Vectors.of(1,2),JSONReader.read("[1,2]"));
 
+		JSONReader.read("{\"a\":[{\"b\":\"c\"},2]}");
+		
 		assertThrows(ParseException.class,()->JSONReader.readObject("[]")); // not an object
 
 	}