devkit/amberc: {vm,globals}->{$core,$globals} ...

... in concatenated node.js program 'main' section.

external/amber-cli/support/amber-cli.js

@@ -84507,7 +84507,7 @@ $globals.Repl.klass);
 define("amber_vm/boot", ["amber/boot"], function (boot) { return boot; });
 define("amber/_init", ["amber/boot","amber_vm/smalltalk","amber_vm/globals","amber_vm/nil","amber_vm/_st","amber_core/Kernel-Objects","amber_core/Kernel-Classes","amber_core/Kernel-Methods","amber_core/Kernel-Collections","amber_core/Kernel-Infrastructure","amber_core/Kernel-Exceptions","amber_core/Kernel-Transcript","amber_core/Kernel-Announcements","amber_core/Compiler-Exceptions","amber_core/Compiler-Core","amber_core/Compiler-AST","amber_core/Compiler-IR","amber_core/Compiler-Inlining","amber_core/Compiler-Semantic","amber_core/Compiler-Interpreter","amber/parser","amber_core/SUnit","amber_core/Kernel-ImportExport","amber_core/Kernel-Tests","amber_core/Compiler-Tests","amber_core/SUnit-Tests","amber_cli/AmberCli"], function (boot) {
 boot.vm.initialize();
-var vm = boot.vm, globals = boot.globals;
-globals.AmberCli._main();
+var $core = boot.vm, $globals = boot.globals;
+$globals.AmberCli._main();
 });
 requirejs(["amber/_init"]);

external/amber-dev/lib/amberc.js

@@ -566,16 +566,16 @@ 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 vm = boot.vm, globals = boot.globals;\n';
+		var mainFunctionOrFile = 'var $core = boot.vm, $globals = boot.globals;\n';
 
 		if (undefined !== configuration.main) {
 			console.log('Adding call to: %s>>main', configuration.main);
-			mainFunctionOrFile += 'globals.' + configuration.main + '._main();';
+			mainFunctionOrFile += '$globals.' + configuration.main + '._main();';
 		}
 
 		if (undefined !== configuration.mainfile && fs.existsSync(configuration.mainfile)) {
 			console.log('Adding main file: ' + configuration.mainfile);
-			mainFunctionOrFile += '\nvar smalltalk = vm; // backward compatibility\n' + fs.readFileSync(configuration.mainfile);
+			mainFunctionOrFile += '\nvar smalltalk = $core, vm = $core, globals = $globals; // backward compatibility\n' + fs.readFileSync(configuration.mainfile);
 		}
 
 		builder.finish(mainFunctionOrFile);