summaryrefslogtreecommitdiff
path: root/src/GF/Infra/ReadFiles.hs
diff options
context:
space:
mode:
authoraarne <unknown>2004-02-27 07:43:52 +0000
committeraarne <unknown>2004-02-27 07:43:52 +0000
commit0166b27ee45f24fb60d79498a5d15b4f316191f3 (patch)
tree72a5c1aa21ee0856ce1a621d094471d056040385 /src/GF/Infra/ReadFiles.hs
parent2e1b57878329eb6a1822ef43c190f8a2aaaa82b7 (diff)
Started with unions.
Diffstat (limited to 'src/GF/Infra/ReadFiles.hs')
-rw-r--r--src/GF/Infra/ReadFiles.hs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs
index 7b95141c7..06205e350 100644
--- a/src/GF/Infra/ReadFiles.hs
+++ b/src/GF/Infra/ReadFiles.hs
@@ -181,16 +181,21 @@ importsOfFile =
getModuleHeader . -- analyse into mod header
filter (not . spec) . -- ignore keywords and special symbols
unqual . -- take away qualifiers
+ unrestr . -- take away union restrictions
takeWhile (not . term) . -- read until curly or semic
lexs . -- analyse into lexical tokens
unComm -- ignore comments before the headed line
where
term = flip elem ["{",";"]
- spec = flip elem ["of", "open","in",":", "->","=", "(", ")",",","**"]
+ spec = flip elem ["of", "open","in",":", "->","=", "(", ")",",","**","union"]
unqual ws = case ws of
"(":q:ws' -> unqual ws'
w:ws' -> w:unqual ws'
_ -> ws
+ unrestr ws = case ws of
+ "[":ws' -> unrestr $ tail $ dropWhile (/="]") ws'
+ w:ws' -> w:unrestr ws'
+ _ -> ws
getModuleHeader :: [String] -> ModuleHeader -- with, reuse
getModuleHeader ws = case ws of