Changeset 1056 for src/RTLabs

Timestamp:

Jul 5, 2011, 4:25:41 PM (8 years ago)

Author:

campbell

Message:

Switch to delayed identifier error scheme.

Location:

src/RTLabs

Files:

• import.ma (modified) (3 diffs)
• syntax.ma (modified) (1 diff)

src/RTLabs/import.ma

@@ -2 +2 @@
 include "RTLabs/semantics.ma".
 
-let rec n_idents (n:nat) (tag:String) (g:universe tag) : res (Vector (identifier tag) n × (universe tag)) ≝
+let rec n_idents (n:nat) (tag:String) (g:universe tag) : Vector (identifier tag) n × (universe tag) ≝
 match n with
-[ O ⇒ OK ? 〈[[ ]], g〉
-| S m ⇒ do 〈ls, g'〉 ← n_idents m tag g;
-        do 〈l, g''〉 ← fresh ? g';
-        OK ? 〈l:::ls, g''〉
+[ O ⇒ 〈[[ ]], g〉
+| S m ⇒ let 〈ls, g'〉 ≝ n_idents m tag g in
+        let 〈l, g''〉 ≝ fresh ? g' in
+        〈l:::ls, g''〉
 ].
 
@@ -24 +24 @@
 definition make_register : 
   (pre_register → option register) → pre_register → universe RegisterTag →
-  res ((nat → option register) × (universe RegisterTag) × register) ≝
+  (nat → option register) × (universe RegisterTag) × register ≝
 λm,reg,g.
   match m reg with
-  [ Some r' ⇒ OK ? 〈〈m,g〉,r'〉
-  | None ⇒ do 〈r',g'〉 ← fresh ? g;
-           OK ? 〈〈λn. if eqb reg n then Some ? r' else m n,g'〉,r'〉
+  [ Some r' ⇒ 〈〈m,g〉,r'〉
+  | None ⇒ let 〈r',g'〉 ≝ fresh ? g in
+             〈〈λn. if eqb reg n then Some ? r' else m n,g'〉,r'〉
   ]
 .
@@ -35 +35 @@
 definition make_registers_list :
   (nat → option register) → list (pre_register × typ) → universe RegisterTag →
-  res ((nat → option register) × (universe RegisterTag) × (list (register×typ))) ≝
+    (nat → option register) × (universe RegisterTag) × (list (register×typ)) ≝
 λm,lrs,g.
-foldr ?? (λrst,acc. do 〈acc',l〉 ← acc;
-                   let 〈rs,ty〉 ≝ rst in
-                   let 〈m,g〉 ≝ acc' in 
-                   do 〈mg,rs'〉 ← make_register m rs g;
-                   OK ? 〈mg,〈rs',ty〉::l〉) (OK ? 〈〈m,g〉,[ ]〉) lrs.
+foldr ?? (λrst,acc. let 〈acc',l〉 ≝ acc in
+                    let 〈rs,ty〉 ≝ rst in
+                    let 〈m,g〉 ≝ acc' in 
+                    let 〈mg,rs'〉 ≝ make_register m rs g in
+                      〈mg,〈rs',ty〉::l〉) 〈〈m,g〉,[ ]〉 lrs.
 
 axiom MissingRegister : String.
 axiom MissingLabel : String.
 
+(* Doesn't check for identifier overflow, but don't really need to care here. *)
 definition make_internal_function : pre_internal_function → res (fundef internal_function) ≝
 λpre_f.
   let rgen0 ≝ new_universe RegisterTag in
-  do 〈rmapgen1, result〉 ← match pf_result pre_f with
-                          [ None ⇒ OK ? 〈〈λ_.None ?, rgen0〉, None ?〉
-                          | Some rt ⇒ do 〈x,y〉 ← make_register (λ_.None ?) (\fst rt) rgen0; OK ? 〈x,Some ? 〈y,\snd rt〉〉
-                          ];
+  let 〈rmapgen1, result〉 ≝ match pf_result pre_f with
+                           [ None ⇒ 〈〈λ_.None ?, rgen0〉, None ?〉
+                           | Some rt ⇒ let 〈x,y〉 ≝ make_register (λ_.None ?) (\fst rt) rgen0 in 〈x,Some ? 〈y,\snd rt〉〉
+                           ] in
   let 〈rmap1, rgen1〉 ≝ rmapgen1 in
-  do 〈rmapgen2, params〉 ← make_registers_list rmap1 (pf_params pre_f) rgen1;
+  let 〈rmapgen2, params〉 ≝ make_registers_list rmap1 (pf_params pre_f) rgen1 in
   let 〈rmap2, rgen2〉 ≝ rmapgen2 in
-  do 〈rmapgen3, locals〉 ← make_registers_list rmap2 (pf_locals pre_f) rgen2;
+  let 〈rmapgen3, locals〉 ≝ make_registers_list rmap2 (pf_locals pre_f) rgen2 in
   let 〈rmap3, rgen3〉 ≝ rmapgen3 in
   let rmap ≝ λn. opt_to_res … (msg MissingRegister) (rmap3 n) in
   let max_stmt ≝ foldr ?? (λp,m. max (\fst p) m) 0 (pf_graph pre_f) in
-  do 〈labels, gen〉 ← n_idents (S max_stmt) ? (new_universe LabelTag);
+  let 〈labels, gen〉 ≝ n_idents (S max_stmt) ? (new_universe LabelTag) in
   let get_label ≝ λn. opt_to_res … (msg MissingLabel) (get_index_weak_v ?? labels n) in
   do graph ← foldr ?? (λp:nat × ((pre_register → res register) → (nat → res label) → res statement).λg0.

src/RTLabs/syntax.ma

@@ -13 +13 @@
 | St_skip : label → statement
 | St_cost : costlabel → label → statement
-| St_const : register → cast → label → statement
+| St_const : register → constant → label → statement
 | St_op1 : unary_operation → register → register → label → statement
 | St_op2 : binary_operation → register → register → register → label → statement