get-code

src/leiningen/solc.clj

@@ -102,17 +102,27 @@
     (when-not (.isDirectory file)
       (.mkdirs file))))
 
-;; TODO: shim file in tmp dir before compiling
+;; TODO : get code
+;; TODO : pass to parser
+;; TODO : generate shim (solidity code)
+;; TODO : in tmp dir replace code with shim in the source file
+;; TODO : pass shimmed file for compiling
+
+(defn get-code
+  [file]
+  (first (re-find #"(?is)(matches\()(.*)(\);)" (slurp file))))
+
 (defn compile-contract [{:keys [filename src-path build-path abi? bin? truffle-artifacts? solc-err-only verbose byte-count optimize-runs] :as opts-map}]
   (let [file-path (str (ensure-slash src-path) filename)
+        code (get-code file-path)
         ast (-> file-path
                 slurp
                 matches/parse)
         initial-state (atom {:columns []
                              :patterns []
                              :returns []})
         updated-state (matches/visit-tree ast initial-state)
-        solidity (generator/generate-solidity @updated-state)
+        shim (generator/generate-solidity @updated-state)
         runs (or (cond
                    (integer? optimize-runs)
                    optimize-runs
@@ -121,8 +131,14 @@
                    (get optimize-runs filename))
                  200)]
 
-    (prn solidity)
-    ;; TODO: replace in source
+    (prn
+     code
+     shim
+      )
+
+
+
+    ;; TODO : replace in source
     ;; TODO : compile (in memory?)
 
     #_(sh/with-sh-dir src-path

src/shim/matches.clj

@@ -7,7 +7,7 @@
    [clojure.spec.alpha :as s]
    [clojure.java.io :as io]
    [clj-antlr.core :as antlr]
-   [shim.dev :refer [ast]]))
+   #_[shim.dev :refer [ast]]))
 
 ;; Match m =
 ;;          matches([x, y, z],
@@ -30,6 +30,7 @@
 ;;---spec---;;
 ;;;;;;;;;;;;;;
 (def wildcard "_")
+(def matches "matches")
 
 (s/def ::expression #{:expression})
 (s/def ::primary-expression #{:primaryExpression})