Change ~= to |= for the programmative style

src/catala/ir/context.ml

@@ -261,7 +261,7 @@ let get_subscope_uid (scope_uid : uid) (ctxt : context) ((y, pos) : ident Pos.ma
       | _ ->
           let err_msg =
             Printf.sprintf "Identifier \"%s\" should be a subscope, but it isn't\n%s" y
-              (Pos.to_string pos)
+              (Pos.retrieve_loc_text pos)
           in
           Errors.context_error err_msg )
 

src/catala/parsing/lexer.ml

@@ -25,7 +25,7 @@ let update_acc (lexbuf : lexbuf) : unit = code_string_acc := !code_string_acc ^
 let token_list : (string * token) list =
   [
     ("scope", SCOPE);
-    ("~", CONSEQUENCE);
+    ("|", CONSEQUENCE);
     ("data", DATA);
     ("depends on", DEPENDS);
     ("declaration", DECLARATION);
@@ -67,8 +67,8 @@ let token_list : (string * token) list =
     ("such", SUCH);
     ("that", THAT);
     ("now", NOW);
-    ("and", AND);
-    ("or", OR);
+    ("&&", AND);
+    ("||", OR);
     ("not", NOT);
     ("number", CARDINAL);
     ("year", YEAR);
@@ -163,9 +163,6 @@ let rec lex_code (lexbuf : lexbuf) : token =
   | "if" ->
       update_acc lexbuf;
       IF
-  | "~" ->
-      update_acc lexbuf;
-      CONSEQUENCE
   | "then" ->
       update_acc lexbuf;
       THEN
@@ -227,15 +224,18 @@ let rec lex_code (lexbuf : lexbuf) : token =
   | "now" ->
       update_acc lexbuf;
       NOW
-  | "and" ->
+  | "&&" ->
       update_acc lexbuf;
       AND
-  | "or" ->
+  | "||" ->
       update_acc lexbuf;
       OR
   | "not" ->
       update_acc lexbuf;
       NOT
+  | "|" ->
+      update_acc lexbuf;
+      CONSEQUENCE
   | "number" ->
       update_acc lexbuf;
       CARDINAL

tests/test_bool/test_bool.catala

@@ -5,6 +5,6 @@ declaration scope TestBool :
 
 scope TestBool :
   def bar = 1
-  def foo ? bar >= 0 ~= true
-	def foo ? bar < 0 ~= false 
+  def foo ? bar >= 0 |= true
+	def foo ? bar < 0 |= false 
 */

tests/test_scope/scope.catala

@@ -6,8 +6,8 @@ declaration scope A:
 
 scope A:
   def c = false
-  def a ? c ~= 42
-  def a ? not c ~= 0
-  def b ? not c ~= 1337
-  def b ? not c ~= 0
+  def a ? c |= 42
+  def a ? not c |= 0
+  def b ? not c |= 1337
+  def b ? not c |= 0
 */

tests/test_scope/sub_scope.catala

@@ -22,5 +22,5 @@ scope A:
 scope B:
   def a = 42
   def b = scopeA.b
-  def scopeA.a ? a > 0 ~= scopeA.a_base 
+  def scopeA.a ? a > 0 |= scopeA.a_base 
 */