1
0
ソースを参照

Move CompilerError to Compiler-AST.

Herby Vojčík 6 年 前
コミット
dc84eddd22
4 ファイル変更14 行追加14 行削除
  1. 7 1
      src/Compiler-AST.js
  2. 6 0
      src/Compiler-AST.st
  3. 1 7
      src/Compiler-Core.js
  4. 0 6
      src/Compiler-Core.st

+ 7 - 1
src/Compiler-AST.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "amber_core/Kernel-Dag", "amber_core/Kernel-Methods"], function($boot){"use strict";
+define(["amber/boot", "amber_core/Kernel-Dag", "amber_core/Kernel-Exceptions", "amber_core/Kernel-Methods"], function($boot){"use strict";
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Compiler-AST");
@@ -2776,6 +2776,12 @@ $globals.VariableNode);
 
 
 
+$core.addClass("CompilerError", $globals.Error, [], "Compiler-AST");
+//>>excludeStart("ide", pragmas.excludeIdeData);
+$globals.CompilerError.comment="I am the common superclass of all compiling errors.";
+//>>excludeEnd("ide");
+
+
 $core.addClass("ParentFakingPathDagVisitor", $globals.PathDagVisitor, ["setParentSelector"], "Compiler-AST");
 //>>excludeStart("ide", pragmas.excludeIdeData);
 $globals.ParentFakingPathDagVisitor.comment="I am base class of `DagNode` visitor.\x0a\x0aI hold the path of ancestors up to actual node\x0ain `self path`.";

+ 6 - 0
src/Compiler-AST.st

@@ -692,6 +692,12 @@ acceptDagVisitor: aVisitor
 	^ aVisitor visitVariableNode: self
 ! !
 
+Error subclass: #CompilerError
+	instanceVariableNames: ''
+	package: 'Compiler-AST'!
+!CompilerError commentStamp!
+I am the common superclass of all compiling errors.!
+
 PathDagVisitor subclass: #ParentFakingPathDagVisitor
 	instanceVariableNames: 'setParentSelector'
 	package: 'Compiler-AST'!

+ 1 - 7
src/Compiler-Core.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "amber_core/Compiler-AST", "amber_core/Kernel-Collections", "amber_core/Kernel-Exceptions", "amber_core/Kernel-Objects"], function($boot){"use strict";
+define(["amber/boot", "amber_core/Compiler-AST", "amber_core/Kernel-Collections", "amber_core/Kernel-Objects"], function($boot){"use strict";
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Compiler-Core");
@@ -1111,12 +1111,6 @@ messageSends: ["do:", "classes", "recompile:"]
 $globals.Compiler.a$cls);
 
 
-$core.addClass("CompilerError", $globals.Error, [], "Compiler-Core");
-//>>excludeStart("ide", pragmas.excludeIdeData);
-$globals.CompilerError.comment="I am the common superclass of all compiling errors.";
-//>>excludeEnd("ide");
-
-
 $core.addClass("DoIt", $globals.Object, [], "Compiler-Core");
 //>>excludeStart("ide", pragmas.excludeIdeData);
 $globals.DoIt.comment="`DoIt` is the class used to compile and evaluate expressions. See `Compiler >> evaluateExpression:`.";

+ 0 - 6
src/Compiler-Core.st

@@ -270,12 +270,6 @@ eval: aString
 	^ self new eval: aString
 ! !
 
-Error subclass: #CompilerError
-	instanceVariableNames: ''
-	package: 'Compiler-Core'!
-!CompilerError commentStamp!
-I am the common superclass of all compiling errors.!
-
 Object subclass: #DoIt
 	instanceVariableNames: ''
 	package: 'Compiler-Core'!