Move compiler-related source files and tests into a subdirectory

12 years ago · f046e0a838
parent 5bd2ca1cb5
commit f046e0a838
7 changed files with 10 additions and 10 deletions
--- a/12
+++ b/12
@ -133,12 +133,12 @@ benchmark: build

 # Run JSHint on the source
 hint: build
-	$(JSHINT)               \
-	  $(SRC_DIR)/*.js       \
-	  $(TEST_DIR)/*.js      \
-	  $(TEST_RUN)           \
-	  $(BENCHMARK_DIR)/*.js \
-	  $(BENCHMARK_RUN)      \
+	$(JSHINT)                                                                \
+	  `find $(SRC_DIR) -name '*.js'`                                         \
+	  `find $(TEST_DIR) -name '*.js' -and -not -path '$(TEST_DIR)/vendor/*'` \
+	  $(TEST_RUN)                                                            \
+	  $(BENCHMARK_DIR)/*.js                                                  \
+	  $(BENCHMARK_RUN)                                                       \
 	  $(PEGJS)

 .PHONY: test benchmark hint parser build clean dist distclean
--- a/src/compiler.js
+++ b/src/compiler.js
@ -32,5 +32,5 @@ PEG.compiler = {
  }
 };

-// @include "passes.js"
-// @include "emitter.js"
+// @include "compiler/passes.js"
+// @include "compiler/emitter.js"
--- a/src/compiler/emitter.js
+++ b/src/compiler/emitter.js
--- a/src/compiler/passes.js
+++ b/src/compiler/passes.js
--- a/test/compiler/passes-test.js
+++ b/test/compiler/passes-test.js
--- a/test/index.html
+++ b/test/index.html
@ -8,8 +8,8 @@
    <script src="vendor/qunit/qunit.js"></script>
    <script src="helpers.js"></script>
    <script src="parser-test.js"></script>
-    <script src="passes-test.js"></script>
    <script src="compiler-test.js"></script>
+    <script src="compiler/passes-test.js"></script>
  </head>
  <body>
    <h1 id="qunit-header">PEG.js Test Suite</h1>
--- a/test/run
+++ b/test/run
@ -76,8 +76,8 @@ QUnit.done(function(details) {
 [
  "helpers.js",
  "parser-test.js",
-  "passes-test.js",
  "compiler-test.js",
+  "compiler/passes-test.js"
 ].forEach(function(file) {
  eval("with (QUnit) {" + fs.readFileSync(__dirname + "/" + file, "utf8") + "}");
 });