diff options
| author | Eduardo Julian | 2015-09-12 18:31:29 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2015-09-12 18:31:29 -0400 |
| commit | 1e5f1afbd0f8b54350e552c110dead87b4b5dca0 (patch) | |
| tree | d14d3b40a9e41b4c836f1cb12fb2026a5d470f3d /src/lux/analyser.clj | |
| parent | 3c1e63b8ea119601f6ba2c9eb709877c76683a8c (diff) | |
- Fixed some errors with JVM interop.
Diffstat (limited to '')
| -rw-r--r-- | src/lux/analyser.clj | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/lux/analyser.clj b/src/lux/analyser.clj index bd0957bdf..e1c167ce6 100644 --- a/src/lux/analyser.clj +++ b/src/lux/analyser.clj @@ -43,6 +43,14 @@ _ (fail (str "[Analyser Error] Not a tag: " (&/show-ast ast))))) +(defn ^:private extract-text [ast] + (|case ast + [_ (&/$TextS text)] + (return text) + + _ + (fail (str "[Analyser Error] Can't extract text: " (&/show-ast ast))))) + (defn analyse-variant+ [analyser exo-type ident values] (|do [[module tag-name] (&/normalize ident) idx (&&module/tag-index module tag-name)] @@ -155,13 +163,15 @@ (&/$Cons [_ (&/$TupleS ?fields)] (&/$Cons [_ (&/$TupleS ?methods)] (&/$Nil)))))))) - (&&host/analyse-jvm-class analyse compile-token ?name ?super-class ?interfaces ?fields ?methods) + (|do [=interfaces (&/map% extract-text ?interfaces)] + (&&host/analyse-jvm-class analyse compile-token ?name ?super-class =interfaces ?fields ?methods)) (&/$FormS (&/$Cons [_ (&/$SymbolS _ "_jvm_interface")] (&/$Cons [_ (&/$TextS ?name)] (&/$Cons [_ (&/$TupleS ?supers)] ?methods)))) - (&&host/analyse-jvm-interface analyse compile-token ?name ?supers ?methods) + (|do [=supers (&/map% extract-text ?supers)] + (&&host/analyse-jvm-interface analyse compile-token ?name =supers ?methods)) ;; Programs (&/$FormS (&/$Cons [_ (&/$SymbolS _ "_jvm_program")] @@ -280,7 +290,8 @@ (&/$Cons [_ (&/$TupleS ?classes)] (&/$Cons [_ (&/$TupleS ?args)] (&/$Nil)))))) - (&&host/analyse-jvm-new analyse exo-type ?class ?classes ?args) + (|do [=classes (&/map% extract-text ?classes)] + (&&host/analyse-jvm-new analyse exo-type ?class =classes ?args)) (&/$FormS (&/$Cons [_ (&/$SymbolS _ "_jvm_getstatic")] (&/$Cons [_ (&/$TextS ?class)] @@ -316,7 +327,8 @@ (&/$Cons [_ (&/$TupleS ?classes)] (&/$Cons [_ (&/$TupleS ?args)] (&/$Nil))))))) - (&&host/analyse-jvm-invokestatic analyse exo-type ?class ?method ?classes ?args) + (|do [=classes (&/map% extract-text ?classes)] + (&&host/analyse-jvm-invokestatic analyse exo-type ?class ?method =classes ?args)) (&/$FormS (&/$Cons [_ (&/$SymbolS _ "_jvm_invokevirtual")] (&/$Cons [_ (&/$TextS ?class)] @@ -325,7 +337,8 @@ (&/$Cons ?object (&/$Cons [_ (&/$TupleS ?args)] (&/$Nil)))))))) - (&&host/analyse-jvm-invokevirtual analyse exo-type ?class ?method ?classes ?object ?args) + (|do [=classes (&/map% extract-text ?classes)] + (&&host/analyse-jvm-invokevirtual analyse exo-type ?class ?method =classes ?object ?args)) (&/$FormS (&/$Cons [_ (&/$SymbolS _ "_jvm_invokeinterface")] (&/$Cons [_ (&/$TextS ?class)] @@ -334,7 +347,8 @@ (&/$Cons ?object (&/$Cons [_ (&/$TupleS ?args)] (&/$Nil)))))))) - (&&host/analyse-jvm-invokeinterface analyse exo-type ?class ?method ?classes ?object ?args) + (|do [=classes (&/map% extract-text ?classes)] + (&&host/analyse-jvm-invokeinterface analyse exo-type ?class ?method =classes ?object ?args)) (&/$FormS (&/$Cons [_ (&/$SymbolS _ "_jvm_invokespecial")] (&/$Cons [_ (&/$TextS ?class)] @@ -343,7 +357,8 @@ (&/$Cons ?object (&/$Cons [_ (&/$TupleS ?args)] (&/$Nil)))))))) - (&&host/analyse-jvm-invokespecial analyse exo-type ?class ?method ?classes ?object ?args) + (|do [=classes (&/map% extract-text ?classes)] + (&&host/analyse-jvm-invokespecial analyse exo-type ?class ?method =classes ?object ?args)) ;; Exceptions (&/$FormS (&/$Cons [_ (&/$SymbolS _ "_jvm_try")] |