aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralimarin2003-03-17 10:51:26 +0000
committeralimarin2003-03-17 10:51:26 +0000
commit521b3b6a7a334f2953955700b68813e7a3c395e5 (patch)
tree79f60cd98b67a72607083840b6b83d6b59a7eef7
parentuse positive numbers for TypeVarFixed (diff)
fixed a bug in parsing the "of" token after dynamic type, e.g.:
case dynamic 1 :: Int of ... git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@1335 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
-rw-r--r--frontend/parse.icl3
-rw-r--r--frontend/scanner.icl2
2 files changed, 3 insertions, 2 deletions
diff --git a/frontend/parse.icl b/frontend/parse.icl
index f008f38..57dfa52 100644
--- a/frontend/parse.icl
+++ b/frontend/parse.icl
@@ -466,7 +466,8 @@ where
# (token, pState) = nextToken FunctionContext pState
= case token of
GenericOpenToken // generic function
- # (type, pState) = wantType pState
+ //# (type, pState) = wantType pState
+ # (ok, {at_type=type}, pState) = trySimpleType TA_None pState
# (ident, pState) = stringToIdent name (IC_GenericCase type) pState
# (type_CONS_ident, pState) = stringToIdent "CONS" IC_Type pState
# (type_FIELD_ident, pState)= stringToIdent "FIELD" IC_Type pState
diff --git a/frontend/scanner.icl b/frontend/scanner.icl
index 22e2416..46650d5 100644
--- a/frontend/scanner.icl
+++ b/frontend/scanner.icl
@@ -849,7 +849,7 @@ CheckTypeContext s input
"Dynamic" -> (DynamicTypeToken , input)
"special" -> (SpecialToken , input)
"from" -> (FromToken , input)
- "of" -> (GenericOfToken , input) // AA
+ "of" -> (OfToken , input) // AA
s -> CheckEveryContext s input
CheckFunctContext :: !String !Input -> (!Token, !Input)