Browse Source

support/: formatting, remove explicit module names

Explicit module names were only needed in amberc concatenator,
which was removed in amber-dev 0.6.1 in favour of using r.js.
Herbert Vojčík 8 years ago
parent
commit
aac7e6fa76
6 changed files with 37 additions and 31 deletions
  1. 12 12
      internal/grunt-tasks/grunt-peg.js
  2. 8 2
      support/boot.js
  3. 3 3
      support/devel.js
  4. 1 1
      support/helpers.js
  5. 12 12
      support/lang.js
  6. 1 1
      support/parser.js

+ 12 - 12
internal/grunt-tasks/grunt-peg.js

@@ -1,8 +1,8 @@
-module.exports = function(grunt) {
+module.exports = function (grunt) {
 
-	var PEG = require('pegjs');
+    var PEG = require('pegjs');
 
-	/**
+    /**
      Full config looks like this:
      pegjs: {
      my_parser: {
@@ -11,14 +11,14 @@ module.exports = function(grunt) {
      export_var: 'smalltalk.parser' // default: module.exports
      },
    */
-  grunt.registerMultiTask('peg', 'Generate JavaScript parser from PEG.js grammar description', function() {
-    var options = this.options({
-      cache: false,
-      output: 'source',
-      export_var: 'module.exports'
+    grunt.registerMultiTask('peg', 'Generate JavaScript parser from PEG.js grammar description', function () {
+        var options = this.options({
+            cache: false,
+            output: 'source',
+            export_var: 'module.exports'
+        });
+        var parser = PEG.buildParser(grunt.file.read(this.data.src), options);
+        var content = "define(['./boot'], function($boot) {\nvar $globals = $boot.globals, nil = $boot.nil;\n" + options.export_var + " = " + parser + ";\n});";
+        grunt.file.write(this.data.dest, content);
     });
-    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});';
-    grunt.file.write(this.data.dest, content);
-  });
 };

+ 8 - 2
support/boot.js

@@ -39,7 +39,7 @@
 
 //jshint eqnull:true
 
-define("amber/boot", ['require', './browser-compatibility'], function (require) {
+define(['require', './browser-compatibility'], function (require) {
 
     /* Reconfigurable micro composition system, https://github.com/amber-smalltalk/brikz */
 
@@ -1196,5 +1196,11 @@ define("amber/boot", ['require', './browser-compatibility'], function (require)
         brikz.rebuild();
     }
 
-    return {api: api, nil: brikz.root.nil, dnu: brikz.root.rootAsClass, globals: globals, asReceiver: brikz.asReceiver.asReceiver};
+    return {
+        api: api,
+        nil: brikz.root.nil,
+        dnu: brikz.root.rootAsClass,
+        globals: globals,
+        asReceiver: brikz.asReceiver.asReceiver
+    };
 });

+ 3 - 3
support/devel.js

@@ -1,7 +1,7 @@
 define([
-	'./helpers', // pre-fetch, dep of ./deploy
-	'./deploy', // pre-fetch, dep of ./lang
-	'./lang',
+    './helpers', // pre-fetch, dep of ./deploy
+    './deploy', // pre-fetch, dep of ./lang
+    './lang',
     // --- packages of the development only Amber begin here ---
     'amber_core/SUnit',
     'amber_core/Compiler-Tests',

+ 1 - 1
support/helpers.js

@@ -1,4 +1,4 @@
-define("amber/helpers", ["amber/boot", "require"], function (boot, require) {
+define(["amber/boot", "require"], function (boot, require) {
     var globals = boot.globals,
         exports = {},
         api = boot.api,

+ 12 - 12
support/lang.js

@@ -1,14 +1,14 @@
 define([
-	'./helpers', // pre-fetch, dep of ./deploy
-	'./deploy',
-	'./parser',
-	// --- packages for the Amber reflection begin here ---
-	'amber_core/Platform-ImportExport',
-	'amber_core/Compiler-Core',
-	'amber_core/Compiler-AST',
-	'amber_core/Compiler-Semantic',
-	'amber_core/Compiler-IR',
-	'amber_core/Compiler-Inlining',
-	'amber_core/Compiler-Interpreter'
-	// --- packages for the Amber reflection end here ---
+    './helpers', // pre-fetch, dep of ./deploy
+    './deploy',
+    './parser',
+    // --- packages for the Amber reflection begin here ---
+    'amber_core/Platform-ImportExport',
+    'amber_core/Compiler-Core',
+    'amber_core/Compiler-AST',
+    'amber_core/Compiler-Semantic',
+    'amber_core/Compiler-IR',
+    'amber_core/Compiler-Inlining',
+    'amber_core/Compiler-Interpreter'
+    // --- packages for the Amber reflection end here ---
 ], function (amber) { return amber; });

+ 1 - 1
support/parser.js

@@ -1,4 +1,4 @@
-define("amber/parser", ["./boot"], function($boot) {
+define(['./boot'], function($boot) {
 var $globals = $boot.globals, nil = $boot.nil;
 $globals.SmalltalkParser = (function() {
   "use strict";