Browse Source

Use Terminal {alert:,confirm:,prompt:}.

Instead of `self` via InterfacingObject inheritance.
Herbert Vojčík 7 years ago
parent
commit
3f72637921
4 changed files with 12 additions and 12 deletions
  1. 6 6
      src/Compiler-Core.js
  2. 2 2
      src/Compiler-Core.st
  3. 3 3
      src/Platform-Services.js
  4. 1 1
      src/Platform-Services.st

+ 6 - 6
src/Compiler-Core.js

@@ -970,7 +970,7 @@ return ast;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-throw $early=[self._alert_($recv(ex)._messageText())];
+throw $early=[$recv($globals.Terminal)._alert_($recv(ex)._messageText())];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({ex:ex},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -987,8 +987,8 @@ catch(e) {if(e===$early)return e[0]; throw e}
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString", "aContext"],
-source: "evaluate: aString context: aContext\x0a\x09\x22Similar to #evaluate:for:, with the following differences:\x0a\x09- instead of compiling and running `aString`, `aString` is interpreted using an `ASTInterpreter`\x0a\x09- instead of evaluating against a receiver, evaluate in the context of `aContext`\x22\x0a\x0a\x09| compiler ast |\x0a\x09\x0a\x09compiler := Compiler new.\x0a\x09[ ast := compiler parseExpression: aString ] \x0a\x09\x09on: Error \x0a\x09\x09do: [ :ex | ^ self alert: ex messageText ].\x0a\x09\x09\x0a\x09(AISemanticAnalyzer on: aContext receiver class)\x0a\x09\x09context: aContext;\x0a\x09\x09visit: ast.\x0a\x0a\x09^ aContext evaluateNode: ast",
-referencedClasses: ["Compiler", "Error", "AISemanticAnalyzer"],
+source: "evaluate: aString context: aContext\x0a\x09\x22Similar to #evaluate:for:, with the following differences:\x0a\x09- instead of compiling and running `aString`, `aString` is interpreted using an `ASTInterpreter`\x0a\x09- instead of evaluating against a receiver, evaluate in the context of `aContext`\x22\x0a\x0a\x09| compiler ast |\x0a\x09\x0a\x09compiler := Compiler new.\x0a\x09[ ast := compiler parseExpression: aString ] \x0a\x09\x09on: Error \x0a\x09\x09do: [ :ex | ^ Terminal alert: ex messageText ].\x0a\x09\x09\x0a\x09(AISemanticAnalyzer on: aContext receiver class)\x0a\x09\x09context: aContext;\x0a\x09\x09visit: ast.\x0a\x0a\x09^ aContext evaluateNode: ast",
+referencedClasses: ["Compiler", "Error", "Terminal", "AISemanticAnalyzer"],
 //>>excludeEnd("ide");
 messageSends: ["new", "on:do:", "parseExpression:", "alert:", "messageText", "context:", "on:", "class", "receiver", "visit:", "evaluateNode:"]
 }),
@@ -1042,7 +1042,7 @@ return $recv(compiler)._parseExpression_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-throw $early=[self._alert_($recv(ex)._messageText())];
+throw $early=[$recv($globals.Terminal)._alert_($recv(ex)._messageText())];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({ex:ex},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -1056,8 +1056,8 @@ catch(e) {if(e===$early)return e[0]; throw e}
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString", "anObject"],
-source: "evaluate: aString receiver: anObject\x0a\x09| compiler |\x0a\x09\x0a\x09compiler := Compiler new.\x0a\x09[ compiler parseExpression: aString ] \x0a\x09\x09on: Error \x0a\x09\x09do: [ :ex | ^ self alert: ex messageText ].\x0a\x0a\x09^ compiler evaluateExpression: aString on: anObject",
-referencedClasses: ["Compiler", "Error"],
+source: "evaluate: aString receiver: anObject\x0a\x09| compiler |\x0a\x09\x0a\x09compiler := Compiler new.\x0a\x09[ compiler parseExpression: aString ] \x0a\x09\x09on: Error \x0a\x09\x09do: [ :ex | ^ Terminal alert: ex messageText ].\x0a\x0a\x09^ compiler evaluateExpression: aString on: anObject",
+referencedClasses: ["Compiler", "Error", "Terminal"],
 //>>excludeEnd("ide");
 messageSends: ["new", "on:do:", "parseExpression:", "alert:", "messageText", "evaluateExpression:on:"]
 }),

+ 2 - 2
src/Compiler-Core.st

@@ -267,7 +267,7 @@ evaluate: aString context: aContext
 	compiler := Compiler new.
 	[ ast := compiler parseExpression: aString ] 
 		on: Error 
-		do: [ :ex | ^ self alert: ex messageText ].
+		do: [ :ex | ^ Terminal alert: ex messageText ].
 		
 	(AISemanticAnalyzer on: aContext receiver class)
 		context: aContext;
@@ -286,7 +286,7 @@ evaluate: aString receiver: anObject
 	compiler := Compiler new.
 	[ compiler parseExpression: aString ] 
 		on: Error 
-		do: [ :ex | ^ self alert: ex messageText ].
+		do: [ :ex | ^ Terminal alert: ex messageText ].
 
 	^ compiler evaluateExpression: aString on: anObject
 ! !

+ 3 - 3
src/Platform-Services.js

@@ -720,7 +720,7 @@ return self._evaluate_for_(aString,$recv($globals.DoIt)._new());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return self._alert_($recv(error)._messageText());
+return $recv($globals.Terminal)._alert_($recv(error)._messageText());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({error:error},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -732,8 +732,8 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "compileClassDefinition: aString\x0a\x09[ self evaluate: aString for: DoIt new ]\x0a\x09\x09on: Error\x0a\x09\x09do: [ :error | self alert: error messageText ]",
-referencedClasses: ["DoIt", "Error"],
+source: "compileClassDefinition: aString\x0a\x09[ self evaluate: aString for: DoIt new ]\x0a\x09\x09on: Error\x0a\x09\x09do: [ :error | Terminal alert: error messageText ]",
+referencedClasses: ["DoIt", "Error", "Terminal"],
 //>>excludeEnd("ide");
 messageSends: ["on:do:", "evaluate:for:", "new", "alert:", "messageText"]
 }),

+ 1 - 1
src/Platform-Services.st

@@ -274,7 +274,7 @@ compileClassComment: aString for: aClass
 compileClassDefinition: aString
 	[ self evaluate: aString for: DoIt new ]
 		on: Error
-		do: [ :error | self alert: error messageText ]
+		do: [ :error | Terminal alert: error messageText ]
 !
 
 compileMethod: sourceCode for: class protocol: protocol