1 files changed, 2 insertions, 268 deletions
diff --git a/src/cljcc/parser.clj b/src/cljcc/parser.clj
index c11d6b5..7e0ca06 100644
--- a/src/cljcc/parser.clj
+++ b/src/cljcc/parser.clj
@@ -4,276 +4,10 @@
    [cljcc.token :as t]
    [malli.core :as m]
    [clojure.math :refer [pow]]
-   [malli.dev.pretty :as pretty]
+   [cljcc.schema :as s]
    [cljcc.exception :as exc]
    [clojure.string :as str]))
 
-(declare Statement Exp Declaration Block Type)
-
-(def StorageClass [:enum :static :extern])
-
-(def IntType
-  [:map
-   [:type [:= :int]]])
-
-(def LongType
-  [:map
-   [:type [:= :long]]])
-
-(def FunType
- [:map
-  [:type [:= :function]]
-  [:return-type [:ref #'Type]]
-  [:parameter-types [:vector [:ref #'Type]]]])
-
-(def Type
-  [:schema {:registry {::mtype-int #'IntType
-                       ::mtype-long #'LongType
-                       ::mtype-function #'FunType}}
-   [:multi {:dispatch :type}
-    [:int #'IntType]
-    [:long #'LongType]
-    [:function #'FunType]]])
-
-(def Const
-  [:map
-   [:type [:enum :int :long]]
-   [:value int?]])
-
-(def ConstantExp
-  [:map
-   [:type [:= :exp]]
-   [:exp-type [:= :constant-exp]]
-   [:value #'Const]
-   [:value-type {:optional true} #'Type]])
-
-(def VariableExp
-  [:map
-   [:type [:= :exp]]
-   [:exp-type [:= :variable-exp]]
-   [:identifier string?]
-   [:value-type {:optional true} #'Type]])
-
-(def CastExp
-  [:map
-   [:type [:= :exp]]
-   [:exp-type [:= :cast-exp]]
-   [:target-type #'Type]
-   [:value [:ref #'Exp]]
-   [:value-type {:optional true} #'Type]])
-
-(def UnaryExp
-  [:map
-   [:type [:= :exp]]
-   [:exp-type [:= :unary-exp]]
-   [:unary-operator `[:enum ~@t/unary-ops]]
-   [:value [:ref #'Exp]]
-   [:value-type {:optional true} #'Type]])
-
-(def BinaryExp
-  [:map
-   [:type [:= :exp]]
-   [:exp-type [:= :binary-exp]]
-   [:binary-operator `[:enum ~@(set (keys t/bin-ops))]]
-   [:left [:ref #'Exp]]
-   [:right [:ref #'Exp]]
-   [:value-type {:optional true} #'Type]])
-
-(def AssignmentExp
-  [:map
-   [:type [:= :exp]]
-   [:exp-type [:= :assignment-exp]]
-   [:assignment-operator `[:enum ~@t/assignment-ops]]
-   [:left [:ref #'Exp]]
-   [:right [:ref #'Exp]]
-   [:value-type {:optional true} #'Type]])
-
-(def ConditionalExp
-  [:map
-   [:type [:= :exp]]
-   [:exp-type [:= :conditional-exp]]
-   [:left [:ref #'Exp]]
-   [:middle [:ref #'Exp]]
-   [:right [:ref #'Exp]]
-   [:value-type {:optional true} #'Type]])
-
-(def FunctionCallExp
-  [:map
-   [:type [:= :exp]]
-   [:exp-type [:= :function-call-exp]]
-   [:identifier string?]
-   [:arguments [:vector [:ref #'Exp]]]
-   [:value-type {:optional true} #'Type]])
-
-(def Exp
-  [:schema {:registry {::mexp-constant #'ConstantExp
-                       ::mexp-variable #'VariableExp
-                       ::mexp-cast #'CastExp
-                       ::mexp-unary #'UnaryExp
-                       ::mexp-binary #'BinaryExp
-                       ::mexp-assignment #'AssignmentExp
-
-                       ::mexp-conditional #'ConditionalExp
-                       ::mexp-function-call #'FunctionCallExp}}
-   [:multi {:dispatch :exp-type}
-    [:constant-exp #'ConstantExp]
-    [:variable-exp #'VariableExp]
-    [:cast-exp #'CastExp]
-    [:unary-exp #'UnaryExp]
-    [:binary-exp #'BinaryExp]
-    [:assignment-exp #'AssignmentExp]
-    [:conditional-exp #'ConditionalExp]
-    [:function-call-exp #'FunctionCallExp]]])
-
-(def VarDeclaration
-  [:map
-   [:type [:= :declaration]]
-   [:declaration-type [:= :variable]]
-   [:variable-type #'Type]
-   [:storage-class [:maybe #'StorageClass]]
-   [:identifier string?]
-   [:initial [:maybe #'Exp]]])
-
-(def FunDeclaration
-  [:map
-   [:type [:= :declaration]]
-   [:declaration-type [:= :function]]
-   [:function-type #'FunType]
-   [:identifier string?]
-   [:storage-class [:maybe #'StorageClass]]
-   [:parameters [:vector string?]]
-   [:body [:maybe [:ref #'Block]]]])
-
-(def ReturnStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :return]]
-   [:value #'Exp]])
-
-(def ExpressionStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :expression]]
-   [:value #'Exp]])
-
-(def BreakStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :break]]
-   [:label [:maybe string?]]])
-
-(def ContinueStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :continue]]
-   [:label [:maybe string?]]])
-
-(def EmptyStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :empty]]])
-
-(def WhileStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :while]]
-   [:condition #'Exp]
-   [:label {:optional true} string?]
-   [:body [:ref #'Statement]]])
-
-(def DoWhileStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :do-while]]
-   [:condition #'Exp]
-   [:label {:optional true} string?]
-   [:body [:ref #'Statement]]])
-
-(def ForStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :for]]
-   [:init [:or
-           [:ref #'VarDeclaration]
-           [:maybe #'Exp]]]
-   [:post [:maybe #'Exp]]
-   [:condition [:maybe #'Exp]]
-   [:label {:optional true} string?]
-   [:body [:ref #'Statement]]])
-
-(def IfStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :if]]
-   [:condition #'Exp]
-   [:then-statement [:ref #'Statement]]
-   [:else-statement [:maybe [:ref #'Statement]]]])
-
-(def CompoundStatement
-  [:map
-   [:type [:= :statement]]
-   [:statement-type [:= :compound]]
-   [:block [:ref #'Block]]])
-
-(def Statement
-  [:schema {:registry {::mstatement-return #'ReturnStatement
-                       ::mstatement-expression #'ExpressionStatement
-                       ::mstatement-break #'BreakStatement
-                       ::mstatement-continue #'ContinueStatement
-                       ::mstatement-empty #'EmptyStatement
-                       ::mstatement-for #'ForStatement
-                       ::mstatement-while #'WhileStatement
-                       ::mstatement-do-while #'DoWhileStatement
-                       ::mstatement-compound #'CompoundStatement
-                       ::mstatement-if #'IfStatement}}
-    [:multi {:dispatch :statement-type}
-      [:return #'ReturnStatement]
-      [:expression #'ExpressionStatement]
-      [:break #'BreakStatement]
-      [:continue #'ContinueStatement]
-      [:empty #'EmptyStatement]
-      [:compound #'CompoundStatement]
-      [:while #'WhileStatement]
-      [:do-while #'DoWhileStatement]
-      [:if #'IfStatement]
-      [:for #'ForStatement]]])
-
-(def Declaration
-  [:schema {:registry {::mdeclaration-function #'FunDeclaration
-                       ::mdeclaration-variable #'VarDeclaration}}
-   [:multi {:dispatch :declaration-type}
-    [:function #'FunDeclaration]
-    [:variable #'VarDeclaration]]])
-
-(def BlockItem
-  [:schema {:registry {::mblockitem-statement #'Statement
-                       ::mblockitem-declaration #'Declaration}}
-   [:multi {:dispatch :type}
-    [:statement [:ref #'Statement]]
-    [:declaration [:ref #'Declaration]]]])
-
-(def Block
-  [:schema {:registry {::mblock-blockitem #'BlockItem}}
-   [:vector [:ref #'BlockItem]]])
-
-(def Program
-  [:schema {:registry {::mprogram-block #'Block}}
-   [:vector [:ref #'Declaration]]])
-
-(comment
-
-  (pretty/explain
-   Block
-   [{:type :statement
-     :statement-type :compound
-     :block [{:type :statement
-              :statement-type :return
-              :value {:type :exp
-                      :exp-type :variable-exp
-                      :identifier "asd"}}]}])
-
-  ())
-
 (declare parse parse-exp parse-statement parse-block expect parse-declaration parse-variable-declaration)
 
 (defn- parse-repeatedly
@@ -751,7 +485,7 @@
 (comment
 
   (m/validate
-   Program
+   s/Program
    (parse-from-src
     "int main(void) {
 return (long) 42;