From 54cefddd5107d045dd6da5ebda1870c122fc32e5 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Fri, 5 Jun 2020 12:27:06 +0200
Subject: [PATCH] Merge

---
 .../reasonligo/Pretty.ml                      |  0
 src/passes/1-parser/cameligo/Tests/pp.mligo   | 29 ------
 src/passes/1-parser/pascaligo/Tests/pp.ligo   | 91 -------------------
 3 files changed, 120 deletions(-)
 rename src/passes/{1-parser => 01-parser}/reasonligo/Pretty.ml (100%)
 delete mode 100644 src/passes/1-parser/cameligo/Tests/pp.mligo
 delete mode 100644 src/passes/1-parser/pascaligo/Tests/pp.ligo

diff --git a/src/passes/1-parser/reasonligo/Pretty.ml b/src/passes/01-parser/reasonligo/Pretty.ml
similarity index 100%
rename from src/passes/1-parser/reasonligo/Pretty.ml
rename to src/passes/01-parser/reasonligo/Pretty.ml
diff --git a/src/passes/1-parser/cameligo/Tests/pp.mligo b/src/passes/1-parser/cameligo/Tests/pp.mligo
deleted file mode 100644
index d84c270aa..000000000
--- a/src/passes/1-parser/cameligo/Tests/pp.mligo
+++ /dev/null
@@ -1,29 +0,0 @@
-type q = {a: int; b: {c: string}}
-type r = int list
-type s = (int, address) map
-type t = int
-type u = {a: int; b: t * char}
-type v = int * (string * address)
-type w = timestamp * nat -> (string, address) map
-type x = A | B of t * int | C of int -> (string -> int)
-
-let x = 4
-let y : t = (if true then -3 + f x x else 0) - 1
-let f (x: int) y = (x : int)
-let z : (t) = y
-let w =
-  match f 3 with
-    None -> []
-  | Some (1::[2;3]) -> [4;5]::[]
-let n : nat = 0n
-let a = A
-let b = B a
-let c = C (a, B (a))
-let d = None
-let e = Some (a, B b)
-let z = z.1.2
-let v = "hello" ^ "world" ^ "!"
-let w = Map.literal [(1,"1"); (2,"2")]
-
-let r = { field = 0}
-let r = { r with field = 42}
diff --git a/src/passes/1-parser/pascaligo/Tests/pp.ligo b/src/passes/1-parser/pascaligo/Tests/pp.ligo
deleted file mode 100644
index f4b185f69..000000000
--- a/src/passes/1-parser/pascaligo/Tests/pp.ligo
+++ /dev/null
@@ -1,91 +0,0 @@
-type t is timestamp * nat -> map (string, address)
-type u is A | B of t * int | C of int -> (string -> int)
-type v is record a : t; b : record c : string end end
-
-function back (var store : store) : list (operation) * store is
-  var operations : list (operation) := list []
-  begin
-    const a : nat =  0n;
-    x0 := record foo = "1"; bar = 4n end;
-    x1 := nil;
-    x2 := list end;
-    x3 := 3#4# list [5; 6];
-    case foo of
-      10n -> skip
-    end;
-    if s contains x then skip else skip;
-    s := set [3_000mtz; -2; 1n];
-    a := A;
-    b := B (a);
-    c := C (a, B (a));
-    d := None;
-    e := Some (a, B (b));
-    z := z.1.2;
-    x := map [1 -> "1"; 2 -> "2"];
-    y := a.b.c[3];
-    a := "hello " ^ "world" ^ "!";
-    patch store.backers with set [(1); f(2*3)];
-    remove (1,2,3) from set foo.bar;
-    remove 3 from map foo.bar;
-    patch store.backers with map [sender -> amount];
-    if now > store.deadline and (not True) then
-      begin
-        f (x,1);
-        for k -> d : int * string in map m block { skip };
-        for x : int in set s block { skip };
-        while i < 10n
-          begin
-            acc := 2 - (if toggle then f(x) else Unit);
-          end;
-        for i := 1n to 10n
-          begin
-            acc := acc + i;
-          end;
-        failwith ("Deadline passed");
-      end
-    else
-      case store.backers[sender] of [
-        None -> store.0.backers[sender] := amount
-      | Some (_) -> skip
-      | B (x, C (y,z)) -> skip
-      | False#True#Unit#0xAA#"hi"#4#nil -> skip
-      ]
-  end with (operations, store)
-
-function claim (var store : store) : list (operation) * store is
-  var operations : list (operation) := nil
-  begin
-    if now <= store.deadline then
-      failwith ("Too soon.")
-    else
-      case store.backers[sender] of
-        None ->
-          failwith ("Not a backer.")
-      | Some (amount) ->
-          if balance >= store.goal or store.funded then
-            failwith ("Goal reached: no refund.")
-          else
-            begin
-              operations.0.foo := list [transaction (unit, sender, amount)];
-              remove sender from map store.backers
-            end
-      end
-  end with (operations, store)
-
-function withdraw (var store : store) : list (operation) * store is
-  var operations : list (operation) := list end
-  begin
-    if sender = owner then
-      if now >= store.deadline then
-        if balance >= store.goal then {
-//             store.funded := True;
-          patch store with record funded = True; a = b end;
-          operations := list [Transfer (owner, balance)];
-        };
-        else failwith ("Below target.")
-      else failwith ("Too soon.");
-    else skip
-  end with case (foo: bar) of
-             nil -> (operations, (store : store))
-           |   _ -> (operations, store)
-           end