Changeset b128d3e


Ignore:
Timestamp:
Aug 28, 2017, 1:55:16 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
193bba0
Parents:
7ee1e2f6
Message:

remove contraction from error message

Location:
src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/Common/CodeLocation.h

    r7ee1e2f6 rb128d3e  
    99// Author           : Andrew Beach
    1010// Created On       : Thr Aug 17 11:23:00 2017
    11 // Last Modified By : Andrew Beach
    12 // Last Modified On : Thr Aug 17 14:07:00 2017
    13 // Update Count     : 0
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Mon Aug 28 12:46:01 2017
     13// Update Count     : 2
    1414//
    1515
     
    6666
    6767inline std::string to_string( const CodeLocation& location ) {
    68     return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
     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 " : "";
    6970}
    7071
  • src/InitTweak/InitTweak.cc

    r7ee1e2f6 rb128d3e  
    325325                        std::string name = getFunctionName( expr );
    326326                        assertf( name == "*?", "Unexpected untyped expression: %s", name.c_str() );
    327                         assertf( ! expr->get_args().empty(), "Can't get called function from dereference with no arguments" );
     327                        assertf( ! expr->get_args().empty(), "Cannot 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(), "Can't get function name from dereference with no arguments" );
     435                        assertf( ! expr->get_args().empty(), "Cannot get function name from dereference with no arguments" );
    436436                        return funcName( expr->get_args().front() );
    437437                }
  • src/Parser/parser.yy

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

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

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