X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fbinaries%2Ftranscript%2Fv8Parser.mly;h=06d4d908ba2fd7d9c49e8794e4d413a222279dff;hb=52206fa1c090fcdc8386ec8d7e88beca089c7e39;hp=7fd69615d5537be513df8bda2304b88fa0807d6a;hpb=ad17757edcc6cf75be576268fab8cf52751d679a;p=helm.git

diff --git a/components/binaries/transcript/v8Parser.mly b/components/binaries/transcript/v8Parser.mly
index 7fd69615d..06d4d908b 100644
--- a/components/binaries/transcript/v8Parser.mly
+++ b/components/binaries/transcript/v8Parser.mly
@@ -43,6 +43,12 @@
 
    let strip1 s = 
       String.sub s 1 (String.length s - 1)
+
+   let coercion str = 
+      [T.Coercion (false, str); T.Coercion (true, str)]
+
+   let notation str =
+      [T.Notation (false, str); T.Notation (true, str)]
 %}
    %token <string> SPC STR IDENT INT EXTRA AC OP CP OC CC OQ CQ DEF FS COE CN SC
    %token <string> LET IN TH PROOF QED VAR IND SEC REQ XP IP SET NOT LOAD ID COERC
@@ -91,7 +97,6 @@
    id: ID spcs { $1 ^ $2 };
    coerc: COERC spcs { $1 ^ $2 };
 
-
    idents:
       | ident        { [$1]     }
       | ident idents { $1 :: $2 }
@@ -189,8 +194,10 @@
       | unexport_r spcs unexports_r { fst $1 ^ $2 ^ fst $3, snd $1 @ snd $3 } 
    ;
    field: 
-      | ident cn unexports_r  { $1 ^ $2 ^ fst $3, snd $3                   }
-      | ident coe unexports_r { $1 ^ $2 ^ fst $3, snd $3 @ [T.Coercion $1] }
+      | ident cn unexports_r  
+         { $1 ^ $2 ^ fst $3, snd $3                      }
+      | ident coe unexports_r 
+         { $1 ^ $2 ^ fst $3, snd $3 @ coercion (trim $1) }
    ;  
    fields:
       | field           { $1                                      }
@@ -256,7 +263,7 @@
       | var idents xres FS
          { out "VAR" (cat $2); mk_vars $2                           }      
       | ind ident unexports FS
-         { out "IND" $2; snd $3 @ [T.Inline (T.Ind, trim $2)]       }
+         { out "IND" $2; T.Inline (T.Ind, trim $2) :: snd $3        }
       | sec unexports FS 
          { out "UNX" (fst $2); [T.Unexport ($1 ^ fst $2 ^ trim $3)] }
       | req xp ident FS
@@ -268,9 +275,9 @@
       | load str FS
          { out "REQ" $2; [T.Include (strip2 (trim $2))]             }
       | coerc qid spcs cn unexports FS
-         { out "COERCE" (hd $2); [T.Coercion (hd $2)]               }
+         { out "COERCE" (hd $2); coercion (hd $2)                   }
       | id coerc qid spcs cn unexports FS
-         { out "COERCE" (hd $3); [T.Coercion (hd $3)]               }
+         { out "COERCE" (hd $3); coercion (hd $3)                   }
       | th ident error 
          { out "ERROR" $2; failwith ("macro_step " ^ $2)            }
       | ind ident error 
@@ -283,7 +290,7 @@
       | OQ verbatims CQ       { [T.Comment $2]                       }
       | macro_step            { $1                                   }
       | set unexports FS      { [T.Unexport ($1 ^ fst $2 ^ trim $3)] }
-      | notation unexports FS { [T.Notation ($1 ^ fst $2 ^ trim $3)] }
+      | notation unexports FS { notation ($1 ^ fst $2 ^ trim $3)     }
       | error                 { out "ERROR" "item"; failwith "item"  }
     ;
     items: