fixing literal as subject

KNowledgeOnWebScale · Mar 26, 2024 · aea649b · aea649b
1 parent 34f6a4f
commit aea649b
Show file tree

Hide file tree

Showing 17 changed files with 6,227 additions and 6,224 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.2
+1.1.3
diff --git a/lingua/acp.trig b/lingua/acp.trig
@@ -47,7 +47,7 @@ _:ng6 {
     var:Pol a :Policy.
     (var:Field _:ng7 var:List) log:collectAllIn var:X.
     var:List list:length var:L.
-    var:L log:notEqualTo 0.
+    (var:L) log:notEqualTo (0).
 }
 
 _:ng7 {
@@ -66,7 +66,7 @@ _:ng9 {
     var:Pol a :Policy.
     (var:Field _:ng10 var:List) log:collectAllIn var:X.
     var:List list:length var:L.
-    var:L log:equalTo 0.
+    (var:L) log:equalTo (0).
 }
 
 _:ng10 {

diff --git a/lingua/backward.trig b/lingua/backward.trig
@@ -17,7 +17,7 @@ _:ng1 {
 }
 
 _:ng2 {
-    var:X math:greaterThan var:Y.
+    (var:X) math:greaterThan var:Y.
 }
 
 # query

diff --git a/lingua/complex.trig b/lingua/complex.trig
@@ -20,16 +20,16 @@ _:ng1 {
 _:ng2 {
     (var:A var:B) complex:polar (var:R var:T).
     (var:R var:C) math:exponentiation var:Z1.
-    var:D math:negation var:Z2.
+    (var:D) math:negation var:Z2.
     (var:Z2 var:T) math:product var:Z3.
     (2.718281828459045 var:Z3) math:exponentiation var:Z4.
     (2.718281828459045 var:Z5) math:exponentiation var:R.
     (var:D var:Z5) math:product var:Z6.
     (var:C var:T) math:product var:Z7.
     (var:Z6 var:Z7) math:sum var:Z8.
-    var:Z8 math:cos var:Z9.
+    (var:Z8) math:cos var:Z9.
     (var:Z1 var:Z4 var:Z9) math:product var:E.
-    var:Z8 math:sin var:Z10.
+    (var:Z8) math:sin var:Z10.
     (var:Z1 var:Z4 var:Z10) math:product var:F.
 }
 
@@ -54,7 +54,7 @@ _:ng4 {
     (var:Z10 2) math:quotient var:E.
     (var:Z5 var:Z9) math:sum var:Z11.
     (var:Z11 2) math:quotient var:F.
-    var:E math:asin var:C.
+    (var:E) math:asin var:C.
     (var:F 2) math:exponentiation var:Z12.
     (var:Z12 1) math:difference var:Z13.
     (var:Z13 0.5) math:exponentiation var:Z14.
@@ -83,13 +83,13 @@ _:ng6 {
     (var:Z10 2) math:quotient var:E.
     (var:Z5 var:Z9) math:sum var:Z11.
     (var:Z11 2) math:quotient var:F.
-    var:E math:acos var:C.
+    (var:E) math:acos var:C.
     (var:F 2) math:exponentiation var:Z12.
     (var:Z12 1) math:difference var:Z13.
     (var:Z13 0.5) math:exponentiation var:Z14.
     (var:F var:Z14) math:sum var:Z15.
     (2.718281828459045 var:U) math:exponentiation var:Z15.
-    var:U math:negation var:D.
+    (var:U) math:negation var:D.
 }
 
 # polar
@@ -104,9 +104,9 @@ _:ng8 {
     (var:Y 2) math:exponentiation var:Z2.
     (var:Z1 var:Z2) math:sum var:Z3.
     (var:Z3 0.5) math:exponentiation var:R.
-    var:X math:absoluteValue var:Z4.
+    (var:X) math:absoluteValue var:Z4.
     (var:Z4 var:R) math:quotient var:Z5.
-    var:Z5 math:acos var:T.
+    (var:Z5) math:acos var:T.
     (var:X var:Y var:T) complex:dial var:Tp.
 }
 
@@ -118,8 +118,8 @@ _:ng9 {
 }
 
 _:ng10 {
-    var:X math:notLessThan 0.
-    var:Y math:notLessThan 0.
+    (var:X) math:notLessThan 0.
+    (var:Y) math:notLessThan 0.
     (0 var:T) math:sum var:Tp.
 }
 
@@ -130,8 +130,8 @@ _:ng11 {
 }
 
 _:ng12 {
-    var:X math:lessThan 0.
-    var:Y math:notLessThan 0.
+    (var:X) math:lessThan 0.
+    (var:Y) math:notLessThan 0.
     (3.141592653589793 var:T) math:difference var:Tp.
 }
 
@@ -142,8 +142,8 @@ _:ng13 {
 }
 
 _:ng14 {
-    var:X math:lessThan 0.
-    var:Y math:lessThan 0.
+    (var:X) math:lessThan 0.
+    (var:Y) math:lessThan 0.
     (3.141592653589793 var:T) math:sum var:Tp.
 }
 
@@ -154,8 +154,8 @@ _:ng15 {
 }
 
 _:ng16 {
-    var:X math:notLessThan 0.
-    var:Y math:lessThan 0.
+    (var:X) math:notLessThan 0.
+    (var:Y) math:lessThan 0.
     (3.141592653589793 2) math:product var:Z1.
     (var:Z1 var:T) math:difference var:Tp.
 }

diff --git a/lingua/easter.trig b/lingua/easter.trig
@@ -38,16 +38,16 @@ _:ng2 {
     (var:x3 4) math:remainder var:x18.
     (2 var:x5) math:product var:x19.
     (2 var:x17) math:product var:x20.
-    var:x16 math:negation var:x21.
-    var:x18 math:negation var:x22.
+    (var:x16) math:negation var:x21.
+    (var:x18) math:negation var:x22.
     (32 var:x19 var:x20 var:x21 var:x22) math:sum var:x23.
     (var:x23 7) math:remainder var:x24.
     (11 var:x16) math:product var:x25.
     (22 var:x24) math:product var:x26.
     (var:x1 var:x25 var:x26) math:sum var:x27.
     (var:x27 451) math:integerQuotient var:x28.
     (7 var:x28) math:product var:x29.
-    var:x29 math:negation var:x30.
+    (var:x29) math:negation var:x30.
     (var:x16 var:x24 var:x30 114) math:sum var:x31.
     (var:x31 31) math:integerQuotient var:x32.
     (var:x31 31) math:remainder var:x33.

diff --git a/lingua/fibonacci.trig b/lingua/fibonacci.trig
@@ -39,7 +39,7 @@ _:ng5 {
 }
 
 _:ng6 {
-    var:X math:greaterThan 1.
+    (var:X) math:greaterThan 1.
     (var:X 1) math:difference var:C.
     (var:A var:B) math:sum var:D.
     (var:C var:B var:D) :fib var:Y.

diff --git a/lingua/gps.trig b/lingua/gps.trig
@@ -74,15 +74,15 @@ _:ng8 {
     var:Map gps:description (var:From var:Transition var:To var:Action var:Duration_n var:Cost_n var:Belief_n var:Comfort_n).
     (var:Maps_s (var:Map)) list:append var:Maps_t.
     var:Maps_t gps:stagecount var:Stagecount.
-    var:Stagecount math:notGreaterThan var:MaxStagecount.
+    (var:Stagecount) math:notGreaterThan var:MaxStagecount.
     (var:Duration_s var:Duration_n) math:sum var:Duration_t.
-    var:Duration_t math:notGreaterThan var:MaxDuration.
+    (var:Duration_t) math:notGreaterThan var:MaxDuration.
     (var:Cost_s var:Cost_n) math:sum var:Cost_t.
-    var:Cost_t math:notGreaterThan var:MaxCost.
+    (var:Cost_t) math:notGreaterThan var:MaxCost.
     (var:Belief_s var:Belief_n) math:product var:Belief_t.
-    var:Belief_t math:notLessThan var:MinBelief.
+    (var:Belief_t) math:notLessThan var:MinBelief.
     (var:Comfort_s var:Comfort_n) math:product var:Comfort_t.
-    var:Comfort_t math:notLessThan var:MinComfort.
+    (var:Comfort_t) math:notLessThan var:MinComfort.
     (var:Path_s (var:Action)) list:append var:Path_t.
     var:From log:becomes var:To.
     _:ng9 log:callWithCleanup _:ng10.

diff --git a/lingua/output/acp.trig b/lingua/output/acp.trig
@@ -28,9 +28,9 @@ _:gn_2 {
 _:gn_3 {
     :test1 :policy :PolicyX.
     :PolicyX a :Policy.
-    (var:_7042 _:gn_9 (:C)) log:collectAllIn ((<https://eyereasoner.github.io/see-lingua/lingua/acp.trig>) 1).
+    (var:_7298 _:gn_9 (:C)) log:collectAllIn ((<https://eyereasoner.github.io/see-lingua/lingua/acp.trig>) 1).
     (:C) list:length 1 .
-    1 log:notEqualTo 0.
+    (1) log:notEqualTo (0).
 }
 
 _:gn_4 {
@@ -40,29 +40,29 @@ _:gn_4 {
 _:gn_5 {
     :test1 :policy :PolicyX.
     :PolicyX a :Policy.
-    (var:_7042 _:gn_10 ()) log:collectAllIn ((<https://eyereasoner.github.io/see-lingua/lingua/acp.trig>) 1).
+    (var:_7298 _:gn_10 ()) log:collectAllIn ((<https://eyereasoner.github.io/see-lingua/lingua/acp.trig>) 1).
     () list:length 0 .
-    0 log:equalTo 0.
+    (0) log:equalTo (0).
 }
 
 _:gn_6 {
     :PolicyX :pass :noneOfTest.
 }
 
 _:gn_7 {
-    :PolicyX :allOf var:_7044.
+    :PolicyX :allOf var:_7300.
 }
 
 _:gn_8 {
-    :test1 :has var:_7044.
+    :test1 :has var:_7300.
 }
 
 _:gn_9 {
-    :PolicyX :anyOf var:_7050 .
-    :test1 :has var:_7050.
+    :PolicyX :anyOf var:_7306 .
+    :test1 :has var:_7306.
 }
 
 _:gn_10 {
-    :PolicyX :noneOf var:_7050 .
-    :test1 :has var:_7050.
+    :PolicyX :noneOf var:_7306 .
+    :test1 :has var:_7306.
 }
diff --git a/lingua/output/backward.trig b/lingua/output/backward.trig
@@ -11,7 +11,7 @@
 _:gn_1 lingua:explanation _:gn_2.
 
 _:gn_1 {
-    5 math:greaterThan 3.
+    (5) math:greaterThan 3.
 }
 
 _:gn_2 {