suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a NameExternal item to NameSource, to stop using NamePredefined for externals

Browse Source
This commit is contained in:
Neil Brown 2009-04-04 14:56:00 +00:00
parent df21bf23ae
commit 2a321d7910
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/AST.hs
View File

@ -72,6 +72,7 @@ data NameSource
= NameUser -- ^ A name from the source program = NameUser -- ^ A name from the source program
| NameNonce -- ^ A name the compiler generated | NameNonce -- ^ A name the compiler generated
| NamePredefined -- ^ A magic name without definition (e.g. the Rain timer) | NamePredefined -- ^ A magic name without definition (e.g. the Rain timer)
| NameExternal -- ^ A name from an external PRAGMA
deriving (Show, Eq, Typeable, Data) deriving (Show, Eq, Typeable, Data)
-- | The direction of a channel. -- | The direction of a channel.

2
frontends/ParseOccam.hs
View File

@ -1439,7 +1439,7 @@ pragma = do m <- getPosition >>* sourcePosToMeta
modify $ \st -> st modify $ \st -> st
{ csExternals = (A.nameName n, (ext, fs)) : csExternals st { csExternals = (A.nameName n, (ext, fs)) : csExternals st
} }
return $ Just (A.Specification m origN sp, nt, (Just n, A.NamePredefined)) return $ Just (A.Specification m origN sp, nt, (Just n, A.NameExternal))
ns <- case (prag, mprod) of ns <- case (prag, mprod) of
(Just (_, pragStr), Just prod) -> do (Just (_, pragStr), Just prod) -> do
let column = metaColumn m + fromMaybe 0 (findIndex (=='\"') rawP) let column = metaColumn m + fromMaybe 0 (findIndex (=='\"') rawP)