antlr4: Moved the :: up the precedece

Author: hexaredecimal

src/main/antlr4/PiccodeScript.g4

@@ -60,10 +60,10 @@ literal_expr :
 expr_stmt: expr;
 	// parser rules
 expr
-	: expr LPAREN call_expr_list? RPAREN
+	: expr CC expr
+	| expr LPAREN call_expr_list? RPAREN
 	| var_decl
 	| closure_decl
-	| expr CC expr
 	| expr DOT expr
 	| expr MUL expr         
 	| expr DIV expr         

src/main/java/org/piccode/antlr4/PiccodeScript.interp

@@ -1332,11 +1332,11 @@ private ExprContext expr(int _p) throws RecognitionException {
 						_localctx = new ExprContext(_parentctx, _parentState);
 						pushNewRecursionContext(_localctx, _startState, RULE_expr);
 						setState(183);
-						if (!(precpred(_ctx, 32))) throw new FailedPredicateException(this, "precpred(_ctx, 32)");
+						if (!(precpred(_ctx, 35))) throw new FailedPredicateException(this, "precpred(_ctx, 35)");
 						setState(184);
 						match(CC);
 						setState(185);
-						expr(33);
+						expr(36);
 						}
 						break;
 					case 2:
@@ -1596,7 +1596,7 @@ private ExprContext expr(int _p) throws RecognitionException {
 						_localctx = new ExprContext(_parentctx, _parentState);
 						pushNewRecursionContext(_localctx, _startState, RULE_expr);
 						setState(249);
-						if (!(precpred(_ctx, 35))) throw new FailedPredicateException(this, "precpred(_ctx, 35)");
+						if (!(precpred(_ctx, 34))) throw new FailedPredicateException(this, "precpred(_ctx, 34)");
 						setState(250);
 						match(LPAREN);
 						setState(252);
@@ -2752,7 +2752,7 @@ public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 	private boolean expr_sempred(ExprContext _localctx, int predIndex) {
 		switch (predIndex) {
 		case 0:
-			return precpred(_ctx, 32);
+			return precpred(_ctx, 35);
 		case 1:
 			return precpred(_ctx, 31);
 		case 2:
@@ -2796,7 +2796,7 @@ private boolean expr_sempred(ExprContext _localctx, int predIndex) {
 		case 21:
 			return precpred(_ctx, 11);
 		case 22:
-			return precpred(_ctx, 35);
+			return precpred(_ctx, 34);
 		}
 		return true;
 	}
@@ -2872,8 +2872,8 @@ private boolean expr_sempred(ExprContext _localctx, int predIndex) {
 		",\2\2\u00b7\u00a6\3\2\2\2\u00b7\u00a8\3\2\2\2\u00b7\u00a9\3\2\2\2\u00b7"+
 		"\u00ae\3\2\2\2\u00b7\u00af\3\2\2\2\u00b7\u00b0\3\2\2\2\u00b7\u00b1\3\2"+
 		"\2\2\u00b7\u00b2\3\2\2\2\u00b7\u00b3\3\2\2\2\u00b7\u00b4\3\2\2\2\u00b7"+
-		"\u00b5\3\2\2\2\u00b7\u00b6\3\2\2\2\u00b8\u0103\3\2\2\2\u00b9\u00ba\f\""+
-		"\2\2\u00ba\u00bb\7\26\2\2\u00bb\u0102\5\"\22#\u00bc\u00bd\f!\2\2\u00bd"+
+		"\u00b5\3\2\2\2\u00b7\u00b6\3\2\2\2\u00b8\u0103\3\2\2\2\u00b9\u00ba\f%"+
+		"\2\2\u00ba\u00bb\7\26\2\2\u00bb\u0102\5\"\22&\u00bc\u00bd\f!\2\2\u00bd"+
 		"\u00be\7-\2\2\u00be\u0102\5\"\22\"\u00bf\u00c0\f \2\2\u00c0\u00c1\7\5"+
 		"\2\2\u00c1\u0102\5\"\22!\u00c2\u00c3\f\37\2\2\u00c3\u00c4\7\6\2\2\u00c4"+
 		"\u0102\5\"\22 \u00c5\u00c6\f\36\2\2\u00c6\u00c7\7\7\2\2\u00c7\u0102\5"+
@@ -2892,7 +2892,7 @@ private boolean expr_sempred(ExprContext _localctx, int predIndex) {
 		"\f\20\2\2\u00f0\u00f1\7\21\2\2\u00f1\u0102\5\"\22\21\u00f2\u00f3\f\17"+
 		"\2\2\u00f3\u00f4\7\23\2\2\u00f4\u0102\5\"\22\20\u00f5\u00f6\f\16\2\2\u00f6"+
 		"\u00f7\7\22\2\2\u00f7\u0102\5\"\22\17\u00f8\u00f9\f\r\2\2\u00f9\u00fa"+
-		"\7\35\2\2\u00fa\u0102\5\"\22\16\u00fb\u00fc\f%\2\2\u00fc\u00fe\7\31\2"+
+		"\7\35\2\2\u00fa\u0102\5\"\22\16\u00fb\u00fc\f$\2\2\u00fc\u00fe\7\31\2"+
 		"\2\u00fd\u00ff\5<\37\2\u00fe\u00fd\3\2\2\2\u00fe\u00ff\3\2\2\2\u00ff\u0100"+
 		"\3\2\2\2\u0100\u0102\7\32\2\2\u0101\u00b9\3\2\2\2\u0101\u00bc\3\2\2\2"+
 		"\u0101\u00bf\3\2\2\2\u0101\u00c2\3\2\2\2\u0101\u00c5\3\2\2\2\u0101\u00c8"+

src/main/java/org/piccode/antlr4/PiccodeScriptParser.java

@@ -71,6 +71,10 @@ public static Location getLocation(Ast node) {
 		if (node instanceof DoExprAst dot) {
 			return new Location(dot.line, dot.column);
 		}
+
+		if (node instanceof CCOperationAst cc) {
+			return new Location(cc.line, cc.column);
+		}
 
 		if (node instanceof DotOperationAst dot) {
 			return new Location(dot.line, dot.column);

src/main/java/org/piccode/ast/Ast.java

@@ -46,7 +46,7 @@ public String toString() {
 	public PiccodeValue execute() {
 		var expr_val = expr.execute();
 		if (!(expr_val instanceof PiccodeClosure) && !(expr_val instanceof NativeFunction)) {
-			throw new PiccodeException(file, line, column, "Attempt to call a non-callable expression");
+			throw new PiccodeException(file, line, column, "Attempt to call a non-callable expression. Issue is: " + expr + " = " + expr_val);
 		}
 		lastCall = expr;
 

src/main/java/org/piccode/ast/CallAst.java

@@ -4,7 +4,10 @@
 import java.util.Arrays;
 import java.util.List;
 import org.piccode.rt.PiccodeArray;
+import org.piccode.rt.PiccodeBoolean;
 import org.piccode.rt.PiccodeNumber;
+import org.piccode.rt.PiccodeObject;
+import org.piccode.rt.PiccodeString;
 import org.piccode.rt.PiccodeTuple;
 import org.piccode.rt.PiccodeValue;
 
@@ -16,16 +19,29 @@
 public class PiccodeTypesModule {
 	public static void addFunctions() {
 
-		NativeFunctionFactory.create("tuplesize", List.of("tuple"), (args, namedArgs) -> {
-				var arr = ((PiccodeTuple) namedArgs.get("tuple")).array().length;
-				return new PiccodeNumber("" + arr);
+		NativeFunctionFactory.create("isnumber", List.of("value"), (args, namedArgs) -> {
+			var value = namedArgs.get("value");
+			return new PiccodeBoolean(String.valueOf(value instanceof PiccodeNumber));
 		});
 
-		NativeFunctionFactory.create("tupletoarray", List.of("tuple"), (args, namedArgs) -> {
-				var arr = ((PiccodeTuple) namedArgs.get("tuple")).array();
-				var list = new ArrayList<PiccodeValue>();
-				list.addAll(Arrays.asList(arr));
-				return new PiccodeArray(list);
+		NativeFunctionFactory.create("isstring", List.of("value"), (args, namedArgs) -> {
+			var value = namedArgs.get("value");
+			return new PiccodeBoolean(String.valueOf(value instanceof PiccodeString));
+		});
+
+		NativeFunctionFactory.create("isobject", List.of("value"), (args, namedArgs) -> {
+			var value = namedArgs.get("value");
+			return new PiccodeBoolean(String.valueOf(value instanceof PiccodeObject));
+		});
+
+		NativeFunctionFactory.create("isarr", List.of("value"), (args, namedArgs) -> {
+			var value = namedArgs.get("value");
+			return new PiccodeBoolean(String.valueOf(value instanceof PiccodeArray));
+		});
+
+		NativeFunctionFactory.create("istuple", List.of("value"), (args, namedArgs) -> {
+			var value = namedArgs.get("value");
+			return new PiccodeBoolean(String.valueOf(value instanceof PiccodeTuple));
 		});
 
 	}