diff options
| author | johnvg | 2007-09-05 15:01:44 +0000 |
|---|---|---|
| committer | johnvg | 2007-09-05 15:01:44 +0000 |
| commit | ec1f795d1904caedb6c85250ff4f55ba2334d003 (patch) | |
| tree | 4e7aa4005366bf9de49fbe6035c02831f1ab6ffd /frontend/syntax.dcl | |
| parent | add more position information for error messages in generators (diff) | |
use bimapId instead of bimap{|*|} for variables
git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@1684 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
Diffstat (limited to 'frontend/syntax.dcl')
| -rw-r--r-- | frontend/syntax.dcl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/frontend/syntax.dcl b/frontend/syntax.dcl index 34ac858..71a68e4 100644 --- a/frontend/syntax.dcl +++ b/frontend/syntax.dcl @@ -43,8 +43,8 @@ instance == FunctionOrMacroIndex | STE_Field !Ident | STE_Class | STE_Member - | STE_Generic // AA - | STE_GenericCase // AA + | STE_Generic + | STE_GenericCase | STE_Instance | STE_Variable !VarInfoPtr | STE_TypeVariable !TypeVarInfoPtr @@ -342,7 +342,6 @@ cNameLocationDependent :== True , ai_offered :: !AttributeVar } - :: DefinedSymbol = { ds_ident :: !Ident , ds_arity :: !Int @@ -373,8 +372,6 @@ cNameLocationDependent :== True , me_priority :: !Priority } -// AA ... - :: GenericDef = { gen_ident :: !Ident // the generics name in IC_Class , gen_member_ident :: !Ident // the generics name in IC_Member @@ -429,13 +426,10 @@ cNameLocationDependent :== True , gt_vars :: ![TypeVar] // generic arguments , gt_arity :: !Int // number of generic arguments } - //getGenericClassForKind :: !GenericDef !TypeKind -> (!Bool, DefinedSymbol) //addGenericKind :: !GenericDef !TypeKind -> !GenericDef -// ... AA - :: InstanceType = { it_vars :: [TypeVar] , it_types :: ![Type] @@ -549,6 +543,7 @@ NoGlobalIndex :== {gi_module=NoIndex,gi_index=NoIndex} | GTSAppVar TypeVar [GenTypeStruct] | GTSVar TypeVar | GTSArrow GenTypeStruct GenTypeStruct // needed for simplifying bimaps + | GTSAppConsBimapKindConst // needed for simplifying bimaps | GTSCons DefinedSymbol GenTypeStruct | GTSField DefinedSymbol GenTypeStruct | GTSObject DefinedSymbol GenTypeStruct |