# HG changeset patch # User wenzelm # Date 909242180 -7200 # Node ID 58ed0a78906d17faf3fdda6ffeeae04c2825584a # Parent 149d435aa4d71addb85ecdd5722011f168a91dc3 *** empty log message *** diff -r 149d435aa4d7 -r 58ed0a78906d doc-src/Logics/logics.rao --- a/doc-src/Logics/logics.rao Fri Oct 23 22:37:15 1998 +0200 +++ b/doc-src/Logics/logics.rao Sat Oct 24 17:16:20 1998 +0200 @@ -1,5 +1,5 @@ % This file was generated by 'rail' from 'logics.rai' -\rail@i {1}{ typedef : 'typedef' ( () | '(' name ')') type '=' set witness; type : typevarlist name ( () | '(' infix ')' ); set : string; witness : () | '(' id ')'; } +\rail@i {1}{ typedef : 'typedef' ( () | '(' name ')') type '=' set witness; \par type : typevarlist name ( () | '(' infix ')' ); set : string; witness : () | '(' id ')'; } \rail@o {1}{ \rail@begin{2}{typedef} \rail@term{typedef}[] @@ -36,7 +36,7 @@ \rail@endbar \rail@end } -\rail@i {2}{ record : 'record' typevarlist name '=' parent (field +); parent : ( () | type '+'); field : name '::' type; } +\rail@i {2}{ record : 'record' typevarlist name '=' parent (field +); \par parent : ( () | type '+'); field : name '::' type; } \rail@o {2}{ \rail@begin{2}{record} \rail@term{record}[] @@ -62,11 +62,15 @@ \rail@nont{type}[] \rail@end } -\rail@i {3}{ typedecl : ( type '=' (cons + '|') ) + 'and' ; type : typevarlist id ( () | '(' infix ')' ) ; cons : name (argtype *) ( () | ( '(' mixfix ')' ) ) ; argtype : id | tid | ('(' typevarlist id ')') ; } +\rail@i {3}{ datatype : 'datatype' typedecls; \par typedecls: ( newtype '=' (cons + '|') ) + 'and' ; newtype : typevarlist id ( () | '(' infix ')' ) ; cons : name (argtype *) ( () | ( '(' mixfix ')' ) ) ; argtype : id | tid | ('(' typevarlist id ')') ; } \rail@o {3}{ -\rail@begin{3}{typedecl} +\rail@begin{1}{datatype} +\rail@term{datatype}[] +\rail@nont{typedecls}[] +\rail@end +\rail@begin{3}{typedecls} \rail@plus -\rail@nont{type}[] +\rail@nont{newtype}[] \rail@term{=}[] \rail@plus \rail@nont{cons}[] @@ -77,7 +81,7 @@ \rail@cterm{and}[] \rail@endplus \rail@end -\rail@begin{2}{type} +\rail@begin{2}{newtype} \rail@nont{typevarlist}[] \rail@nont{id}[] \rail@bar