Skip to content

Commit

Permalink
Split src/runtime in to src/runtime and src/loader files.
Browse files Browse the repository at this point in the history
This will make the architecture clearer, improve make rules.

Review URL: https://api.github.com/repos/google/traceur-compiler/issues/2045

Closes #2045.
  • Loading branch information
johnjbarton committed Dec 19, 2015
1 parent 02971e9 commit 470ffa7
Show file tree
Hide file tree
Showing 24 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -24,7 +24,7 @@ src/outputgeneration/SourceMapIntegration.js
src/syntax/ParseTreeVisitor.js
src/syntax/trees/ParseTreeType.js
src/syntax/trees/ParseTrees.js
src/runtime/version.js
src/loader/version.js
test/unit/node/out/compile-amd
test/unit/node/out/compile-cjs
test/unit/node/out/compile-cjs-maps
Expand Down
8 changes: 4 additions & 4 deletions Makefile
@@ -1,7 +1,7 @@
RUNTIME_SRC = \
src/runtime/runtime.js \
src/runtime/url.js \
src/runtime/ModuleStoreImpl.js \
src/loader/ModuleStoreImpl.js \
# end files that must be script.

POLYFILL_SRC = \
Expand Down Expand Up @@ -169,7 +169,7 @@ boot: clean build

clean: wikiclean
@rm -f build/compiled-by-previous-traceur.js
@rm -f src/runtime/version.js
@rm -f src/loader/version.js
@rm -rf build/currentSemVer.mk
@rm -f build/es6-no-modules/*
@rm -f $(GENSRC)
Expand Down Expand Up @@ -208,7 +208,7 @@ bin/traceur.js: build/compiled-by-previous-traceur.js $(SRC_NODE)
$(RUNTIME_SCRIPTS) $(TFLAGS) $(SRC)

# Use last-known-good compiler to compile current source
build/compiled-by-previous-traceur.js: src/runtime/version.js \
build/compiled-by-previous-traceur.js: src/loader/version.js \
$(PREV_NODE) \
$(SRC) \
node_modules/traceur/bin/traceur.js $(SRC_ALL) $(GENSRC) node_modules
Expand Down Expand Up @@ -269,7 +269,7 @@ src/codegeneration/ParseTreeTransformer.js: \
build/build-parse-tree-transformer.js src/syntax/trees/trees.json
node $^ > $@

src/runtime/version.js: package.json
src/loader/version.js: package.json
echo "// generated in Makefile.\nexport let version = '$(PACKAGE_VERSION)';\n" > $@

unicode-tables: \
Expand Down
2 changes: 1 addition & 1 deletion demo/transcode.js
Expand Up @@ -18,7 +18,7 @@ import {
SourceMapGenerator,
SourceMapConsumer
} from 'traceur@0.0/src/outputgeneration/SourceMapIntegration.js';
import {webLoader} from 'traceur@0.0/src/runtime/webLoader.js';
import {webLoader} from 'traceur@0.0/src/loader/webLoader.js';

class BatchErrorReporter extends ErrorReporter {
constructor() {
Expand Down
6 changes: 3 additions & 3 deletions src/WebPageTranscoder.js
Expand Up @@ -14,11 +14,11 @@

// Applies Traceur to all scripts in a Web page.

import {Loader} from './runtime/Loader.js';
import {BrowserTraceurLoader} from './runtime/TraceurLoader.js';
import {Loader} from './loader/Loader.js';
import {BrowserTraceurLoader} from './loader/TraceurLoader.js';
import {ErrorReporter} from './util/ErrorReporter.js';
import {Options} from './Options.js';
import {webLoader} from './runtime/webLoader.js';
import {webLoader} from './loader/webLoader.js';

export const scriptSelector = 'script[type="module"],script[type="text/traceur"]';

Expand Down
File renamed without changes.
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

import {assert} from '../util/assert.js';
import {LoaderCompiler} from '../runtime/LoaderCompiler.js';
import {LoaderCompiler} from './LoaderCompiler.js';
import {ExportsList} from '../codegeneration/module/ModuleSymbol.js';
import {isAbsolute, resolveUrl} from '../util/url.js';
import {Options} from '../Options.js';
Expand Down
File renamed without changes.
Expand Up @@ -20,7 +20,7 @@ import {ModuleSpecifierVisitor} from
import {ModuleSymbol} from '../codegeneration/module/ModuleSymbol.js';
import {Parser} from '../syntax/Parser.js';
import {SourceFile} from '../syntax/SourceFile.js';
import {systemjs} from '../runtime/system-map.js';
import {systemjs} from './system-map.js';
import {UniqueIdentifierGenerator} from
'../codegeneration/UniqueIdentifierGenerator.js';
import {isAbsolute, resolveUrl} from '../util/url.js';
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -20,7 +20,7 @@ import {InlineLoaderCompiler} from './InlineLoaderCompiler.js';
import {NodeTraceurLoader} from './NodeTraceurLoader.js';
import {TraceurLoader} from './TraceurLoader.js';

export let runtime = {
export let loader = {
BrowserTraceurLoader,
InlineLoaderCompiler,
Loader,
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/node/NodeLoaderCompiler.js
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import {LoaderCompiler} from '../runtime/LoaderCompiler.js';
import {LoaderCompiler} from '../loader/LoaderCompiler.js';

export class NodeLoaderCompiler extends LoaderCompiler {
constructor() {
Expand Down
2 changes: 1 addition & 1 deletion src/node/System.js
Expand Up @@ -17,7 +17,7 @@
var fs = require('fs');
var traceur = require('./traceur.js');

var System = new traceur.runtime.NodeTraceurLoader();
var System = new traceur.loader.NodeTraceurLoader();

var traceurMap;

Expand Down
4 changes: 2 additions & 2 deletions src/node/recursiveModuleCompile.js
Expand Up @@ -72,8 +72,8 @@ function forEachRecursiveModuleCompile(outputDir, includes, options) {
return Promise.all(includes.map(getPromise));
}

var TraceurLoader = traceur.runtime.TraceurLoader;
var InlineLoaderCompiler = traceur.runtime.InlineLoaderCompiler;
var TraceurLoader = traceur.loader.TraceurLoader;
var InlineLoaderCompiler = traceur.loader.InlineLoaderCompiler;
var Options = traceur.util.Options;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/traceur.js
Expand Up @@ -14,4 +14,4 @@

export * from './util-imports.js';
export * from './compiler-imports.js';
export * from './runtime/loader-imports.js';
export * from './loader/loader-imports.js';
2 changes: 1 addition & 1 deletion test/featureTestRunner.js
Expand Up @@ -17,7 +17,7 @@ import {StringMap} from '../src/util/StringMap.js';
import {NodeTraceurTestRunner} from './modular/NodeTraceurTestRunner.js';
import {BrowserTraceurTestRunner} from './modular/BrowserTraceurTestRunner.js';
import {Options} from '../src/Options.js';
import {ModuleStore} from '../src/runtime/ModuleStore.js';
import {ModuleStore} from '../src/loader/ModuleStore.js';

import {assert, assertArrayEquals} from './asserts.js';
export * from './asserts.js';
Expand Down
2 changes: 1 addition & 1 deletion test/modular/BrowserTraceurTestRunner.js
Expand Up @@ -15,7 +15,7 @@
/** @fileoverview Configure mocha for Traceur testing.in browsers */

