remove uses of low-level (non-st) deprecations

Gruntfile.js

@@ -25,7 +25,7 @@ module.exports = function(grunt) {
       parser: {
         options: {
           cache: true,
-          export_var: 'globals.SmalltalkParser'
+          export_var: '$globals.SmalltalkParser'
         },
         src: 'support/parser.pegjs',
         dest: 'support/parser.js'

external/amber-dev/lib/amberc.js

@@ -45,7 +45,8 @@ function createConcatenator () {
 		finish: function (realWork) {
 			this.add(
 				'define("amber/_init", ["' + this.ids.join('","') + '"], function (boot) {',
-				'boot.vm.initialize();',
+				'boot.api = boot.api || boot.vm; // future compatibility',
+				'boot.api.initialize();',
 				realWork,
 				'});',
 				'requirejs(["amber/_init"]);'
@@ -369,7 +370,7 @@ function create_compiler(configuration) {
 		if (builder.ids.indexOf("amber_vm/boot") === -1) { builder.add('define("amber_vm/boot", ["amber/boot"], function (boot) { return boot; });'); }
 
 		// store the generated smalltalk env in configuration.{core,globals}
-		builder.finish('configuration.core = boot.vm; configuration.globals = boot.globals;');
+		builder.finish('configuration.core = boot.api; configuration.globals = boot.globals;');
 		loadIds.forEach(function (id) {
 			builder.add('requirejs("' + id + '");');
 		});
@@ -566,7 +567,7 @@ function compose_js_files(configuration) {
 		//backward compatibility
 		if (builder.ids.indexOf("amber_vm/boot") === -1) { builder.add('define("amber_vm/boot", ["amber/boot"], function (boot) { return boot; });'); }
 
-		var mainFunctionOrFile = 'var $core = boot.vm, $globals = boot.globals;\n';
+		var mainFunctionOrFile = 'var $core = boot.api, $globals = boot.globals;\n';
 
 		if (undefined !== configuration.main) {
 			console.log('Adding call to: %s>>main', configuration.main);

internal/grunt-tasks/grunt-peg.js

@@ -18,7 +18,7 @@ module.exports = function(grunt) {
       export_var: 'module.exports'
     });
     var parser = PEG.buildParser(grunt.file.read(this.data.src), options);
-    var content = 'define("amber/parser", ["./boot"], function(boot) {\nvar globals = boot.globals, nil = boot.nil;\n'+options.export_var + ' = ' + parser + ';\n});';
+    var content = 'define("amber/parser", ["./boot"], function($boot) {\nvar $globals = $boot.globals, nil = $boot.nil;\n'+options.export_var + ' = ' + parser + ';\n});';
     grunt.file.write(this.data.dest, content);
   });
 };

internal/index.html

@@ -14,8 +14,8 @@
     require.config({baseUrl: '..'});
     require(
         ["amber/devel", "helios/all", "amber_cli/AmberCli"],
-        function (smalltalk) {
-            smalltalk.initialize({'transport.defaultAmdNamespace': "amber_core"});
+        function (amber) {
+            amber.initialize({'transport.defaultAmdNamespace': "amber_core"});
         }
     );
 </script>

support/boot.js

@@ -199,7 +199,7 @@ define("amber/boot", [ 'require', './browser-compatibility' ], function (require
 				return methods[index];
 			}
 			this.selectors.push(stSelector);
-			var jsSelector = st.selector(stSelector);
+			var jsSelector = st.st2js(stSelector);
 			checker[jsSelector] = true;
 			var method = {jsSelector: jsSelector, fn: createHandler(stSelector)};
 			methods.push(method);
@@ -610,7 +610,7 @@ define("amber/boot", [ 'require', './browser-compatibility' ], function (require
 
 		st.addMethod = function (method, klass) {
 			if (!(method.jsSelector)) {
-				method.jsSelector = st.selector(method.selector);
+				method.jsSelector = st.st2js(method.selector);
 			}
 			manip.installMethod(method, klass);
 			klass.methods[method.selector] = method;
@@ -661,7 +661,7 @@ define("amber/boot", [ 'require', './browser-compatibility' ], function (require
 						klass.className);
 			}
 
-			delete klass.fn.prototype[st.selector(method.selector)];
+			delete klass.fn.prototype[st.st2js(method.selector)];
 			delete klass.methods[method.selector];
 
 			st.initClass(klass);
@@ -867,7 +867,7 @@ define("amber/boot", [ 'require', './browser-compatibility' ], function (require
 				var method;
 				var lookup = this.lookupClass || this.receiver.klass;
 				while(!method && lookup) {
-					method = lookup.methods[st.convertSelector(this.selector)];
+					method = lookup.methods[st.js2st(this.selector)];
 					lookup = lookup.superclass;
 				}
 				return method;
@@ -988,7 +988,7 @@ define("amber/boot", [ 'require', './browser-compatibility' ], function (require
 			if(method) {
 				return method.apply(receiver, args);
 			} else {
-				return messageNotUnderstood(receiver, st.convertSelector(jsSelector), args);
+				return messageNotUnderstood(receiver, st.js2st(jsSelector), args);
 			}
 		};
 

support/parser.js

@@ -1,6 +1,6 @@
-define("amber/parser", ["./boot"], function(boot) {
-var globals = boot.globals, nil = boot.nil;
-globals.SmalltalkParser = (function() {
+define("amber/parser", ["./boot"], function($boot) {
+var $globals = $boot.globals, nil = $boot.nil;
+$globals.SmalltalkParser = (function() {
   /*
    * Generated by PEG.js 0.8.0.
    *
@@ -62,7 +62,7 @@ globals.SmalltalkParser = (function() {
         peg$c25 = /^[^']/,
         peg$c26 = { type: "class", value: "[^']", description: "[^']" },
         peg$c27 = function(val) {
-                             return globals.ValueNode._new()
+                             return $globals.ValueNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._value_(val.join(""));
@@ -71,7 +71,7 @@ globals.SmalltalkParser = (function() {
         peg$c29 = { type: "literal", value: "$", description: "\"$\"" },
         peg$c30 = { type: "any", description: "any character" },
         peg$c31 = function(char) {
-                              return globals.ValueNode._new()
+                              return $globals.ValueNode._new()
                                      ._position_((line()).__at(column()))
                                      ._source_(text())
                                      ._value_(char);
@@ -81,13 +81,13 @@ globals.SmalltalkParser = (function() {
         peg$c34 = function(rest) {return rest;},
         peg$c35 = function(node) {return node._value();},
         peg$c36 = function(val) {
-                              return globals.ValueNode._new()
+                              return $globals.ValueNode._new()
                                      ._position_((line()).__at(column()))
                                      ._source_(text())
                                      ._value_(val);
                           },
         peg$c37 = function(n) {
-                             return globals.ValueNode._new()
+                             return $globals.ValueNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._value_(n);
@@ -117,7 +117,7 @@ globals.SmalltalkParser = (function() {
         peg$c60 = ")",
         peg$c61 = { type: "literal", value: ")", description: "\")\"" },
         peg$c62 = function(lits) {
-                             return globals.ValueNode._new()
+                             return $globals.ValueNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._value_(lits);
@@ -127,7 +127,7 @@ globals.SmalltalkParser = (function() {
         peg$c65 = "}",
         peg$c66 = { type: "literal", value: "}", description: "\"}\"" },
         peg$c67 = function(expressions) {
-                             return globals.DynamicArrayNode._new()
+                             return $globals.DynamicArrayNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._nodes_(expressions || []);
@@ -135,7 +135,7 @@ globals.SmalltalkParser = (function() {
         peg$c68 = "#{",
         peg$c69 = { type: "literal", value: "#{", description: "\"#{\"" },
         peg$c70 = function(expressions) {
-                                return globals.DynamicDictionaryNode._new()
+                                return $globals.DynamicDictionaryNode._new()
                                        ._position_((line()).__at(column()))
                                        ._source_(text())
                                        ._nodes_(expressions || []);
@@ -150,13 +150,13 @@ globals.SmalltalkParser = (function() {
         peg$c78 = { type: "literal", value: "nil", description: "\"nil\"" },
         peg$c79 = function() {return nil;},
         peg$c80 = function(val) {
-                               return globals.ValueNode._new()
+                               return $globals.ValueNode._new()
                                       ._position_((line()).__at(column()))
                                       ._source_(text())
                                       ._value_(val);
                            },
         peg$c81 = function(identifier) {
-                             return globals.VariableNode._new()
+                             return $globals.VariableNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._value_(identifier);
@@ -184,7 +184,7 @@ globals.SmalltalkParser = (function() {
         peg$c91 = ":=",
         peg$c92 = { type: "literal", value: ":=", description: "\":=\"" },
         peg$c93 = function(variable, expression) {
-                             return globals.AssignmentNode._new()
+                             return $globals.AssignmentNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._left_(variable)
@@ -193,7 +193,7 @@ globals.SmalltalkParser = (function() {
         peg$c94 = "^",
         peg$c95 = { type: "literal", value: "^", description: "\"^\"" },
         peg$c96 = function(expression) {
-                             return globals.ReturnNode._new()
+                             return $globals.ReturnNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._nodes_([expression]);
@@ -214,7 +214,7 @@ globals.SmalltalkParser = (function() {
                                return expressions || [];
                            },
         peg$c106 = function(temps, statements) {
-                             return globals.SequenceNode._new()
+                             return $globals.SequenceNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._temps_(temps || [])
@@ -225,7 +225,7 @@ globals.SmalltalkParser = (function() {
         peg$c109 = "]",
         peg$c110 = { type: "literal", value: "]", description: "\"]\"" },
         peg$c111 = function(params, sequence) {
-                             return globals.BlockNode._new()
+                             return $globals.BlockNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._parameters_(params || [])
@@ -233,7 +233,7 @@ globals.SmalltalkParser = (function() {
                          },
         peg$c112 = void 0,
         peg$c113 = function(selector) {
-                             return globals.SendNode._new()
+                             return $globals.SendNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._selector_(selector);
@@ -255,7 +255,7 @@ globals.SmalltalkParser = (function() {
                              }
                          },
         peg$c116 = function(selector, arg) {
-                             return globals.SendNode._new()
+                             return $globals.SendNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._selector_(selector)
@@ -276,7 +276,7 @@ globals.SmalltalkParser = (function() {
                                   selector.push(pairs[i].key);
                                   args.push(pairs[i].arg);
                               }
-                              return globals.SendNode._new()
+                              return $globals.SendNode._new()
                                      ._position_((line()).__at(column()))
                                      ._source_(text())
                                      ._selector_(selector.join(""))
@@ -294,7 +294,7 @@ globals.SmalltalkParser = (function() {
                              for(var i = 0; i < messages.length; i++) {
                                  cascade.push(messages[i]);
                              }
-                             return globals.CascadeNode._new()
+                             return $globals.CascadeNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(text())
                                     ._receiver_(send._receiver())
@@ -310,12 +310,12 @@ globals.SmalltalkParser = (function() {
         peg$c131 = ">",
         peg$c132 = { type: "literal", value: ">", description: "\">\"" },
         peg$c133 = function(val) {
-                             return globals.JSStatementNode._new()
+                             return $globals.JSStatementNode._new()
                                     ._position_((line()).__at(column()))
                                     ._source_(val.join(""))
                          },
         peg$c134 = function(pattern, sequence) {
-                              return globals.MethodNode._new()
+                              return $globals.MethodNode._new()
                                      ._position_((line()).__at(column()))
                                      ._source_(text())
                                      ._selector_(pattern[0])

support/parser.pegjs

@@ -8,14 +8,14 @@ keyword        = first:identifier last:":" {return first + last;}
 selector      = first:[a-zA-Z] others:[a-zA-Z0-9\:]* {return first + others.join("");}
 className      = first:[A-Z] others:[a-zA-Z0-9]* {return first + others.join("");}
 string         = "'" val:(("''" {return "'";} / [^'])*) "'" {
-                     return globals.ValueNode._new()
+                     return $globals.ValueNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._value_(val.join(""));
                  }
 character      = "$" char:. 
                   {
-                      return globals.ValueNode._new()
+                      return $globals.ValueNode._new()
                              ._position_((line()).__at(column()))
                              ._source_(text())
                              ._value_(char);
@@ -23,13 +23,13 @@ character      = "$" char:.
 symbol         = "#" rest:bareSymbol {return rest;}
 bareSymbol         = val:(selector / binarySelector / node:string {return node._value();})
                   {
-                      return globals.ValueNode._new()
+                      return $globals.ValueNode._new()
                              ._position_((line()).__at(column()))
                              ._source_(text())
                              ._value_(val);
                   }
 number         = n:(numberExp / hex / float / integer) {
-                     return globals.ValueNode._new()
+                     return $globals.ValueNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._value_(n);
@@ -42,19 +42,19 @@ integer        = neg:"-"? digits:[0-9]+ {return (parseInt((neg || '') + digits.j
 literalArray   = "#(" rest:literalArrayRest {return rest;}
 bareLiteralArray   = "(" rest:literalArrayRest {return rest;}
 literalArrayRest   = lits:(ws lit:(parseTimeLiteral / bareLiteralArray / bareSymbol) {return lit._value();})* ws ")" {
-                     return globals.ValueNode._new()
+                     return $globals.ValueNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._value_(lits);
                  }
 dynamicArray   = "{" ws expressions:expressions? ws "."? "}" {
-                     return globals.DynamicArrayNode._new()
+                     return $globals.DynamicArrayNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._nodes_(expressions || []);
                  }
 dynamicDictionary = "#{" ws expressions:associations? ws "}" {
-                        return globals.DynamicDictionaryNode._new()
+                        return $globals.DynamicDictionaryNode._new()
                                ._position_((line()).__at(column()))
                                ._source_(text())
                                ._nodes_(expressions || []);
@@ -63,7 +63,7 @@ pseudoVariable = val:(
                    'true' {return true;}
                  / 'false' {return false;}
                  / 'nil' {return nil;}) {
-                       return globals.ValueNode._new()
+                       return $globals.ValueNode._new()
                               ._position_((line()).__at(column()))
                               ._source_(text())
                               ._value_(val);
@@ -74,7 +74,7 @@ literal        = runtimeLiteral / parseTimeLiteral
 
 
 variable       = identifier:identifier {
-                     return globals.VariableNode._new()
+                     return $globals.VariableNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._value_(identifier);
@@ -108,7 +108,7 @@ expressionList = ws "." ws expression:expression {return expression;}
 expressions    = first:expression others:expressionList* { return [first].concat(others); }
 
 assignment     = variable:variable ws ':=' ws expression:expression {
-                     return globals.AssignmentNode._new()
+                     return $globals.AssignmentNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._left_(variable)
@@ -116,7 +116,7 @@ assignment     = variable:variable ws ':=' ws expression:expression {
                  }
 
 ret            = '^' ws expression:expression ws '.'? {
-                     return globals.ReturnNode._new()
+                     return $globals.ReturnNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._nodes_([expression]);
@@ -141,7 +141,7 @@ statements     = ret:ret "."* {return [ret];}
 sequence       = jsSequence / stSequence
 
 stSequence     = temps:temps? ws statements:statements? ws {
-                     return globals.SequenceNode._new()
+                     return $globals.SequenceNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._temps_(temps || [])
@@ -151,7 +151,7 @@ stSequence     = temps:temps? ws statements:statements? ws {
 jsSequence     = jsStatement
 
 block          = '[' params:blockParamList? ws sequence:sequence? ws ']' {
-                     return globals.BlockNode._new()
+                     return $globals.BlockNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._parameters_(params || [])
@@ -163,7 +163,7 @@ operand        = literal / reference / subexpression
 
 
 unaryMessage   = ws selector:unarySelector !":" {
-                     return globals.SendNode._new()
+                     return $globals.SendNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._selector_(selector);
@@ -188,7 +188,7 @@ unarySend      = receiver:operand ws tail:unaryTail? {
                  }
 
 binaryMessage  = ws selector:binarySelector ws arg:(unarySend / operand) {
-                     return globals.SendNode._new()
+                     return $globals.SendNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._selector_(selector)
@@ -221,7 +221,7 @@ keywordMessage = pairs:keywordPair+ {
                           selector.push(pairs[i].key);
                           args.push(pairs[i].arg);
                       }
-                      return globals.SendNode._new()
+                      return $globals.SendNode._new()
                              ._position_((line()).__at(column()))
                              ._source_(text())
                              ._selector_(selector.join(""))
@@ -240,7 +240,7 @@ cascade        = ws send:(keywordSend / binarySend) messages:(ws ";" ws mess:mes
                      for(var i = 0; i < messages.length; i++) {
                          cascade.push(messages[i]);
                      }
-                     return globals.CascadeNode._new()
+                     return $globals.CascadeNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(text())
                             ._receiver_(send._receiver())
@@ -248,14 +248,14 @@ cascade        = ws send:(keywordSend / binarySend) messages:(ws ";" ws mess:mes
                  }
 
 jsStatement    = "<" val:((">>" {return ">";} / [^>])*) ">" {
-                     return globals.JSStatementNode._new()
+                     return $globals.JSStatementNode._new()
                             ._position_((line()).__at(column()))
                             ._source_(val.join(""))
                  }
 
 
 method         = pattern:(keywordPattern / binaryPattern / unaryPattern) ws sequence:sequence? ws {
-                      return globals.MethodNode._new()
+                      return $globals.MethodNode._new()
                              ._position_((line()).__at(column()))
                              ._source_(text())
                              ._selector_(pattern[0])