Changeset 13927 for src/Pugs/AST.hs

Timestamp:

10/05/06 14:31:33 (2 years ago)

Author:

audreyt

Message:

* Pugs.AST, Pugs.Run: Instead of registering macros for

types that expands to their protopes as eponymous functions:

$x = Int; # used to calls the &Int macro

they are now instead registered under the "term:" grammatical
category:

$x = Int; # now calls the &term:<Int> macro

this is very good, as it allows separate slots for &term:<int>
(the macro for the builtin unboxed type "int"), as well as for
&int (the function for the unary caster).

Files:

• src/Pugs/AST.hs (modified) (2 diffs)

src/Pugs/AST.hs

@@ -263 +263 @@
 
 newType :: String -> Exp
-newType name = _Sym SGlobal ('&':'&':'*':name) $! Syn ":="
-    [ _Var ('&':'*':name)
+newType name = _Sym SGlobal ('&':'&':'*':termName) $! Syn ":="
+    [ _Var ('&':'*':termName)
     , typeMacro name (Val . VType . mkType $ name)
     ]
+    where
+    termName = "term:" ++ name
+
 
 newMetaType :: String -> Exp
-newMetaType name = _Sym SGlobal ('&':'&':'*':name) $! Syn ":="
-    [ _Var ('&':'*':name)
+newMetaType name = _Sym SGlobal ('&':'&':'*':termName) $! Syn ":="
+    [ _Var ('&':'*':termName)
     , typeMacro name (_Var (':':'*':name))
     ]
+    where
+    termName = "term:" ++ name
 
 typeMacro :: String -> Exp -> Exp
 typeMacro name exp = Syn "sub" . (:[]) . Val . VCode $ MkCode
     { isMulti       = True
-    , subName       = cast ('&':name)
+    , subName       = cast ("&term:" ++ name)
     , subEnv        = Nothing
     , subType       = SubMacro
@@ -283 +288 @@
     , subReturns    = typ
     , subLValue     = False
-    , subParams     = [defaultHashParam{ paramName = cast "%?" }]
+    , subParams     = [ defaultArrayParam, defaultHashParam ]
     , subBindings   = []
     , subSlurpLimit = []