Changeset 2933


Ignore:
Timestamp:
Mar 10, 2013, 6:30:09 PM (5 years ago)
Author:
ksherdy
Message:

Updated template.

Location:
proto/pabloj/trunk/input
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • proto/pabloj/trunk/input/grammar/scatter/pabloS.scatter

    r2919 r2933  
    11//
    2 // Ken Herdy
    3 // 8-September-2012
     2// PabloS - Parallel Stream Language - A tiny language for the definition of stream functions and stream types.
     3//
     4// Author:              Ken Herdy <ksherdy at sfu dot ca>
     5// Created:             2012/09/08
     6// Last Changed:        2013/02/01
     7//
     8// History:
     9//                              Initial definition, 2012/09/08
    410//
    5 // PabloS (unbounded stream language)
    6 //
    7 // Type System
    8 //
    9 // Primitive Types
    10 //
    11 // Stream 2^k type
    12 // Integer Constant
    13 // String Constant
    14 // ..
    1511//
    1612context main {
     13
    1714  recognizers {
    1815         Whitespace [IGNORE],
    1916         Integer [INTEGER_CONST],
    20          Identifier [IDENTIFIER],                       // Java identifiers. Produces Lextant Tokens for keywords.
    21          Comment [IGNORE] "#" "\n",                     // parabix2_pablo debugging only.
     17         Identifier [IDENTIFIER],                       // Java identifiers. Produces Lextant tokens for keywords.
     18         Comment [IGNORE] "#" "\n",                     // Added to support parabix2_pablo debugging.
    2219         Comment [IGNORE] "//" "\n",     
    2320         Comment [SQ_STRING] "'" "'",
     
    8582
    8683        //
    87         // t o p - l e v e l 
    88         //
    89        
    90         //
    91         // d e c l a r a t i o n s
    92         //
    93         // Decls                        -> (typeDecl | typeDef) TERMINATOR ;
     84        // t o p - l e v e l   d e c l a r a t i o n s 
     85        //
    9486       
    9587        // typeDecl             
    9688
    97         typeDecl                ->  type TERMINATOR ; // DeclList?; // Disallow top-level instance decls
     89        typeDecl                ->  type TERMINATOR ;
    9890               
    9991        typeDef                 ->  TYPEDEF type identifier TERMINATOR ;
     
    10799        funcDef                 -> FUNCTION returnType funcName LROUND parameterList? RROUND blockStmt TERMINATOR?;                             
    108100                                                                               
    109         returnType              #-> type ;      // Note: Strictly not required.
     101        returnType              #-> type ;     
    110102       
    111103        parameterList   -> parameter (COMMA parameter)*;
     
    193185        //
    194186
    195         // p r i m i t i v e s
    196         //
     187        // p r i m i t i v e s   t y p e s
     188       
    197189        // s t r e a m
    198190
     
    204196       
    205197        streamTypeName  #->     identifier ;                           
     198       
     199        // c o m p o u n d   t y p e s
    206200               
    207201        // s t r u c t 
  • proto/pabloj/trunk/input/templates/cpplang/pablo_definitions.template

    r2928 r2933  
    11// ###@warningComment ###
     2//
     3// This template includes the minimal set of runtime support libraries required
     4// to support compilation of PabloJ generated C++ code (bitblock.hpp, carryQ.hpp,
     5// pabloSupport.hpp, error_tracker.hpp)
    26//
    37// (c) 2012, 2013 Robert D. Cameron, Ken Herdy
     
    1721
    1822// runtime libraries
    19 #include <lib/simd-lib/bitblock.hpp>
    20 #include <lib/simd-lib/carryQ.hpp>
    21 #include <lib/simd-lib/pabloSupport.hpp>
     23#include <simd-lib/bitblock.hpp>
     24#include <simd-lib/carryQ.hpp>
     25#include <simd-lib/pabloSupport.hpp>
    2226
    2327// migrate error tracker, line/column tracker to compiler runtime
    24 #include "../util/ErrorTracker.h"
     28#include <ErrorTracker.h>
    2529ErrorTracker error_tracker;
    2630
     
    3640#include <sys/stat.h>
    3741
    38 #include "../lib/simd-lib/s2p.hpp"
    39 #include "../lib/simd-lib/buffer.hpp"
    40 #include "../lib/simd-lib/bitblock_iterator.hpp"
    41 #include "../lib/simd-lib/perflib/perfsec.h"
     42#include <simd-lib/s2p.hpp>
     43#include <simd-lib/buffer.hpp>
     44#include <simd-lib/bitblock_iterator.hpp>
     45#include <simd-lib/perflib/perfsec.h>
    4246
    4347#include <xmldecl.h>
  • proto/pabloj/trunk/input/test/readme

    r2834 r2933  
    1212Future Work:
    1313                       
    14 To further automate the verification of the pabloS to pabloB translation process.
     14Further automate the verification of the pabloS to pabloB translation process.
    1515
Note: See TracChangeset for help on using the changeset viewer.