Ignore:
Timestamp:
Mar 28, 2013, 7:02:08 PM (6 years ago)
Author:
ksherdy
Message:

Grammar updates. Eliminated optional fw on stream types. Removed typedef.

Location:
proto/pabloj/trunk/input/test
Files:
3 added
25 edited
4 moved

Legend:

Unmodified
Added
Removed
  • proto/pabloj/trunk/input/test/pabloB/statements/idisa/idisa1.pablob

    r2956 r2981  
    33kernel BasisBits
    44{
    5         init
     5        init 
    66        {
    7                 carry1[1] = {0};
    8                 carryN[1] = {1};
     7         
    98        }
    109
    11         function void do_block ()
     10        function void do_block()
    1211        {
    13                 var stream s = 0;
     12               
     13                simd.add<
    1414        }
    1515
    16         function void do_final_block(stream EOF_mask)
    17         {
    18        
    19         }
    20 
    21 }       
     16};     
  • proto/pabloj/trunk/input/test/pabloS/decl/decl1.pablos

    r2834 r2981  
    11struct BasisBits {
    2         stream b1;
    3         stream b2;
    4         stream b3;
    5         stream b4;
     2        stream<1> b1;
     3        stream<1> b2;
     4        stream<1> b3;
     5        stream<1> b4;
    66};
    77
  • proto/pabloj/trunk/input/test/pabloS/decl/decl3.pablos.exclude

    r2834 r2981  
    1 //tuple Streams (stream, stream);
     1//tuple Streams (stream<1>, stream<1>);
    22//tuple Streams (stream<1>, stream<8>);
  • proto/pabloj/trunk/input/test/pabloS/funcDef/funcDef1.pablos

    r2834 r2981  
    11struct B
    22{
    3         stream a;
    4         stream a;
    5         stream a;
    6         stream a;
     3        stream<1> a;
     4        stream<1> a;
     5        stream<1> a;
     6        stream<1> a;
    77};
    88
  • proto/pabloj/trunk/input/test/pabloS/funcDef/funcDef2.pablos

    r2834 r2981  
    11struct bb {
    2         stream a;
     2        stream<1> a;
    33
    44};
    55
    66/*
    7 function stream Function(stream a, stream b, stream c) {
     7function stream<1> Function(stream<1> a, stream<1> b, stream<1> c) {
    88
    99
  • proto/pabloj/trunk/input/test/pabloS/funcDef/funcDef4.pablos.exclude

    r2834 r2981  
    1 //function tuple T Foo(stream a, stream b) {};
     1//function tuple T Foo(stream<1> a, stream<1> b) {};
  • proto/pabloj/trunk/input/test/pabloS/py2pablo/parabix2_pablo.pablos

    r2972 r2981  
    218218    u8.unibyte = (~ basis_bits.bit_0);
    219219    u8.suffix = pablo.Mask(1,0);
    220     var stream<1> u8_error;
    221     var stream<1> u8_FFFE_FFFF;
    222     var stream<1> u8anyscope;
     220    var stream<1> u8_error = pablo.Mask(1,0);
     221    var stream<1> u8_FFFE_FFFF = pablo.Mask(1,0);
     222    var stream<1> u8anyscope = pablo.Mask(1,0);
    223223    if (basis_bits.bit_0) {
    224224        u8.prefix = (basis_bits.bit_0 & basis_bits.bit_1);
     
    287287    ctCDPI_Callouts.PI_name_ends = pablo.Mask(1,0);
    288288    ctCDPI_Callouts.PI_ends = pablo.Mask(1,0);
    289     var stream<1> CtCDPI_starts;
    290     var stream<1> CtCDPI_ends;
    291     var stream<1> ctCDPI_mask;
     289    var stream<1> CtCDPI_starts = pablo.Mask(1,0);
     290    var stream<1> CtCDPI_ends = pablo.Mask(1,0);
     291    var stream<1> ctCDPI_mask = pablo.Mask(1,0);
    292292    var stream<1> v = (lex.LAngle | lex.Hyphen);
    293293    var stream<1> w = (lex.Hyphen | lex.QMark);
     
    298298    var stream<1> CtCD_opener = (LAngle_scope & lex.Exclam);
    299299    var stream<1> CtCDPI_opener = (PI_opener | CtCD_opener);
    300     var stream<1> CD_closer;
     300    var stream<1> CD_closer = pablo.Mask(1,0);
    301301    var stream<1> DoubleHyphen = ((v1 & w1) & lex.Hyphen);
    302302    if (lex.RBracket) {
     
    354354
    355355function void Parse_tags(struct Lex lex, struct Marker marker, struct Tag_Callouts tag_Callouts) {
    356     var stream<1> EqExpected;
    357     var stream<1> AttListEnd;
     356    var stream<1> EqExpected = pablo.Mask(1,0);
     357    var stream<1> AttListEnd = pablo.Mask(1,0);
    358358    var stream<1> DQuoteDelim = (lex.DQuote | lex.LAngle);
    359359    var stream<1> SQuoteDelim = (lex.SQuote | lex.LAngle);
     
    428428    ref_Callouts.HexRef_starts = pablo.Mask(1,0);
    429429    ref_Callouts.HexRef_ends = pablo.Mask(1,0);
    430     var stream<1> ref_error;
     430    var stream<1> ref_error = pablo.Mask(1,0);
    431431    if (marker.Ref_opener) {
    432432        var stream<1> Ref_scope = pablo.Advance(marker.Ref_opener);
     
    475475    check_streams.att_refs = (tag_Callouts.AttVal_spans & marker.Ref_opener);
    476476}
    477 /*
    478 function void Main(struct Basis_bits basis_bits, struct Lex lex, struct U8 u8, struct Xml_char xml_char, struct Scope1 scope1, struct CtCDPI_Callouts ctCDPI_Callouts, struct Ref_Callouts ref_Callouts, struct Tag_Callouts tag_Callouts, struct Masks masks, struct Xml_names xml_names, struct Check_streams check_streams) {
    479     Classify_bytes_Validate_utf8(basis_bits, lex, u8);
    480     Parse_CtCDPI(lex, marker, ctCDPI_Callouts, check_streams);
    481     Parse_tags(lex, marker, tag_Callouts);
    482     Parse_refs(lex, marker, ref_Callouts);
    483     Validate_xml_names(ctCDPI_Callouts, ref_Callouts, tag_Callouts, lex, u8, check_streams);
    484     Do_check_streams(marker, tag_Callouts, check_streams);
    485 }*/
  • proto/pabloj/trunk/input/test/pabloS/statements/assign/assign1.pablos

    r2834 r2981  
    11function void Assignments() {
    2         var stream s;
     2        var stream<1> s;
    33        s = 0;
    44        s &= 0;
  • proto/pabloj/trunk/input/test/pabloS/statements/assign/assign7.pablos

    r2834 r2981  
    11function void Assignments() {
    2         var stream s;
    3         var stream a;
    4         var stream b;
    5         var stream c;
     2        var stream<1> s;
     3        var stream<1> a;
     4        var stream<1> b;
     5        var stream<1> c;
    66        //s |= 0;
    77        //s = a | b | c;
  • proto/pabloj/trunk/input/test/pabloS/statements/localDecl/localDecl1.pablos

    r2834 r2981  
    22
    33        var struct BasisBits {
    4         stream b1;
    5         stream b2;
    6         stream b3;
    7         stream b4;
     4        stream<1> b1;
     5        stream<1> b2;
     6        stream<1> b3;
     7        stream<1> b4;
    88        } A;
    99
  • proto/pabloj/trunk/input/test/pabloS/statements/localDecl/localDecl4.pablos

    r2834 r2981  
    11function void localDecl() {
    2         var stream A;
    3         var stream A=0;
     2        var stream<1> A;
     3        var stream<1> A=0;
    44}
  • proto/pabloj/trunk/input/test/pabloS/statements/localDecl/localDecl5.pablos

    r2834 r2981  
    11function void Assignments() {
    2         var stream s = 4;
    3         var stream s &= 4;
    4         var stream s |= 4;
    5 //      var stream s ~= 4;
    6         var stream s ^= 4;
     2        var stream<1> s = 4;
     3        var stream<1> s &= 4;
     4        var stream<1> s |= 4;
     5//      var stream<1> s ~= 4;
     6        var stream<1> s ^= 4;
    77}
  • proto/pabloj/trunk/input/test/pabloS/statements/while/test.pablos.exclude

    r2834 r2981  
    11function void Function() {
    2 var stream cursor = pablo.ScanToFirst(lex.opener);
     2var stream<1> cursor = pablo.ScanToFirst(lex.opener);
    33}
  • proto/pabloj/trunk/input/test/pabloS/statements/while/while1.pablos

    r2975 r2981  
    11function void While() {
    22                       
    3         var stream cursor = 1;
     3        var stream<1> cursor = 1;
    44       
    55        while (cursor) {
  • proto/pabloj/trunk/input/test/pabloS/statements/while/while2.pablos

    r2834 r2981  
    11function void While() {
    22       
    3         var stream cursor;
     3        var stream<1> cursor;
    44       
    55        while (cursor) {
  • proto/pabloj/trunk/input/test/pabloS/statements/while/while3.pablos

    r2834 r2981  
    11function void Function() {     
    2         var stream cursor1;
     2        var stream<1> cursor1;
    33       
    44        while (cursor1) {
    5                 var stream cursor2;
     5                var stream<1> cursor2;
    66                while(cursor2) {
    77                        cursor = pablo.Advance(cursor);
  • proto/pabloj/trunk/input/test/pabloS/statements/while/while4.pablos

    r2834 r2981  
    11function void Function(struct TagCallouts tagCallouts, struct Lex lex) {       
    22
    3         var stream starts_accum = 0;
    4         var stream ends_accum = 0;     
     3        var stream<1> starts_accum = 0;
     4        var stream<1> ends_accum = 0;   
    55       
    6         var stream cursor = pablo.ScanToFirst(lex.opener);
     6        var stream<1> cursor = pablo.ScanToFirst(lex.opener);
    77       
    88        while (cursor) {
  • proto/pabloj/trunk/input/test/pabloS/typedef/typedef1.pablos.exclude

    r2956 r2981  
    11typedef struct BasisBits {
    2 stream b1;
    3 stream b2;
    4 stream b3;
    5 stream b4;
     2stream<1> b1;
     3stream<1> b2;
     4stream<1> b3;
     5stream<1> b4;
    66} BasisBitsAlias;
  • proto/pabloj/trunk/input/test/pabloS/typedef/typedef3.pablos.exclude

    r2956 r2981  
    1 typedef stream s;
    2 
    31typedef stream<1> s1;
  • proto/pabloj/trunk/input/test/pabloS/typedef/typedef4.pablos.exclude

    r2956 r2981  
    11struct Lex {
    2         stream LAngle;
    3         stream RAngle;
     2        stream<1> LAngle;
     3        stream<1> RAngle;
    44};
    55
  • proto/pabloj/trunk/input/test/visitors/AdvanceCombinerXFormer/advance.pablos

    r2834 r2981  
    11function void Test() {
    2         var stream temp;
    3         var stream X = 0;
     2        var stream<1> temp;
     3        var stream<1> X = 0;
    44       
    55        temp = pablo.Advance(X);                       
  • proto/pabloj/trunk/input/test/visitors/AdvanceNCounterVisitor/advanceNCounter.pablos

    r2834 r2981  
    11function void Test() {
    2         var stream temp;
    3         var stream C = 0;
    4         var stream X = 0;
    5         var stream R = 0;
     2        var stream<1> temp;
     3        var stream<1> C = 0;
     4        var stream<1> X = 0;
     5        var stream<1> R = 0;
    66
    77        //R = Advance(X);
  • proto/pabloj/trunk/input/test/visitors/AugmentedAssignmentXFormer/augmentedAssignment.pablos

    r2834 r2981  
    11function void Test() {
    2         var stream x;
    3         var stream y;
    4         var stream z;
     2        var stream<1> x;
     3        var stream<1> y;
     4        var stream<1> z;
    55
    66        x = x | y;                      // Expected
  • proto/pabloj/trunk/input/test/visitors/Bitwise2IDISAXFormer/bitwise2IDISA.pablos

    r2834 r2981  
    99*/     
    1010
    11         var stream x;
    12         var stream y;
    13         var stream r;
     11        var stream<1> x;
     12        var stream<1> y;
     13        var stream<1> r;
    1414       
    1515        r = simd_and(x,y);              // Expected
  • proto/pabloj/trunk/input/test/visitors/CarryCounterVisitor/carryCounter.pablos

    r2834 r2981  
    11function void Test() {
    2         var stream temp;
    3         var stream C = 0;
    4         var stream X = 0;
    5         var stream R = 0;
     2        var stream<1> temp;
     3        var stream<1> C = 0;
     4        var stream<1> X = 0;
     5        var stream<1> R = 0;
    66       
    77        R = Advance(X);
  • proto/pabloj/trunk/input/test/visitors/CarryInitToOneListVisitor/carryInitToOneList.pablos

    r2834 r2981  
    11function void Test() {
    2         var stream temp;
    3         var stream C = 0;
    4         var stream X = 0;
    5         var stream R = 0;
     2        var stream<1> temp;
     3        var stream<1> C = 0;
     4        var stream<1> X = 0;
     5        var stream<1> R = 0;
    66       
    77        R = Advance(X);
  • proto/pabloj/trunk/input/test/visitors/CarryIntroXFormer/FinalBlock/pablo2CarryQ.pablos

    r2975 r2981  
    11function void Test() {
    2         var stream temp;
    3         var stream C;   // Cursor stream
    4         var stream M;   // Marker stream
    5         var stream R;   // Result stream
     2        var stream<1> temp;
     3        var stream<1> C;        // Cursor stream<1>
     4        var stream<1> M;        // Marker stream<1>
     5        var stream<1> R;        // Result stream<1>
    66       
    77        // TODO - UPDATE EXPECTED RESULTS
  • proto/pabloj/trunk/input/test/visitors/CarryIntroXFormer/NotFinalBlock/atEOF.pablos

    r2834 r2981  
    33        var stream<1> R;
    44               
    5         /*
     5        /*      TODO
    66        simd<1>::constant<0>();
    77        atEOF(X);
  • proto/pabloj/trunk/input/test/visitors/CarryIntroXFormer/NotFinalBlock/pablo2CarryQ.pablos

    r2975 r2981  
    11function void Test() {
    2         var stream temp;
    3         var stream C;   // Cursor stream
    4         var stream M;   // Marker stream
    5         var stream R;   // Result stream
     2        var stream<1> temp;
     3        var stream<1> C;        // Cursor stream<1>
     4        var stream<1> M;        // Marker stream<1>
     5        var stream<1> R;        // Result stream<1>
    66       
    77        // TODO - UPDATE EXPECTED RESULTS
Note: See TracChangeset for help on using the changeset viewer.