Skip to content

Commit

Permalink
merged javascript with clojure directory to avoid deps problem
Browse files Browse the repository at this point in the history
  • Loading branch information
carocad committed Jan 20, 2020
1 parent 53e621c commit 18f103a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Expand Up @@ -19,6 +19,5 @@ pom.xml.asc
/figwheel_server.log
package*.json
/.eastwood
/src/javascript/parcera/antlr
/src/javascript/clojure.reader.bundle.js
pom.xml
/src/clojure/parcera/antlr/js/
4 changes: 2 additions & 2 deletions project.clj
@@ -1,9 +1,9 @@
(defproject carocad/parcera "0.11.0-SNAPSHOT-3"
(defproject carocad/parcera "0.11.0-SNAPSHOT-4"
:description "Grammar-based Clojure(script) parser"
:url "https://github.com/carocad/parcera"
:license {:name "LGPLv3"
:url "https://github.com/carocad/parcera/blob/master/LICENSE.md"}
:source-paths ["src/clojure" "src/javascript"]
:source-paths ["src/clojure"]
:java-source-paths ["src/java"]
:javac-options ["-target" "1.8" "-source" "1.8"]
:dependencies [[org.clojure/clojure "1.10.1"]]
Expand Down
4 changes: 2 additions & 2 deletions resources/clojureReader.js
Expand Up @@ -6,8 +6,8 @@
* bundle
*/
const antlr4 = require('antlr4')
const {ClojureLexer} = require('../src/javascript/parcera/antlr/ClojureLexer')
const {ClojureParser} = require('../src/javascript/parcera/antlr/ClojureParser')
const {ClojureLexer} = require('../src/clojure/parcera/antlr/js/ClojureLexer')
const {ClojureParser} = require('../src/clojure/parcera/antlr/js/ClojureParser')

const reader = {
charStreams: (input) => new antlr4.CharStreams.fromString(input),
Expand Down
2 changes: 1 addition & 1 deletion resources/webpack.config.js
Expand Up @@ -5,7 +5,7 @@ module.exports = {
entry: path.resolve(__dirname, './clojureReader.js'),
output: {
filename: 'clojure.reader.bundle.js',
path: path.resolve(__dirname, '../src/javascript'),
path: path.resolve(__dirname, '../src/clojure/parcera/antlr/js'),
// the url to the output directory resolved relative to the HTML page
library: "ClojureReader",
// the name of the exported library
Expand Down
2 changes: 1 addition & 1 deletion src/clojure/deps.cljs
@@ -1,3 +1,3 @@
{:foreign-libs [{:file "./src/javascript/clojure.reader.bundle.js"
{:foreign-libs [{:file "parcera/antlr/js/clojure.reader.bundle.js"
:provides ["antlr.clojure.reader"]
:module-type :commonjs}]}

0 comments on commit 18f103a

Please sign in to comment.