Browse Source

Clean uses of #messageText:.

Uses Error class >> signal: more.

Add Error class >> messageText: to just create an instance.
Herby Vojčík 3 years ago
parent
commit
1b25dc062b

+ 2 - 0
lang/API-CHANGES.txt

@@ -3,6 +3,8 @@
 * Add TPromiseModel with unary value / signal passing to 1-arg.
   * Promise class as well as PromiseExecution use it.
 
++ Error class >>
+  + messageText:
 + PromiseExecution >>
   + do:
   + signal:

+ 3 - 6
lang/src/Compiler-Core.js

@@ -961,25 +961,23 @@ selector: "parseError:parsing:",
 protocol: "error handling",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anException", "aString"],
-source: "parseError: anException parsing: aString\x0a\x09| loc |\x0a\x09loc := anException basicAt: 'location'.\x0a\x09^ ParseError new \x0a\x09\x09messageText: \x0a\x09\x09\x09'Parse error on line ', loc start line asString,\x0a\x09\x09\x09' column ' , loc start column asString,\x0a\x09\x09\x09' : Unexpected character ', (anException basicAt: 'found');\x0a\x09\x09yourself",
+source: "parseError: anException parsing: aString\x0a\x09| loc |\x0a\x09loc := anException basicAt: 'location'.\x0a\x09^ ParseError messageText:\x0a\x09\x09'Parse error on line ', loc start line asString,\x0a\x09\x09' column ' , loc start column asString,\x0a\x09\x09' : Unexpected character ', (anException basicAt: 'found')",
 referencedClasses: ["ParseError"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["basicAt:", "messageText:", "new", ",", "asString", "line", "start", "column", "yourself"]
+messageSends: ["basicAt:", "messageText:", ",", "asString", "line", "start", "column"]
 }, function ($methodClass){ return function (anException,aString){
 var self=this,$self=this;
 var loc;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 loc=[$recv(anException)._basicAt_("location")
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["basicAt:"]=1
 //>>excludeEnd("ctx");
 ][0];
-$1=$recv($globals.ParseError)._new();
-$recv($1)._messageText_([$recv([$recv([$recv([$recv("Parse error on line ".__comma([$recv($recv([$recv(loc)._start()
+return $recv($globals.ParseError)._messageText_([$recv([$recv([$recv([$recv("Parse error on line ".__comma([$recv($recv([$recv(loc)._start()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["start"]=1
 //>>excludeEnd("ctx");
@@ -1004,7 +1002,6 @@ $recv($1)._messageText_([$recv([$recv([$recv([$recv("Parse error on line ".__com
 ,$ctx1.sendIdx[","]=1
 //>>excludeEnd("ctx");
 ][0]);
-return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"parseError:parsing:",{anException:anException,aString:aString,loc:loc})});
 //>>excludeEnd("ctx");

+ 4 - 6
lang/src/Compiler-Core.st

@@ -289,12 +289,10 @@ error: aString
 parseError: anException parsing: aString
 	| loc |
 	loc := anException basicAt: 'location'.
-	^ ParseError new 
-		messageText: 
-			'Parse error on line ', loc start line asString,
-			' column ' , loc start column asString,
-			' : Unexpected character ', (anException basicAt: 'found');
-		yourself
+	^ ParseError messageText:
+		'Parse error on line ', loc start line asString,
+		' column ' , loc start column asString,
+		' : Unexpected character ', (anException basicAt: 'found')
 ! !
 
 !Compiler methodsFor: 'private'!

+ 27 - 1
lang/src/Kernel-Exceptions.js

@@ -113,7 +113,7 @@ selector: "initialize",
 protocol: "initialization",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "initialize\x0a\x09self messageText: 'Errorclass: ', (self class name).",
+source: "initialize\x0a\x09self messageText: 'Errorclass: ', self class name.",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
@@ -437,6 +437,32 @@ return "exception";
 }; }),
 $globals.Error.a$cls);
 
+$core.addMethod(
+$core.method({
+selector: "messageText:",
+protocol: "instance creation",
+//>>excludeStart("ide", pragmas.excludeIdeData);
+args: ["aString"],
+source: "messageText: aString\x0a\x09^ self new\x0a\x09\x09messageText: aString;\x0a\x09\x09yourself",
+referencedClasses: [],
+//>>excludeEnd("ide");
+pragmas: [],
+messageSends: ["messageText:", "new", "yourself"]
+}, function ($methodClass){ return function (aString){
+var self=this,$self=this;
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+return $core.withContext(function($ctx1) {
+//>>excludeEnd("ctx");
+var $1;
+$1=$self._new();
+$recv($1)._messageText_(aString);
+return $recv($1)._yourself();
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+}, function($ctx1) {$ctx1.fill(self,"messageText:",{aString:aString})});
+//>>excludeEnd("ctx");
+}; }),
+$globals.Error.a$cls);
+
 $core.addMethod(
 $core.method({
 selector: "signal",

+ 7 - 1
lang/src/Kernel-Exceptions.st

@@ -58,7 +58,7 @@ signalerContextFrom: aContext
 !Error methodsFor: 'initialization'!
 
 initialize
-	self messageText: 'Errorclass: ', (self class name).
+	self messageText: 'Errorclass: ', self class name.
 ! !
 
 !Error methodsFor: 'private'!
@@ -116,6 +116,12 @@ classTag
 
 !Error class methodsFor: 'instance creation'!
 
+messageText: aString
+	^ self new
+		messageText: aString;
+		yourself
+!
+
 signal
 	^ self new signal
 !

+ 3 - 37
lang/src/Platform-ImportExport.js

@@ -3130,30 +3130,27 @@ selector: "commit:",
 protocol: "committing",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aPackage"],
-source: "commit: aPackage\x0a\x09self \x0a\x09\x09commit: aPackage\x0a\x09\x09onSuccess: []\x0a\x09\x09onError: [ :error |\x0a\x09\x09\x09PackageCommitError new\x0a\x09\x09\x09\x09messageText: 'Commiting failed with reason: \x22' , (error responseText) , '\x22';\x0a\x09\x09\x09\x09signal ]",
+source: "commit: aPackage\x0a\x09self \x0a\x09\x09commit: aPackage\x0a\x09\x09onSuccess: []\x0a\x09\x09onError: [ :error |\x0a\x09\x09\x09PackageCommitError\x0a\x09\x09\x09\x09signal: 'Commiting failed with reason: \x22' , error responseText , '\x22' ]",
 referencedClasses: ["PackageCommitError"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["commit:onSuccess:onError:", "messageText:", "new", ",", "responseText", "signal"]
+messageSends: ["commit:onSuccess:onError:", "signal:", ",", "responseText"]
 }, function ($methodClass){ return function (aPackage){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 $self._commit_onSuccess_onError_(aPackage,(function(){
 
 }),(function(error){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$1=$recv($globals.PackageCommitError)._new();
-$recv($1)._messageText_([$recv("Commiting failed with reason: \x22".__comma($recv(error)._responseText())).__comma("\x22")
+return $recv($globals.PackageCommitError)._signal_([$recv("Commiting failed with reason: \x22".__comma($recv(error)._responseText())).__comma("\x22")
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx2.sendIdx[","]=1
 //>>excludeEnd("ctx");
 ][0]);
-return $recv($1)._signal();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({error:error},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -3420,37 +3417,6 @@ return self;
 }; }),
 $globals.PackageHandler);
 
-$core.addMethod(
-$core.method({
-selector: "onCommitError:",
-protocol: "error handling",
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["anError"],
-source: "onCommitError: anError\x0a\x09PackageCommitError new\x0a\x09\x09messageText: 'Commiting failed with reason: \x22' , (anError responseText) , '\x22';\x0a\x09\x09signal",
-referencedClasses: ["PackageCommitError"],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: ["messageText:", "new", ",", "responseText", "signal"]
-}, function ($methodClass){ return function (anError){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-$1=$recv($globals.PackageCommitError)._new();
-$recv($1)._messageText_([$recv("Commiting failed with reason: \x22".__comma($recv(anError)._responseText())).__comma("\x22")
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx1.sendIdx[","]=1
-//>>excludeEnd("ctx");
-][0]);
-$recv($1)._signal();
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"onCommitError:",{anError:anError})});
-//>>excludeEnd("ctx");
-}; }),
-$globals.PackageHandler);
-
 $core.addMethod(
 $core.method({
 selector: "setPath:forPackage:",

+ 2 - 11
lang/src/Platform-ImportExport.st

@@ -794,9 +794,8 @@ commit: aPackage
 		commit: aPackage
 		onSuccess: []
 		onError: [ :error |
-			PackageCommitError new
-				messageText: 'Commiting failed with reason: "' , (error responseText) , '"';
-				signal ]
+			PackageCommitError
+				signal: 'Commiting failed with reason: "' , error responseText , '"' ]
 !
 
 commit: aPackage onSuccess: aBlock onError: anotherBlock
@@ -826,14 +825,6 @@ commitStFileFor: aPackage onSuccess: aBlock onError: anotherBlock
 		onError: anotherBlock
 ! !
 
-!PackageHandler methodsFor: 'error handling'!
-
-onCommitError: anError
-	PackageCommitError new
-		messageText: 'Commiting failed with reason: "' , (anError responseText) , '"';
-		signal
-! !
-
 !PackageHandler methodsFor: 'factory'!
 
 chunkExporter

+ 3 - 6
lang/src/SUnit.js

@@ -736,20 +736,17 @@ selector: "signalFailure:",
 protocol: "private",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "signalFailure: aString\x0a\x09TestFailure new\x0a\x09\x09messageText: aString;\x0a\x09\x09signal",
+source: "signalFailure: aString\x0a\x09TestFailure signal: aString",
 referencedClasses: ["TestFailure"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["messageText:", "new", "signal"]
+messageSends: ["signal:"]
 }, function ($methodClass){ return function (aString){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($globals.TestFailure)._new();
-$recv($1)._messageText_(aString);
-$recv($1)._signal();
+$recv($globals.TestFailure)._signal_(aString);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"signalFailure:",{aString:aString})});

+ 1 - 3
lang/src/SUnit.st

@@ -146,9 +146,7 @@ errorIfNotAsync: aString
 !TestCase methodsFor: 'private'!
 
 signalFailure: aString
-	TestFailure new
-		messageText: aString;
-		signal
+	TestFailure signal: aString
 ! !
 
 !TestCase methodsFor: 'running'!