Browse Source

AstEarlyPragmator => AstSemanticPragmator.

Herby Vojčík 5 years ago
parent
commit
38acbc5019
4 changed files with 28 additions and 28 deletions
  1. 2 2
      lang/src/Compiler-AST.js
  2. 2 2
      lang/src/Compiler-AST.st
  3. 19 19
      lang/src/Compiler-Core.js
  4. 5 5
      lang/src/Compiler-Core.st

+ 2 - 2
lang/src/Compiler-AST.js

@@ -2525,7 +2525,7 @@ $globals.AstPragmator);
 
 
 
-$core.addClass("AstEarlyPragmator", $globals.AstPragmator, [], "Compiler-AST");
+$core.addClass("AstSemanticPragmator", $globals.AstPragmator, [], "Compiler-AST");
 $core.addMethod(
 $core.method({
 selector: "inlineJS:",
@@ -2570,7 +2570,7 @@ return self;
 }, function($ctx1) {$ctx1.fill(self,"inlineJS:",{aString:aString})});
 //>>excludeEnd("ctx");
 }; }),
-$globals.AstEarlyPragmator);
+$globals.AstSemanticPragmator);
 
 
 

+ 2 - 2
lang/src/Compiler-AST.st

@@ -645,11 +645,11 @@ value: aMethodNode
 	^ aMethodNode
 ! !
 
-AstPragmator subclass: #AstEarlyPragmator
+AstPragmator subclass: #AstSemanticPragmator
 	slots: {}
 	package: 'Compiler-AST'!
 
-!AstEarlyPragmator methodsFor: 'pragmas'!
+!AstSemanticPragmator methodsFor: 'pragmas'!
 
 inlineJS: aString
 	self methodNode sequenceNode dagChildren ifNotEmpty: [

+ 19 - 19
lang/src/Compiler-Core.js

@@ -254,49 +254,49 @@ $globals.AstGenerator.comment="I am a very basic code generator.\x0aI generate s
 //>>excludeEnd("ide");
 $core.addMethod(
 $core.method({
-selector: "earlyAstPragmator",
+selector: "semanticAnalyzer",
 protocol: "compiling",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "earlyAstPragmator\x0a\x09^ AstEarlyPragmator new",
-referencedClasses: ["AstEarlyPragmator"],
+source: "semanticAnalyzer\x0a\x09^ (SemanticAnalyzer on: self currentClass)\x0a\x09\x09thePackage: self currentPackage;\x0a\x09\x09yourself",
+referencedClasses: ["SemanticAnalyzer"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["new"]
+messageSends: ["thePackage:", "on:", "currentClass", "currentPackage", "yourself"]
 }, function ($methodClass){ return function (){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($globals.AstEarlyPragmator)._new();
+var $1;
+$1=$recv($globals.SemanticAnalyzer)._on_($self._currentClass());
+$recv($1)._thePackage_($self._currentPackage());
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"earlyAstPragmator",{})});
+}, function($ctx1) {$ctx1.fill(self,"semanticAnalyzer",{})});
 //>>excludeEnd("ctx");
 }; }),
 $globals.AstGenerator);
 
 $core.addMethod(
 $core.method({
-selector: "semanticAnalyzer",
+selector: "semanticAstPragmator",
 protocol: "compiling",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "semanticAnalyzer\x0a\x09^ (SemanticAnalyzer on: self currentClass)\x0a\x09\x09thePackage: self currentPackage;\x0a\x09\x09yourself",
-referencedClasses: ["SemanticAnalyzer"],
+source: "semanticAstPragmator\x0a\x09^ AstSemanticPragmator new",
+referencedClasses: ["AstSemanticPragmator"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["thePackage:", "on:", "currentClass", "currentPackage", "yourself"]
+messageSends: ["new"]
 }, function ($methodClass){ return function (){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($globals.SemanticAnalyzer)._on_($self._currentClass());
-$recv($1)._thePackage_($self._currentPackage());
-return $recv($1)._yourself();
+return $recv($globals.AstSemanticPragmator)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"semanticAnalyzer",{})});
+}, function($ctx1) {$ctx1.fill(self,"semanticAstPragmator",{})});
 //>>excludeEnd("ctx");
 }; }),
 $globals.AstGenerator);
@@ -307,11 +307,11 @@ selector: "transformersDictionary",
 protocol: "compiling",
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "transformersDictionary\x0a\x09^ transformersDictionary ifNil: [ transformersDictionary := Dictionary new\x0a\x09\x09at: '1000-earlyPragmas' put: self earlyAstPragmator;\x0a\x09\x09at: '2000-semantic' put: self semanticAnalyzer;\x0a\x09\x09yourself ]",
+source: "transformersDictionary\x0a\x09^ transformersDictionary ifNil: [ transformersDictionary := Dictionary new\x0a\x09\x09at: '2000-semantic' put: self semanticAnalyzer;\x0a\x09\x09at: '2500-semanticPragmas' put: self semanticAstPragmator;\x0a\x09\x09yourself ]",
 referencedClasses: ["Dictionary"],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["ifNil:", "at:put:", "new", "earlyAstPragmator", "semanticAnalyzer", "yourself"]
+messageSends: ["ifNil:", "at:put:", "new", "semanticAnalyzer", "semanticAstPragmator", "yourself"]
 }, function ($methodClass){ return function (){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -321,12 +321,12 @@ var $1,$2;
 $1=$self.transformersDictionary;
 if($1 == null || $1.a$nil){
 $2=$recv($globals.Dictionary)._new();
-[$recv($2)._at_put_("1000-earlyPragmas",$self._earlyAstPragmator())
+[$recv($2)._at_put_("2000-semantic",$self._semanticAnalyzer())
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["at:put:"]=1
 //>>excludeEnd("ctx");
 ][0];
-$recv($2)._at_put_("2000-semantic",$self._semanticAnalyzer());
+$recv($2)._at_put_("2500-semanticPragmas",$self._semanticAstPragmator());
 $self.transformersDictionary=$recv($2)._yourself();
 return $self.transformersDictionary;
 } else {

+ 5 - 5
lang/src/Compiler-Core.st

@@ -64,20 +64,20 @@ Some initial pragmas (eg. #inlineJS:) are applied to transform the tree.!
 
 !AstGenerator methodsFor: 'compiling'!
 
-earlyAstPragmator
-	^ AstEarlyPragmator new
-!
-
 semanticAnalyzer
 	^ (SemanticAnalyzer on: self currentClass)
 		thePackage: self currentPackage;
 		yourself
 !
 
+semanticAstPragmator
+	^ AstSemanticPragmator new
+!
+
 transformersDictionary
 	^ transformersDictionary ifNil: [ transformersDictionary := Dictionary new
-		at: '1000-earlyPragmas' put: self earlyAstPragmator;
 		at: '2000-semantic' put: self semanticAnalyzer;
+		at: '2500-semanticPragmas' put: self semanticAstPragmator;
 		yourself ]
 ! !