Changes in / [afce1cf:26238c1]


Ignore:
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • doc/LaTeXmacros/common.tex

    rafce1cf r26238c1  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Mon Aug 28 09:39:38 2017
    14 %% Update Count     : 354
     13%% Last Modified On : Mon Jul 24 21:02:14 2017
     14%% Update Count     : 352
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
    … …  
    148148% Latin abbreviation
    149149\newcommand{\abbrevFont}{\textit}       % set empty for no italics
    150 \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
    151150\newcommand*{\eg}{%
    152         \@ifnextchar{,}{\EG}%
    153                 {\@ifnextchar{:}{\EG}%
    154                         {\EG,\xspace}}%
    155 }%
    156 \newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
     151        \@ifnextchar{,}{\abbrevFont{e}.\abbrevFont{g}.}%
     152                {\@ifnextchar{:}{\abbrevFont{e}.\abbrevFont{g}.}%
     153                        {\abbrevFont{e}.\abbrevFont{g}.,\xspace}}%
     154}%
    157155\newcommand*{\ie}{%
    158         \@ifnextchar{,}{\IE}%
    159                 {\@ifnextchar{:}{\IE}%
    160                         {\IE,\xspace}}%
    161 }%
    162 \newcommand{\ETC}{\abbrevFont{etc}}
     156        \@ifnextchar{,}{\abbrevFont{i}.\abbrevFont{e}.}%
     157                {\@ifnextchar{:}{\abbrevFont{i}.\abbrevFont{e}.}%
     158                        {\abbrevFont{i}.\abbrevFont{e}.,\xspace}}%
     159}%
    163160\newcommand*{\etc}{%
    164         \@ifnextchar{.}{\ETC}%
    165         {\ETC\xspace}%
    166 }%
    167 \newcommand{\ETAL}{\abbrevFont{et\:al}}
     161        \@ifnextchar{.}{\abbrevFont{etc}}%
     162        {\abbrevFont{etc}.\xspace}%
     163}%
    168164\newcommand{\etal}{%
    169         \@ifnextchar{.}{\ETAL}%
    170                 {\abbrevFont{\ETAL}.\xspace}%
     165        \@ifnextchar{.}{\abbrevFont{et~al}}%
     166                {\abbrevFont{et al}.\xspace}%
    171167}%
    172168\makeatother

  • src/Common/CodeLocation.h

    rafce1cf r26238c1  
    99// Author           : Andrew Beach
    1010// Created On       : Thr Aug 17 11:23:00 2017
    11 // Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Aug 28 12:46:01 2017
    13 // Update Count     : 2
     11// Last Modified By : Andrew Beach
     12// Last Modified On : Thr Aug 17 14:07:00 2017
     13// Update Count     : 0
    1414//
    1515
    … …  
    6666
    6767inline std::string to_string( const CodeLocation& location ) {
    68     // Column number ":1" allows IDEs to parse the error message and position the cursor in the source text.
    69     return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + ":1 " : "";
     68    return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
    7069}
    7170

  • src/InitTweak/InitTweak.cc

    rafce1cf r26238c1  
    325325                        std::string name = getFunctionName( expr );
    326326                        assertf( name == "*?", "Unexpected untyped expression: %s", name.c_str() );
    327                         assertf( ! expr->get_args().empty(), "Cannot get called function from dereference with no arguments" );
     327                        assertf( ! expr->get_args().empty(), "Can't get called function from dereference with no arguments" );
    328328                        return getCalledFunction( expr->get_args().front() );
    329329                }
    … …  
    433433                        std::string name = getFunctionName( expr );
    434434                        assertf( name == "*?", "Unexpected untyped expression: %s", name.c_str() );
    435                         assertf( ! expr->get_args().empty(), "Cannot get function name from dereference with no arguments" );
     435                        assertf( ! expr->get_args().empty(), "Can't get function name from dereference with no arguments" );
    436436                        return funcName( expr->get_args().front() );
    437437                }

  • src/Parser/parser.yy

    rafce1cf r26238c1  
    1010// Created On       : Sat Sep  1 20:22:55 2001
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Aug 28 13:24:10 2017
    13 // Update Count     : 2720
     12// Last Modified On : Sat Aug 26 17:50:19 2017
     13// Update Count     : 2712
    1414//
    1515
    … …  
    31363136
    31373137void yyerror( const char * ) {
     3138        cout << "Error ";
    31383139        if ( yyfilename ) {
    3139                 cout << yyfilename << ":";
     3140                cout << "in file " << yyfilename << " ";
    31403141        } // if
    3141         cout << yylineno << ":1 syntax error at token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << endl;
     3142        cout << "at line " << yylineno << " reading token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << endl;
    31423143}
    31433144

  • src/ResolvExpr/AlternativeFinder.cc

    rafce1cf r26238c1  
    99// Author           : Richard C. Bilson
    1010// Created On       : Sat May 16 23:52:08 2015
    11 // Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Aug 28 13:47:24 2017
    13 // Update Count     : 32
     11// Last Modified By : Andrew Beach
     12// Last Modified On : Wed Jul 26 11:33:00 2017
     13// Update Count     : 31
    1414//
    1515
    … …  
    195195                                AltList winners;
    196196                                findMinCost( alternatives.begin(), alternatives.end(), back_inserter( winners ) );
    197                                 stream << "Cannot choose between " << winners.size() << " alternatives for expression ";
     197                                stream << "Can't choose between " << winners.size() << " alternatives for expression ";
    198198                                expr->print( stream );
    199199                                stream << "Alternatives are:";

  • src/SymTab/Validate.cc

    rafce1cf r26238c1  
    99// Author           : Richard C. Bilson
    1010// Created On       : Sun May 17 21:50:04 2015
    11 // Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Aug 28 13:47:23 2017
    13 // Update Count     : 359
     11// Last Modified By : Andrew Beach
     12// Last Modified On : Tus Aug  8 13:27:00 2017
     13// Update Count     : 358
    1414//
    1515
    … …  
    664664                } else {
    665665                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
    666                         assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->get_name().c_str() );
     666                        assertf( base != typedeclNames.end(), "Can't find typedecl name %s", typeInst->get_name().c_str() );
    667667                        typeInst->set_baseType( base->second );
    668668                } // if

  • src/tests/.expect/castError.txt

    rafce1cf r26238c1  
    1 castError.c:7:1 error: Cannot choose between 3 alternatives for expression Cast of:
     1castError.c:7 error: Can't choose between 3 alternatives for expression Cast of:
    22  Name: f
    33

  • src/tests/.expect/completeTypeError.txt

    rafce1cf r26238c1  
    1 completeTypeError.c:34:1 error: No reasonable alternatives for expression Applying untyped:
     1completeTypeError.c:34 error: No reasonable alternatives for expression Applying untyped:
    22  Name: *?
    33...to:
    … …  
    55
    66
    7 completeTypeError.c:36:1 error: No reasonable alternatives for expression Applying untyped:
     7completeTypeError.c:36 error: No reasonable alternatives for expression Applying untyped:
    88  Name: baz
    99...to:
    … …  
    1111
    1212
    13 completeTypeError.c:37:1 error: No reasonable alternatives for expression Applying untyped:
     13completeTypeError.c:37 error: No reasonable alternatives for expression Applying untyped:
    1414  Name: quux
    1515...to:
    … …  
    1717
    1818
    19 completeTypeError.c:58:1 error: No reasonable alternatives for expression Applying untyped:
     19completeTypeError.c:58 error: No reasonable alternatives for expression Applying untyped:
    2020  Name: baz
    2121...to:
    … …  
    2323
    2424
    25 completeTypeError.c:59:1 error: No reasonable alternatives for expression Applying untyped:
     25completeTypeError.c:59 error: No reasonable alternatives for expression Applying untyped:
    2626  Name: quux
    2727...to:
    … …  
    2929
    3030
    31 completeTypeError.c:60:1 error: No reasonable alternatives for expression Applying untyped:
     31completeTypeError.c:60 error: No reasonable alternatives for expression Applying untyped:
    3232  Name: *?
    3333...to:
    … …  
    3535
    3636
    37 completeTypeError.c:72:1 error: No reasonable alternatives for expression Applying untyped:
     37completeTypeError.c:72 error: No reasonable alternatives for expression Applying untyped:
    3838  Name: baz
    3939...to:

  • src/tests/.expect/declarationErrors.txt

    rafce1cf r26238c1  
    1 declarationErrors.c:16:1 error: duplicate static in declaration of x1: static const volatile short int
     1declarationErrors.c:16 error: duplicate static in declaration of x1: static const volatile short int
    22
    3 declarationErrors.c:17:1 error: conflicting extern & static in declaration of x2: extern const volatile short int
     3declarationErrors.c:17 error: conflicting extern & static in declaration of x2: extern const volatile short int
    44
    5 declarationErrors.c:18:1 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int
     5declarationErrors.c:18 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int
    66
    7 declarationErrors.c:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
     7declarationErrors.c:19 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
    88  with members
    99   with body
    1010
    1111
    12 declarationErrors.c:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
     12declarationErrors.c:20 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
    1313  with members
    1414   with body
    1515
    1616
    17 declarationErrors.c:22:1 error: duplicate static in declaration of x6: static const volatile instance of type Int
     17declarationErrors.c:22 error: duplicate static in declaration of x6: static const volatile instance of type Int
    1818
    19 declarationErrors.c:24:1 error: duplicate const in declaration of f01: static inline function
     19declarationErrors.c:24 error: duplicate const in declaration of f01: static inline function
    2020  with no parameters
    2121  returning const volatile int
    2222
    2323
    24 declarationErrors.c:25:1 error: duplicate volatile in declaration of f02: static inline function
     24declarationErrors.c:25 error: duplicate volatile in declaration of f02: static inline function
    2525  with no parameters
    2626  returning const volatile int
    2727
    2828
    29 declarationErrors.c:26:1 error: duplicate const in declaration of f03: static inline function
     29declarationErrors.c:26 error: duplicate const in declaration of f03: static inline function
    3030  with no parameters
    3131  returning const volatile int
    3232
    3333
    34 declarationErrors.c:27:1 error: duplicate volatile in declaration of f04: static inline function
     34declarationErrors.c:27 error: duplicate volatile in declaration of f04: static inline function
    3535  with no parameters
    3636  returning const volatile int
    3737
    3838
    39 declarationErrors.c:28:1 error: duplicate const in declaration of f05: static inline function
     39declarationErrors.c:28 error: duplicate const in declaration of f05: static inline function
    4040  with no parameters
    4141  returning const volatile int
    4242
    4343
    44 declarationErrors.c:29:1 error: duplicate volatile in declaration of f06: static inline function
     44declarationErrors.c:29 error: duplicate volatile in declaration of f06: static inline function
    4545  with no parameters
    4646  returning const volatile int
    4747
    4848
    49 declarationErrors.c:30:1 error: duplicate const in declaration of f07: static inline function
     49declarationErrors.c:30 error: duplicate const in declaration of f07: static inline function
    5050  with no parameters
    5151  returning const volatile int
    5252
    5353
    54 declarationErrors.c:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
     54declarationErrors.c:31 error: duplicate const, duplicate volatile in declaration of f08: static inline function
    5555  with no parameters
    5656  returning const volatile int
    5757
    5858
    59 declarationErrors.c:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
     59declarationErrors.c:33 error: duplicate const, duplicate volatile in declaration of f09: static inline function
    6060  with no parameters
    6161  returning const volatile int
    6262
    6363
    64 declarationErrors.c:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
     64declarationErrors.c:34 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
    6565  with no parameters
    6666  returning const restrict volatile _Atomic int

  • src/tests/.expect/dtor-early-exit-ERR1.txt

    rafce1cf r26238c1  
    1 dtor-early-exit.c:142:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
    2 
     1dtor-early-exit.c:142 error: jump to label 'L1' crosses initialization of y Branch (Goto)

  • src/tests/.expect/dtor-early-exit-ERR2.txt

    rafce1cf r26238c1  
    1 dtor-early-exit.c:142:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
    2 
     1dtor-early-exit.c:142 error: jump to label 'L2' crosses initialization of y Branch (Goto)

  • src/tests/.expect/memberCtors-ERR1.txt

    rafce1cf r26238c1  
    1 memberCtors.c:71:1 error: in void ?{}(B &b), field a2 used before being constructed
     1memberCtors.c:71 error: in void ?{}(B &b), field a2 used before being constructed

  • src/tests/.expect/scopeErrors.txt

    rafce1cf r26238c1  
    1 scopeErrors.c:2:1 error: duplicate object definition for thisIsAnError: signed int
    2 scopeErrors.c:20:1 error: duplicate function definition for butThisIsAnError: function
     1scopeErrors.c:2 error: duplicate object definition for thisIsAnError: signed int
     2scopeErrors.c:20 error: duplicate function definition for butThisIsAnError: function
    33  with parameters
    44    double
    5   returning 
     5  returning
    66    _retval_butThisIsAnError:       Attribute with name: unused
    77double
    8   with body 
     8  with body
    99    CompoundStmt
    10 
Note: See TracChangeset for help on using the changeset viewer.