Changes in / [276a55b2:52ffa30]


Ignore:
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • src/Parser/TypeData.cc

    r276a55b2 r52ffa30  
    322322                        function.params->printList( os, indent + 4 );
    323323                } else {
    324                         os << string( indent + 2, ' ' ) << "with no parameters" << endl;
     324                        os << string( indent + 2, ' ' ) << "with no parameters " << endl;
    325325                } // if
    326326                if ( function.idList ) {
    … …  
    347347                os << DeclarationNode::aggregateNames[ aggregate.kind ] << ' ' << *aggregate.name << endl;
    348348                if ( aggregate.params ) {
    349                         os << string( indent + 2, ' ' ) << "with type parameters" << endl;
     349                        os << string( indent + 2, ' ' ) << "with type parameters " << endl;
    350350                        aggregate.params->printList( os, indent + 4 );
    351351                } // if
    352352                if ( aggregate.actuals ) {
    353                         os << string( indent + 2, ' ' ) << "instantiated with actual parameters" << endl;
     353                        os << string( indent + 2, ' ' ) << "instantiated with actual parameters " << endl;
    354354                        aggregate.actuals->printList( os, indent + 4 );
    355355                } // if
    356356                if ( aggregate.fields ) {
    357                         os << string( indent + 2, ' ' ) << "with members" << endl;
     357                        os << string( indent + 2, ' ' ) << "with members " << endl;
    358358                        aggregate.fields->printList( os, indent + 4 );
    359359                } // if
    360360                if ( aggregate.body ) {
    361                         os << string( indent + 2, ' ' ) << " with body" << endl;
     361                        os << string( indent + 2, ' ' ) << " with body " << endl;
    362362                } // if
    363363                break;
    … …  
    370370                } // if
    371371                if ( aggInst.params ) {
    372                         os << string( indent + 2, ' ' ) << "with parameters" << endl;
     372                        os << string( indent + 2, ' ' ) << "with parameters " << endl;
    373373                        aggInst.params->printList( os, indent + 2 );
    374374                } // if
    … …  
    381381                } // if
    382382                if ( enumeration.body ) {
    383                         os << string( indent + 2, ' ' ) << " with body" << endl;
     383                        os << string( indent + 2, ' ' ) << " with body " << endl;
    384384                } // if
    385385                break;
    … …  
    418418                os << "tuple ";
    419419                if ( tuple ) {
    420                         os << "with members" << endl;
     420                        os << "with members " << endl;
    421421                        tuple->printList( os, indent + 2 );
    422422                } // if
    … …  
    942942        assert( td->typeexpr );
    943943        // assert( td->typeexpr->expr );
    944         return new TypeofType{
     944        return new TypeofType{ 
    945945                buildQualifiers( td ), td->typeexpr->build(), td->kind == TypeData::Basetypeof };
    946946} // buildTypeof

  • src/SynTree/Expression.cc

    r276a55b2 r52ffa30  
    456456
    457457void UntypedExpr::print( std::ostream &os, Indenter indent ) const {
    458         os << "Applying untyped:" << std::endl;
     458        os << "Applying untyped: " << std::endl;
    459459        os << indent+1;
    460460        function->print(os, indent+1);
    461         os << std::endl << indent << "...to:" << std::endl;
     461        os << std::endl << indent << "...to: " << std::endl;
    462462        printAll(args, os, indent+1);
    463463        Expression::print( os, indent );

  • src/SynTree/ReferenceToType.cc

    r276a55b2 r52ffa30  
    205205
    206206        Type::print( os, indent );
    207         os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type)";
     207        os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type) ";
    208208        if ( ! parameters.empty() ) {
    209209                os << endl << indent << "... with parameters" << endl;

  • src/SynTree/Type.cc

    r276a55b2 r52ffa30  
    118118
    119119void QualifiedType::print( std::ostream & os, Indenter indent ) const {
    120         os << "Qualified Type:" << endl;
     120        os << "Qualified Type: " << endl;
    121121        os << indent+1;
    122122        parent->print( os, indent+1 );

  • tests/.expect/alloc-ERROR.txt

    r276a55b2 r52ffa30  
    1 alloc.cfa:265:1 error: No reasonable alternatives for expression Applying untyped:
     1alloc.cfa:265:1 error: No reasonable alternatives for expression Applying untyped: 
    22  Name: ?=?
    3 ...to:
     3...to: 
    44  Name: p
    5   Applying untyped:
     5  Applying untyped: 
    66    Name: realloc
    7   ...to:
     7  ...to: 
    88    Name: stp
    9     Applying untyped:
     9    Applying untyped: 
    1010      Name: ?*?
    11     ...to:
     11    ...to: 
    1212      Name: dim
    13       Sizeof Expression on: Applying untyped:
     13      Sizeof Expression on: Applying untyped: 
    1414          Name: *?
    15         ...to:
     15        ...to: 
    1616          Name: stp
    1717
    … …  
    1919
    2020
    21 alloc.cfa:266:1 error: No reasonable alternatives for expression Applying untyped:
     21alloc.cfa:266:1 error: No reasonable alternatives for expression Applying untyped: 
    2222  Name: ?=?
    23 ...to:
     23...to: 
    2424  Name: p
    25   Applying untyped:
     25  Applying untyped: 
    2626    Name: alloc
    27   ...to:
     27  ...to: 
    2828    Name: stp
    29     Applying untyped:
     29    Applying untyped: 
    3030      Name: ?*?
    31     ...to:
     31    ...to: 
    3232      Name: dim
    33       Sizeof Expression on: Applying untyped:
     33      Sizeof Expression on: Applying untyped: 
    3434          Name: *?
    35         ...to:
     35        ...to: 
    3636          Name: stp
    3737
    … …  
    3939
    4040
    41 alloc.cfa:267:1 error: No reasonable alternatives for expression Applying untyped:
     41alloc.cfa:267:1 error: No reasonable alternatives for expression Applying untyped: 
    4242  Name: ?=?
    43 ...to:
     43...to: 
    4444  Name: p
    45   Applying untyped:
     45  Applying untyped: 
    4646    Name: memset
    47   ...to:
     47  ...to: 
    4848    Name: stp
    4949    constant expression (10 10: signed int)
    5050
    5151
    52 alloc.cfa:268:1 error: No reasonable alternatives for expression Applying untyped:
     52alloc.cfa:268:1 error: No reasonable alternatives for expression Applying untyped: 
    5353  Name: ?=?
    54 ...to:
     54...to: 
    5555  Name: p
    56   Applying untyped:
     56  Applying untyped: 
    5757    Name: memcpy
    58   ...to:
     58  ...to: 
    5959    Address of:
    6060      Name: st1

  • tests/.expect/completeTypeError.txt

    r276a55b2 r52ffa30  
    1 completeTypeError.cfa:33:1 error: No reasonable alternatives for expression Applying untyped:
     1completeTypeError.cfa:33:1 error: No reasonable alternatives for expression Applying untyped: 
    22  Name: *?
    3 ...to:
     3...to: 
    44  Name: v
    55
    6 completeTypeError.cfa:34:1 error: No reasonable alternatives for expression Applying untyped:
     6completeTypeError.cfa:34:1 error: No reasonable alternatives for expression Applying untyped: 
    77  Name: *?
    8 ...to:
     8...to: 
    99  Name: y
    1010
    11 completeTypeError.cfa:35:1 error: No reasonable alternatives for expression Applying untyped:
     11completeTypeError.cfa:35:1 error: No reasonable alternatives for expression Applying untyped: 
    1212  Name: foo
    13 ...to:
     13...to: 
    1414  Name: v
    1515
    16 completeTypeError.cfa:36:1 error: No reasonable alternatives for expression Applying untyped:
     16completeTypeError.cfa:36:1 error: No reasonable alternatives for expression Applying untyped: 
    1717  Name: baz
    18 ...to:
     18...to: 
    1919  Name: v
    2020
    21 completeTypeError.cfa:37:1 error: No reasonable alternatives for expression Applying untyped:
     21completeTypeError.cfa:37:1 error: No reasonable alternatives for expression Applying untyped: 
    2222  Name: quux
    23 ...to:
     23...to: 
    2424  Name: v
    2525
    26 completeTypeError.cfa:58:1 error: No reasonable alternatives for expression Applying untyped:
     26completeTypeError.cfa:58:1 error: No reasonable alternatives for expression Applying untyped: 
    2727  Name: baz
    28 ...to:
     28...to: 
    2929  Name: y
    3030
    31 completeTypeError.cfa:59:1 error: No reasonable alternatives for expression Applying untyped:
     31completeTypeError.cfa:59:1 error: No reasonable alternatives for expression Applying untyped: 
    3232  Name: quux
    33 ...to:
     33...to: 
    3434  Name: y
    3535
    36 completeTypeError.cfa:60:1 error: No reasonable alternatives for expression Applying untyped:
     36completeTypeError.cfa:60:1 error: No reasonable alternatives for expression Applying untyped: 
    3737  Name: *?
    38 ...to:
     38...to: 
    3939  Name: y
    4040
    41 completeTypeError.cfa:72:1 error: No reasonable alternatives for expression Applying untyped:
     41completeTypeError.cfa:72:1 error: No resolvable alternatives for expression Applying untyped:
    4242  Name: baz
    43 ...to:
     43...to: 
    4444  Name: z
    4545
     46Alternatives with failing assertions are:
     47Cost ( 0, 1, 0, 1, -5, 0 ): Application of
     48     Variable Expression: baz: forall
     49       T: sized object type
     50       ... with assertions
     51         ?=?: pointer to function
     52         ... with parameters
     53           reference to instance of type T (not function type)
     54           instance of type T (not function type)
     55         ... returning
     56           _retval__operator_assign: instance of type T (not function type)
     57           ... with attributes:
     58             Attribute with name: unused
     59
     60
     61         ?{}: pointer to function
     62         ... with parameters
     63           reference to instance of type T (not function type)
     64         ... returning nothing
     65
     66         ?{}: pointer to function
     67         ... with parameters
     68           reference to instance of type T (not function type)
     69           instance of type T (not function type)
     70         ... returning nothing
     71
     72         ^?{}: pointer to function
     73         ... with parameters
     74           reference to instance of type T (not function type)
     75         ... returning nothing
     76
     77
     78       function
     79     ... with parameters
     80       pointer to instance of type T (not function type)
     81     ... returning nothing
     82
     83   ... to arguments
     84     Variable Expression: z: pointer to instance of type T (not function type)
     85
     86 (types:
     87   void
     88 )
     89 Environment:( _73_0_T ) -> instance of type T (not function type)  (no widening)
     90
     91
     92

  • tests/.expect/declarationErrors.txt

    r276a55b2 r52ffa30  
    66
    77declarationErrors.cfa:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
    8   with members
     8  with members 
    99    i: int
    10    with body
     10   with body 
    1111
    1212
    1313declarationErrors.cfa:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
    14   with members
     14  with members 
    1515    i: int
    16    with body
     16   with body 
    1717
    1818
    … …  
    2020
    2121declarationErrors.cfa:24:1 error: duplicate const in declaration of f01: static inline function
    22   with no parameters
     22  with no parameters 
    2323  returning const volatile int
    2424
    2525
    2626declarationErrors.cfa:25:1 error: duplicate volatile in declaration of f02: static inline function
    27   with no parameters
     27  with no parameters 
    2828  returning const volatile int
    2929
    3030
    3131declarationErrors.cfa:26:1 error: duplicate const in declaration of f03: static inline function
    32   with no parameters
     32  with no parameters 
    3333  returning const volatile int
    3434
    3535
    3636declarationErrors.cfa:27:1 error: duplicate volatile in declaration of f04: static inline function
    37   with no parameters
     37  with no parameters 
    3838  returning const volatile int
    3939
    4040
    4141declarationErrors.cfa:28:1 error: duplicate const in declaration of f05: static inline function
    42   with no parameters
     42  with no parameters 
    4343  returning const volatile int
    4444
    4545
    4646declarationErrors.cfa:29:1 error: duplicate volatile in declaration of f06: static inline function
    47   with no parameters
     47  with no parameters 
    4848  returning const volatile int
    4949
    5050
    5151declarationErrors.cfa:30:1 error: duplicate const in declaration of f07: static inline function
    52   with no parameters
     52  with no parameters 
    5353  returning const volatile int
    5454
    5555
    5656declarationErrors.cfa:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
    57   with no parameters
     57  with no parameters 
    5858  returning const volatile int
    5959
    6060
    6161declarationErrors.cfa:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
    62   with no parameters
     62  with no parameters 
    6363  returning const volatile int
    6464
    6565
    6666declarationErrors.cfa:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
    67   with no parameters
     67  with no parameters 
    6868  returning const restrict volatile _Atomic int
    6969

  • tests/.expect/nested-types-ERR2.txt

    r276a55b2 r52ffa30  
    11nested-types.cfa:73:1 error: Use of undefined global type Z
    22nested-types.cfa:74:1 error: Qualified type requires an aggregate on the left, but has: signed int
    3 nested-types.cfa:75:1 error: Undefined type in qualified type: Qualified Type:
     3nested-types.cfa:75:1 error: Undefined type in qualified type: Qualified Type: 
    44  instance of struct S with body 1
    5   instance of type Z (not function type)
     5  instance of type Z (not function type) 
    66

  • tests/concurrent/examples/datingService.cfa

    r276a55b2 r52ffa30  
    3333                signal_block( Boys[ccode] );                                    // restart boy to set phone number
    3434        } // if
    35         sout | "Girl:" | PhoneNo | "is dating Boy at" | BoyPhoneNo | "with ccode" | ccode;
    3635        return BoyPhoneNo;
    3736} // DatingService girl
    … …  
    4544                signal_block( Girls[ccode] );                                   // restart girl to set phone number
    4645        } // if
    47         sout | " Boy:" | PhoneNo | "is dating Girl" | GirlPhoneNo | "with ccode" | ccode;
    4846        return GirlPhoneNo;
    4947} // DatingService boy
    … …  
    6058        yield( random( 100 ) );                                                         // don't all start at the same time
    6159        unsigned int partner = girl( TheExchange, id, ccode );
     60        sout | "Girl:" | id | "is dating Boy at" | partner | "with ccode" | ccode;
    6261        girlck[id] = partner;
    6362} // Girl main
    … …  
    7776        yield( random( 100 ) );                                                         // don't all start at the same time
    7877        unsigned int partner = boy( TheExchange, id, ccode );
     78        sout | " Boy:" | id | "is dating Girl" | partner | "with ccode" | ccode;
    7979        boyck[id] = partner;
    8080} // Boy main
Note: See TracChangeset for help on using the changeset viewer.