Changeset 425


Ignore:
Timestamp:
Jun 13, 2010 7:06:56 PM (14 years ago)
Author:
Anya Helene Bagge
Message:

Allow dots in names

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • MetaXa/src/gen-tbl

    r420 r425  
    55fi
    66
    7 LD_LIBRARY_PATH=$ECLIPSE/plugins/rascal_fragment_linux_0.1.5/installed/lib/ $ECLIPSE/plugins/rascal_fragment_linux_0.1.5/installed/bin/sdf2table -c -m Magnolia -o Magnolia.tbl
     7LD_LIBRARY_PATH=$ECLIPSE/plugins/rascal_fragment_linux_0.1.6/installed/lib/ $ECLIPSE/plugins/rascal_fragment_linux_0.1.6/installed/bin/sdf2table -c -m Magnolia -o Magnolia.tbl
    88

  • trunk/src/syn/Magnolia/BaseExt.sdf

    r313 r425  
    4747%%    ModuleClause ";" -> TopDecl {cons("ModuleClause")}
    4848
    49     "language" {Identifier ","}* -> ModuleClause {cons("Language")}
     49    "language" {Name ","}* -> ModuleClause {cons("Language")}
    5050
    5151    "imports" {ImportClause ","}* -> ModuleClause {cons("Imports")}
    … …  
    6262
    6363    Identifier "<" {ConceptClauseArgument ","}* ">" -> RequiresClause {cons("ImportRequires")}
    64     Identifier -> ImportClause {cons("ImportAll")}
     64    Name -> ImportClause {cons("ImportAll")}
    6565
    6666    Type -> ConceptClauseArgument {cons("Unresolved")}
    6767
    68     "module" Identifier -> ImportClause {cons("ImportModule")}
     68    "module" Name -> ImportClause {cons("ImportModule")}
    6969
    70     "module" Identifier "=" Identifier -> ImportClause {cons("ImportRename")}
     70    "module" Name "=" Name -> ImportClause {cons("ImportRename")}
    7171
    7272    ";" -> Decl {cons("Nop")}

  • trunk/src/syn/Magnolia/BaseExt/Declarations.sdf

    r367 r425  
    109109    FunClause -> ExprDeclarative
    110110
    111     Identifier -> FunName
    112 
    113 
    114111%%% Parameters and Parameter Modes
    115112  sorts

  • trunk/src/syn/Magnolia/Core/Declarations.sdf

    r407 r425  
    6464        BlockStat       Expr
    6565        Type            DataRep
    66         Identifier
     66        Name
    6767
    6868  context-free syntax
    … …  
    102102    ProcClause -> StatDeclarative
    103103
    104     Identifier -> ProcName
     104    Name -> ProcName
    105105
    106106    "_=_" -> ProcName {cons("Assign")}
    … …  
    122122    FunClause -> ExprDeclarative
    123123
    124     Identifier -> FunName
     124    Name -> FunName
    125125
    126126  lexical restrictions
    … …  
    139139    PredClause -> ExprDeclarative
    140140
    141     Identifier -> PredName
     141    Name -> PredName
    142142
    143143  lexical restrictions
    … …  
    163163    AxiomClause -> StatDeclarative
    164164
    165     Identifier -> AxiomName
     165    Name -> AxiomName
    166166
    167167  lexical restrictions
    … …  
    231231    VarClause -> ExprDeclarative
    232232
    233     Identifier -> VarName
     233    Name -> VarName
    234234
    235235  lexical restrictions
    … …  
    246246    "type" TypeName     -> TypeClause {cons("TypeClause")}
    247247
    248     Identifier -> TypeName
     248    Name -> TypeName
    249249
    250250    TypeClause -> TypeDeclarative
    … …  
    267267 
    268268
    269     Identifier -> DeclName
     269    Name -> DeclName
    270270
    271271    DeclClause -> DeclDeclarative
    … …  
    289289    AttrClause -> SubClause
    290290
    291     Identifier "(" {Expr ","}* ")" -> Attribute         {cons("Attr")}
     291    Name "(" {Expr ","}* ")" -> Attribute               {cons("Attr")}
    292292
    293293

  • trunk/src/syn/Magnolia/Core/Expressions.sdf

    r407 r425  
    5151%%% Variables
    5252
    53     Identifier ":" Type -> Var {cons("Var"), selectable}
     53    Name ":" Type -> Var {cons("Var"), selectable}
    5454
    5555    Var -> Expr
    … …  
    7979    FunName -> Fun {cons("Fun")}
    8080
    81     Identifier -> FunName
     81    Name -> FunName
    8282
    8383%%% Control-flow expressions

  • trunk/src/syn/Magnolia/Core/Identifiers.sdf

    r367 r425  
    3030    ID -> Identifier {cons("Name")}
    3131
     32        ID -> Name {cons("Name")}
     33       
     34        Name "." ID -> Name {cons("QName")}
     35       
    3236  lexical syntax
    3337

  • trunk/src/syn/Magnolia/Core/Types.sdf

    r367 r425  
    2828  context-free syntax
    2929
    30     Identifier -> Type {cons("Type")}
     30    Name -> Type {cons("Type")}
    3131
    3232    "(" ")"     -> Type {cons("NilType")}

  • trunk/src/syn/Magnolia/Root/Program.sdf

    r374 r425  
    3333    ModuleHead TopDecl* -> Program {cons("MagnoliaTree")}
    3434
    35     "module" Identifier ModuleClause* ";" -> ModuleHead {cons("ModuleHead")}
     35    "module" Name ModuleClause* ";" -> ModuleHead {cons("ModuleHead")}
    3636
    3737%%    ModuleHead -> Decl
Note: See TracChangeset for help on using the changeset viewer.