Changeset b128d3e for src

Timestamp:

Aug 28, 2017, 1:55:16 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

193bba0

Parents:

7ee1e2f6

Message:

remove contraction from error message

Location:

src

Files:

• Common/CodeLocation.h (modified) (2 diffs)
• InitTweak/InitTweak.cc (modified) (2 diffs)
• Parser/parser.yy (modified) (2 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• SymTab/Validate.cc (modified) (2 diffs)

src/Common/CodeLocation.h

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Thr Aug 17 11:23:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 14:07:00 2017
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Aug 28 12:46:01 2017
+// Update Count     : 2
 //
 
@@ -66 +66 @@
 
 inline std::string to_string( const CodeLocation& location ) {
-    return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
+    // Column number ":1" allows IDEs to parse the error message and position the cursor in the source text.
+    return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + ":1 " : "";
 }
 

src/InitTweak/InitTweak.cc

@@ -325 +325 @@
                         std::string name = getFunctionName( expr );
                         assertf( name == "*?", "Unexpected untyped expression: %s", name.c_str() );
-                        assertf( ! expr->get_args().empty(), "Can't get called function from dereference with no arguments" );
+                        assertf( ! expr->get_args().empty(), "Cannot get called function from dereference with no arguments" );
                         return getCalledFunction( expr->get_args().front() );
                 }
@@ -433 +433 @@
                         std::string name = getFunctionName( expr );
                         assertf( name == "*?", "Unexpected untyped expression: %s", name.c_str() );
-                        assertf( ! expr->get_args().empty(), "Can't get function name from dereference with no arguments" );
+                        assertf( ! expr->get_args().empty(), "Cannot get function name from dereference with no arguments" );
                         return funcName( expr->get_args().front() );
                 }

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 26 17:50:19 2017
-// Update Count     : 2712
+// Last Modified On : Mon Aug 28 13:24:10 2017
+// Update Count     : 2720
 //
 
@@ -3136 +3136 @@
 
 void yyerror( const char * ) {
-        cout << "Error ";
         if ( yyfilename ) {
-                cout << "in file " << yyfilename << " ";
+                cout << yyfilename << ":";
         } // if
-        cout << "at line " << yylineno << " reading token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << endl;
+        cout << yylineno << ":1 syntax error at token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << endl;
 }
 

src/ResolvExpr/AlternativeFinder.cc

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

src/SymTab/Validate.cc

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