Ignore:
Timestamp:
Apr 1, 2014, 5:37:46 PM (5 years ago)
Author:
ksherdy
Message:

Renamed structDecl to structDef

File:
1 edited

Legend:

Unmodified
Added
Removed
  • proto/s2k/trunk/framework/input/grammar/scatter/s2k.scatter

    r3769 r3777  
    11// s2k - A domain specific language for streaming text extraction and transformations.
    22//
    3 // Original:    2012/09/08       
    4 // Modified:    2014/03/29    Removed VOID type.     
    5 //
    6 // Tom Shermer, Ken Herdy
     3// 2012/09/08    Original definition.       
     4// 2014/03/29    Removed VOID type.     
     5// 2014/03/30    Updated structDef to structDef.
     6// 2014/04/01    Added streamGraph.
     7//
     8//
     9//
     10// Tom Shermer <shermer at sfu dot ca>
     11// Ken Herdy <ksherdy at sfu dot ca>
    712//
    813
     
    8388    ASTNode                 {Type type = null;}  [assignOperator],
    8489    program                 {hasSymbolTable;} [],
    85     structDecl              {hasSymbolTable;} [],
     90    structDef               {hasSymbolTable;} [],
    8691    filterDef               {hasSymbolTable;} [],
    8792    blockStmt               {hasSymbolTable;} [],
     
    100105grammar {
    101106
    102     program     -> (structDecl | filterDef) *;    // ( filterDef )* graph;
     107    program     -> (structDef | filterDef) *;    // ( filterDef )* graph;
    103108
    104109    //
    105110    // s t r e a m   s t r u c t   d e f i n i t i o n s
    106111    //
    107     structDecl          ->  STRUCT structName structDeclBody TERMINATOR? ;
    108     structDeclBody      ->  LCURLY (structMember TERMINATOR)+ RCURLY ;
    109     structMember        ->  structMemberType structMemberName ;
    110     structMemberType    #-> streamType ;
    111     structMemberName    #-> identifier ;
     112    structDef             ->  STRUCT structName structDefBody TERMINATOR? ;
     113    structDefBody         ->  LCURLY (structMember TERMINATOR)+ RCURLY ;
     114    structMember          ->  structMemberType structMemberName ;
     115    structMemberType      #-> streamType ;
     116    structMemberName      #-> identifier ;
    112117
    113118    // KH: user-defined stream functions?
Note: See TracChangeset for help on using the changeset viewer.