removed spaghetti diagrams for constType
authorclasohm
Thu, 30 Nov 1995 12:58:44 +0100
changeset 1375 d04af07266e8
parent 1374 5e407f2a3323
child 1376 92f83b9d17e1
removed spaghetti diagrams for constType
doc-src/Ref/theory-syntax.tex
--- a/doc-src/Ref/theory-syntax.tex	Wed Nov 29 17:01:41 1995 +0100
+++ b/doc-src/Ref/theory-syntax.tex	Thu Nov 30 12:58:44 1995 +0100
@@ -70,23 +70,13 @@
 consts : 'consts' ( ( constDecl ( () | ( '(' mixfix ')' ) ) ) + )
        ;
 
-constDecl : ( name + ',') '::' (string | constType) ;
-
-constType : ( applParam * ) applLast;
-
-applParam : ( complexType | '(' paramType ')' |
-              '[' (paramType + ',') ']' ) '=>';
-
-applLast: ( simpleType | '(' (paramType + ',') ')' ) (id *);
+constDecl : ( name + ',') '::' (string | constType);
 
-complexType: ( simpleType | '(' complexType ')' ) ( id + ) |
-             '(' ( ( complexType | '(' complexType ')' ) + ',' ) ')'
-             id +;
+constType : simpleType | '(' constType ')' | '[' ( constType + "," ) ']'
+            '=>' constType | constType '=>' constType;
 
-paramType: ( complexType | '(' paramType ')' | '[' ( paramType + ',' ) ']' )
-           ( '=>' paramType * );
-
-simpleType: id | ( tid ( () | '::' id ) );
+simpleType: id | ( tid ( () | '::' id ) ) |
+            '(' ( constType + "," ) ')' id | simpleType id;
 
 mixfix :  string ( () | ( () | ('[' (nat + ',') ']')) nat )
        | infix