Merge pull request #446 from AAVSO/357-alternative-vela-block-and-sel…

…ection-syntax 357 alternative vela block and selection syntax
AAVSO · Jul 27, 2024 · 96619c6 · 96619c6
2 parents 517e071 + 7910ee7
commit 96619c6
Show file tree

Hide file tree

Showing 9 changed files with 560 additions and 442 deletions.
diff --git a/script/VeLa/fact.vl b/script/VeLa/fact.vl
@@ -1,9 +1,7 @@
-#!/usr/bin/env /Users/david/vstar/script/VeLa/VeLa.sh --verbose
+#!/usr/bin/env /Users/david/vstar/script/VeLa/VeLa.sh #--verbose
 
 n!(n:integer) : integer {
-    when
-        n <= 0 -> 1
-        true -> n*n!(n-1)
+    if n <= 0 then 1 else n*n!(n-1)
 }
 
 x <- n!(6)

diff --git a/script/VeLa/piecewise_linear_model.vl b/script/VeLa/piecewise_linear_model.vl
@@ -10,7 +10,7 @@ genf() : function {
 
  f(t:real) : real {
   -- is time coordinate beyond end of current line segment?
-  when t > nth(times i+1) and i < length(times)-1 -> { 
+  if t > nth(times i+1) and i < length(times)-1 then {
     i <- i+1 
   }
 
@@ -37,7 +37,7 @@ gendf() : function {
 
  df(t:real) : real {
   -- is time coordinate beyond end of current line segment?
-  when t > nth(times i+1) and i < length(times)-1 -> { 
+  if t > nth(times i+1) and i < length(times)-1 then {
     i <- i+1 
   }
 

diff --git a/script/VeLa/velarepl.vl b/script/VeLa/velarepl.vl
@@ -20,12 +20,12 @@ repl() {
   while true {
     print("==> ")
     str <- read()
-    when 
-      str =~ "^\s*exit\s*$" -> { exit(0) }
-      true -> { 
-      	 result <- eval(str) 
-      	 when length(result) <> 0 -> println(head(result)) 
-      }
+    if str =~ "^\s*exit\s*$" then
+        exit(0)
+    else {
+        result <- eval(str)
+        if length(result) <> 0 then println(head(result))
+    }
   }
 }
 

diff --git a/src/org/aavso/tools/vstar/vela/AST.java b/src/org/aavso/tools/vstar/vela/AST.java
@@ -178,7 +178,7 @@ public Type getLiteralType() {
 	 */
 	public boolean isDeterministic() {
 		boolean deterministic = op != Operation.FUNCALL
-				&& op != Operation.SYMBOL && op != Operation.SELECT;
+				&& op != Operation.SYMBOL && op != Operation.WHEN;
 
 		if (deterministic && !isLeaf()) {
 			for (AST child : children) {