import {TraceurTestRunner} from './TraceurTestRunner.js';
import {webLoader} from '../../src/runtime/webLoader.js';
import {webLoader} from '../../src/loader/webLoader.js';

function optionsOnURL() {
let params = window.location.search.substring(1);
Expand Down
2 changes: 1 addition & 1 deletion test/modular/getTestLoader.js
Expand Up @@ -23,7 +23,7 @@ if (typeof window === 'undefined') { // Node
fileLoader = require('../../src/node/nodeLoader.js');
} else { // Browser
url = resolveUrl(window.location.href, 'test/unit/runtime/modules.js');
fileLoader = get('src/runtime/webLoader.js').webLoader;
fileLoader = get('src/loader/webLoader.js').webLoader;
}

export function getTestLoader() {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/node/generated-code-dependencies.js
Expand Up @@ -44,7 +44,7 @@ suite('context test', function() {
}

function executeFileWithRuntime(fileName, options, debug) {
var TraceurLoader = traceur.runtime.TraceurLoader;
var TraceurLoader = traceur.loader.TraceurLoader;
var loader = new TraceurLoader(nodeLoader);
var source = fs.readFileSync(fileName, 'utf-8');
var metadata = {traceurOptions: options};
Expand Down
2 changes: 1 addition & 1 deletion test/unit/runtime/Loader.js
Expand Up @@ -23,7 +23,7 @@ import {
import {ErrorReporter} from '../../../src/util/ErrorReporter.js';
import {MutedErrorReporter} from '../../../src/util/MutedErrorReporter.js';
import {Options} from '../../../src/Options.js';
import {ModuleStore} from '../../../src/runtime/ModuleStore.js';
import {ModuleStore} from '../../../src/loader/ModuleStore.js';

function getTestLoader() {
return new System.constructor();
Expand Down

0 comments on commit 470ffa7

Please sign in to comment.