Changed unary not to "!", added core math module, three quotes for block strings

Author: tomdodd4598

README.md

@@ -16,6 +16,7 @@ All documentation can be found in the [wiki](https://github.com/tomdodd4598/Dodd
 Planned Features
 ----------------
 
+- Combine TypeElement into ClassElement
 - Various keywords replaced with static or member functions.
 
 Permissions

run/classes.dssl

@@ -95,25 +95,25 @@ item .printRecursive
 
 	/i 0.0 1.0 Complex new def
 
-	/binOpSetup "dup .re /xre exch def .im /xim exch def dup .re /yre exch def .im /yim exch def" def
+	/binaryDefs "dup .re /xre exch def .im /xim exch def dup .re /yre exch def .im /yim exch def" def
 
 	/add {
-		Complex .binOpSetup interpret
+		Complex .binaryDefs interpret
 		xre yre + xim yim + Complex new
 	} magic
 
 	/sub {
-		Complex .binOpSetup interpret
+		Complex .binaryDefs interpret
 		xre yre - xim yim - Complex new
 	} magic
 
 	/mul {
-		Complex .binOpSetup interpret
+		Complex .binaryDefs interpret
 		xre yre * xim yim * - xre yim * xim yre * + Complex new
 	} magic
 
 	/div {
-		Complex .binOpSetup interpret
+		Complex .binaryDefs interpret
 		/ysq yre yre * yim yim * + def
 		xre yre * xim yim * + ysq / xim yre * xre yim * - ysq / Complex new
 	} magic

src/dssl.sable

@@ -16,17 +16,14 @@ Helpers
 
 	apostrophe = 39;
 	quote = 34;
-	tick = 96;
+	multi_quote = quote quote quote;
 	not_eol = [all - [cr + lf]];
 	escape_char = '\' not_eol;
-	multi_tick = tick tick tick;
 
 	c_char = [all - [apostrophe + ['\' + [lf + cr]]]] | escape_char;
 	c_char_sequence = c_char+;
 	s_char = [all - [quote + ['\' + [lf + cr]]]] | escape_char;
 	s_char_sequence = s_char*;
-	b_char = [all - [tick + '\']] | escape_char;
-	b_char_sequence = b_char*;
 
 	not_star = [all - '*'];
 	not_star_slash = [not_star - '/'];
@@ -176,17 +173,17 @@ Tokens
 	idivide = '//';
 	modulo = '%%';
 
-	not = 'not';
-	neg = 'neg';
+	not = '!';
 
 	int_value = sign? digit+;
 	bool_value = 'true' | 'false';
 	float_value = sign? (digit+ '.' digit* | '.' digit+);
 	char_value = apostrophe c_char apostrophe;
 
 	line_string_value = 'r'? quote s_char_sequence quote;
-	block_string_value = 'r'? multi_tick whitespace* eol b_char_sequence multi_tick;
+	block_string_value = 'r'? multi_quote whitespace* eol s_char_sequence multi_quote;
 
 	identifier = name;
 	label = '/' name;
 	member = '.' name;
+	module = '$' name;

src/dssl/Helpers.java

@@ -66,6 +66,15 @@ public static Token getLexerNext(Lexer lexer) {
 		}
 	}
 
+	public static <T> @NonNull T checkNonNull(T value) {
+		if (value == null) {
+			throw new IllegalArgumentException(String.format("Encountered invalid null value!"));
+		}
+		else {
+			return value;
+		}
+	}
+	
 	public static String lowerCase(String str) {
 		return str.toLowerCase(Locale.ROOT);
 	}
@@ -99,15 +108,14 @@ public static int leadingWhitespaceCount(String str) {
 		unescapeMap.put("\\\\", "\\");
 		unescapeMap.put("\\'", "'");
 		unescapeMap.put("\\\"", "\"");
-		unescapeMap.put("\\`", "`");
 		unescapeMap.put("\\", "");
 
 		UNESCAPE_TRANSLATOR = new LookupTranslator(unescapeMap);
 	}
 
-	public static @NonNull String parseString(String str) {
+	public static @NonNull String parseString(String str, int prefixLength, int suffixLength) {
 		boolean raw = str.charAt(0) == 'r';
-		int start = raw ? 2 : 1, end = str.length() - 1;
+		int start = (raw ? 1 : 0) + prefixLength, end = str.length() - suffixLength;
 		String parsed = raw ? str.substring(start, end) : UNESCAPE_TRANSLATOR.translate(CharBuffer.wrap(str, start, end));
 		if (parsed == null) {
 			throw new RuntimeException(String.format("Failed to parse token %s!", str));
@@ -116,19 +124,19 @@ public static int leadingWhitespaceCount(String str) {
 	}
 
 	public static @NonNull Character parseChar(String str) {
-		String parsed = parseString(str);
+		String parsed = parseString(str, 1, 1);
 		if (parsed.length() != 1) {
 			throw new IllegalArgumentException(String.format("Character value %s is invalid!", str));
 		}
 		return parsed.charAt(0);
 	}
 
 	public static @NonNull String parseLineString(String str) {
-		return parseString(str);
+		return parseString(str, 1, 1);
 	}
 
 	public static @NonNull String parseBlockString(String str) {
-		String[] lines = parseString(str).split("\\r?\\n");
+		String[] lines = parseString(str, 3, 3).split("\\r?\\n");
 		boolean[] blanks = new boolean[lines.length];
 		int commonWhitespace = -1;
 		for (int i = 1; i < lines.length; ++i) {
@@ -189,7 +197,7 @@ public static <A, B> Set<B> map(Set<A> set, Function<A, B> function) {
 		return Collectors.toMap(x -> keyFunction.apply(x.getKey()), x -> valueFunction.apply(x.getValue()), mergeFunction);
 	}
 
-	public static final Set<String> KEYWORDS;
+	public static final Set<String> KEYWORDS = new HashSet<>();
 
 	public static final String L_BRACE = "{";
 	public static final String R_BRACE = "}";
@@ -333,8 +341,6 @@ public static <A, B> Set<B> map(Set<A> set, Function<A, B> function) {
 	public static final String NEG = "neg";
 
 	static {
-		KEYWORDS = new HashSet<>();
-		
 		KEYWORDS.add(L_BRACE);
 		KEYWORDS.add(R_BRACE);
 

src/dssl/Hierarchy.java

@@ -1,6 +1,7 @@
 package dssl;
 
 import java.util.*;
+import java.util.Map.Entry;
 
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -39,6 +40,15 @@ protected Hierarchy(Map<K, V> internal, List<Hierarchy<K, V>> parents) {
 		return prev;
 	}
 
+	public void putAll(Hierarchy<K, V> other, boolean shadow) {
+		for (Entry<K, V> entry : other.internal.entrySet()) {
+			put(entry.getKey(), entry.getValue(), shadow);
+		}
+		for (Hierarchy<K, V> parent : other.parents) {
+			putAll(parent, shadow);
+		}
+	}
+	
 	public @Nullable V get(K key) {
 		if (internal.containsKey(key)) {
 			return internal.get(key);

src/dssl/Main.java

@@ -72,22 +72,25 @@ public String read() {
 
 		Module moduleImpl = new Module() {
 
-			// TODO: INTRINSIC MODULES
-			
 			@Override
 			public TokenResult onInclude(TokenExecutor exec) {
 				@NonNull Element elem = exec.pop();
 				StringElement stringElem = elem.stringCastImplicit();
-				if (stringElem == null) {
-					throw new IllegalArgumentException(String.format("Keyword \"include\" requires string value element as argument!"));
+				if (stringElem != null) {
+					try (PushbackReader reader = Helpers.getPushbackReader(new FileReader(stringElem.toString()))) {
+						return new TokenExecutor(new LexerIterator(reader), exec, false).iterate();
+					}
+					catch (Exception e) {
+						e.printStackTrace();
+						throw new RuntimeException();
+					}
 				}
-				
-				try (PushbackReader reader = Helpers.getPushbackReader(new FileReader(stringElem.toString()))) {
-					return new TokenExecutor(new LexerIterator(reader), exec, false).iterate();
+				else if (elem instanceof ModuleElement) {
+					exec.putAll(((ModuleElement) elem).clazz, true);
+					return TokenResult.PASS;
 				}
-				catch (Exception e) {
-					e.printStackTrace();
-					throw new RuntimeException();
+				else {
+					throw new IllegalArgumentException(String.format("Keyword \"include\" requires string or module element as argument!"));
 				}
 			}
 
@@ -99,19 +102,23 @@ public TokenResult onImport(TokenExecutor exec) {
 				}
 
 				StringElement stringElem = elem1.stringCastImplicit();
-				if (stringElem == null) {
-					throw new IllegalArgumentException(String.format("Keyword \"import\" requires string value element as second argument!"));
+				if (stringElem != null) {
+					try (PushbackReader reader = Helpers.getPushbackReader(new FileReader(stringElem.toString()))) {
+						TokenExecutor otherExec = exec.interpreter.newExecutor(new LexerIterator(reader));
+						((LabelElement) elem0).setClazz(otherExec, new ArrayList<>());
+						return otherExec.iterate();
+					}
+					catch (Exception e) {
+						e.printStackTrace();
+						throw new RuntimeException();
+					}
 				}
-				
-				try (PushbackReader reader = Helpers.getPushbackReader(new FileReader(stringElem.toString()))) {
-					TokenExecutor otherExec = exec.interpreter.newExecutor(new LexerIterator(reader));
-					TokenResult result = otherExec.iterate();
-					((LabelElement) elem0).setClazz(otherExec, new ArrayList<>());
-					return result;
+				else if (elem1 instanceof ModuleElement) {
+					((LabelElement) elem0).setClazz(((ModuleElement) elem1).clazz, new ArrayList<>());
+					return TokenResult.PASS;
 				}
-				catch (Exception e) {
-					e.printStackTrace();
-					throw new RuntimeException();
+				else {
+					throw new IllegalArgumentException(String.format("Keyword \"import\" requires string or module element as second argument!"));
 				}
 			}
 		};

src/dssl/NativeImpl.java

@@ -21,7 +21,7 @@ public TokenResult onNative(TokenExecutor exec) {
 		@NonNull Element elem = exec.pop();
 		StringElement stringElem = elem.stringCastImplicit();
 		if (stringElem == null) {
-			throw new IllegalArgumentException(String.format("Keyword \"native\" requires string value element as last argument!"));
+			throw new IllegalArgumentException(String.format("Keyword \"native\" requires string element as last argument!"));
 		}
 
 		String str = stringElem.toString();

src/dssl/analysis/Analysis.java

@@ -120,7 +120,6 @@ public interface Analysis extends Switch
     void caseTIdivide(TIdivide node);
     void caseTModulo(TModulo node);
     void caseTNot(TNot node);
-    void caseTNeg(TNeg node);
     void caseTIntValue(TIntValue node);
     void caseTBoolValue(TBoolValue node);
     void caseTFloatValue(TFloatValue node);
@@ -130,6 +129,7 @@ public interface Analysis extends Switch
     void caseTIdentifier(TIdentifier node);
     void caseTLabel(TLabel node);
     void caseTMember(TMember node);
+    void caseTModule(TModule node);
     void caseEOF(EOF node);
     void caseInvalidToken(InvalidToken node);
 }

src/dssl/analysis/AnalysisAdapter.java

@@ -722,12 +722,6 @@ public void caseTNot(TNot node)
         defaultCase(node);
     }
 
-    @Override
-    public void caseTNeg(TNeg node)
-    {
-        defaultCase(node);
-    }
-
     @Override
     public void caseTIntValue(TIntValue node)
     {
@@ -782,6 +776,12 @@ public void caseTMember(TMember node)
         defaultCase(node);
     }
 
+    @Override
+    public void caseTModule(TModule node)
+    {
+        defaultCase(node);
+    }
+
     @Override
     public void caseEOF(EOF node)
     {

src/dssl/interpret/BuiltIn.java

@@ -0,0 +1,94 @@
+package dssl.interpret;
+
+import java.util.*;
+
+import org.eclipse.jdt.annotation.NonNull;
+
+public class BuiltIn {
+	
+	public static final Map<@NonNull String, Clazz> CLAZZ_MAP = new HashMap<>();
+	public static final Map<@NonNull String, Clazz> MODULE_MAP = new HashMap<>();
+	
+	public static final @NonNull Clazz INT_CLAZZ;
+	public static final @NonNull Clazz BOOL_CLAZZ;
+	public static final @NonNull Clazz FLOAT_CLAZZ;
+	public static final @NonNull Clazz CHAR_CLAZZ;
+	public static final @NonNull Clazz STRING_CLAZZ;
+	
+	public static final @NonNull Clazz RANGE_CLAZZ;
+	public static final @NonNull Clazz LIST_CLAZZ;
+	public static final @NonNull Clazz TUPLE_CLAZZ;
+	public static final @NonNull Clazz SET_CLAZZ;
+	public static final @NonNull Clazz DICT_CLAZZ;
+	
+	public static final @NonNull Clazz MATH_MODULE;
+	
+	static {
+		INT_CLAZZ = clazz("int");
+		BOOL_CLAZZ = clazz("bool");
+		FLOAT_CLAZZ = clazz("float");
+		CHAR_CLAZZ = clazz("char");
+		STRING_CLAZZ = clazz("string");
+		
+		RANGE_CLAZZ = clazz("range");
+		LIST_CLAZZ = clazz("list");
+		TUPLE_CLAZZ = clazz("tuple");
+		SET_CLAZZ = clazz("set");
+		DICT_CLAZZ = clazz("dict");
+		
+		MATH_MODULE = module("math");
+	}
+	
+	static @NonNull Clazz clazz(@NonNull String name) {
+		Clazz clazz = new Clazz(name);
+		CLAZZ_MAP.put(name, clazz);
+		return clazz;
+	}
+	
+	static @NonNull Clazz module(@NonNull String name) {
+		Clazz module = new Clazz(name);
+		MODULE_MAP.put(name, module);
+		return module;
+	}
+	
+	static {
+		MATH_MODULE.setMacro("neg", TokenExecutor::neg);
+		MATH_MODULE.setMacro("abs", TokenExecutor::abs);
+		MATH_MODULE.setMacro("sgn", TokenExecutor::sgn);
+		MATH_MODULE.setMacro("floor", TokenExecutor::floor);
+		MATH_MODULE.setMacro("ceil", TokenExecutor::ceil);
+		MATH_MODULE.setMacro("round", TokenExecutor::round);
+		
+		MATH_MODULE.setMacro("sin", TokenExecutor::sin);
+		MATH_MODULE.setMacro("cos", TokenExecutor::cos);
+		MATH_MODULE.setMacro("tan", TokenExecutor::tan);
+		MATH_MODULE.setMacro("asin", TokenExecutor::asin);
+		MATH_MODULE.setMacro("acos", TokenExecutor::acos);
+		MATH_MODULE.setMacro("atan", TokenExecutor::atan);
+		
+		MATH_MODULE.setMacro("sinc", TokenExecutor::sinc);
+		MATH_MODULE.setMacro("atan2", TokenExecutor::atan2);
+		
+		MATH_MODULE.setMacro("rads", TokenExecutor::rads);
+		MATH_MODULE.setMacro("degs", TokenExecutor::degs);
+		
+		MATH_MODULE.setMacro("exp", TokenExecutor::exp);
+		MATH_MODULE.setMacro("log", TokenExecutor::log);
+		MATH_MODULE.setMacro("log10", TokenExecutor::log10);
+		MATH_MODULE.setMacro("sqrt", TokenExecutor::sqrt);
+		MATH_MODULE.setMacro("cbrt", TokenExecutor::cbrt);
+		
+		MATH_MODULE.setMacro("expm1", TokenExecutor::expm1);
+		MATH_MODULE.setMacro("log1p", TokenExecutor::log1p);
+		
+		MATH_MODULE.setMacro("sinh", TokenExecutor::sinh);
+		MATH_MODULE.setMacro("cosh", TokenExecutor::cosh);
+		MATH_MODULE.setMacro("tanh", TokenExecutor::tanh);
+		MATH_MODULE.setMacro("asinh", TokenExecutor::asinh);
+		MATH_MODULE.setMacro("acosh", TokenExecutor::acosh);
+		MATH_MODULE.setMacro("atanh", TokenExecutor::atanh);
+		
+		MATH_MODULE.setMacro("min", TokenExecutor::min);
+		MATH_MODULE.setMacro("max", TokenExecutor::max);
+	}
+}