diff options
Diffstat (limited to 'stdlib/source/library/lux/ffi.old.lux')
| -rw-r--r-- | stdlib/source/library/lux/ffi.old.lux | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux index 5b4d49084..a023d3afe 100644 --- a/stdlib/source/library/lux/ffi.old.lux +++ b/stdlib/source/library/lux/ffi.old.lux @@ -264,7 +264,7 @@ _ #.None)) -(def: sanitize +(def: safe (-> Text Text) (text.replace_all "/" ".")) @@ -283,7 +283,7 @@ output [[name params] _ _] - (let [name (sanitize name) + (let [name (safe name) =params (list\map (class_to_type' mode type_params in_array?) params)] (` (primitive (~ (code.text name)) [(~+ =params)]))))) @@ -335,7 +335,7 @@ (#.Cons bound1 _) (class_to_type #ManualPrM class_params bound1)))) class_params)] - (` (primitive (~ (code.text (sanitize class_name))) + (` (primitive (~ (code.text (safe class_name))) [(~+ =params)])))) (def: type_var_class Text "java.lang.Object") @@ -361,7 +361,7 @@ (simple_class$ env upper_bound) (#GenericClass name env) - (sanitize name) + (safe name) (#GenericArray param') (case param' @@ -987,7 +987,7 @@ name (#GenericClass name params) - (format "(" (sanitize name) " " (spaced (list\map generic_type$ params)) ")") + (format "(" (safe name) " " (spaced (list\map generic_type$ params)) ")") (#GenericArray param) (format "(" array.type_name " " (generic_type$ param) ")") @@ -1004,11 +1004,11 @@ (def: (class_decl$ (^open ".")) (-> Class_Declaration JVM_Code) - (format "(" (sanitize class_name) " " (spaced (list\map type_param$ class_params)) ")")) + (format "(" (safe class_name) " " (spaced (list\map type_param$ class_params)) ")")) (def: (super_class_decl$ (^slots [#super_class_name #super_class_params])) (-> Super_Class_Decl JVM_Code) - (format "(" (sanitize super_class_name) " " (spaced (list\map generic_type$ super_class_params)) ")")) + (format "(" (safe super_class_name) " " (spaced (list\map generic_type$ super_class_params)) ")")) (def: (method_decl$ [[name pm anns] method_decl]) (-> [Member_Declaration MethodDecl] JVM_Code) @@ -1209,11 +1209,11 @@ )} (do meta.monad [current_module meta.current_module_name - #let [fully_qualified_class_name (format (sanitize current_module) "." full_class_name) + #let [fully_qualified_class_name (format (safe current_module) "." full_class_name) field_parsers (list\map (field_to_parser fully_qualified_class_name) fields) method_parsers (list\map (method_to_parser (product.right class_decl) fully_qualified_class_name) methods) replacer (parser_to_replacer (list\fold <>.either - (<>.fail "") + (<>.failure "") (list\compose field_parsers method_parsers))) def_code (format "jvm class:" (spaced (list (class_decl$ class_decl) @@ -1362,7 +1362,7 @@ {#..jvm_class (~ (code.text full_name))} Type (All [(~+ params')] - (primitive (~ (code.text (sanitize full_name))) + (primitive (~ (code.text (safe full_name))) [(~+ params')])))))) (def: (member_type_vars class_tvars member) @@ -1483,7 +1483,7 @@ (if maybe? (` ((~! !!!) (~ (un_quote input)))) (un_quote input)))) - (list.zip/2 classes) + (list.zipped/2 classes) (list\map (auto_convert_input mode)))) (def: (import_name format class member) @@ -1495,7 +1495,7 @@ (def: (member_def_interop type_params kind class [arg_function_inputs arg_classes arg_types] member method_prefix import_format) (-> (List Type_Parameter) Class_Kind Class_Declaration [(List [Bit Code]) (List Text) (List Code)] Import_Member_Declaration Text Text (Meta (List Code))) (let [[full_name class_tvars] class - full_name (sanitize full_name) + full_name (safe full_name) all_params (|> (member_type_vars class_tvars member) (list.only free_type_param?) (list\map type_param_to_type_arg))] @@ -1641,7 +1641,7 @@ (def: (class_kind [class_name _]) (-> Class_Declaration (Meta Class_Kind)) - (let [class_name (..sanitize class_name)] + (let [class_name (..safe class_name)] (case (..load_class class_name) (#try.Success class) (\ meta.monad wrap (if (interface? class) @@ -1649,8 +1649,8 @@ #Class)) (#try.Failure error) - (meta.fail (format "Cannot load class: " class_name text.new_line - error))))) + (meta.failure (format "Cannot load class: " class_name text.new_line + error))))) (syntax: #export (import: {class_decl ..class_decl^} @@ -1692,13 +1692,13 @@ "It should also be noted, the only types that may show up in method arguments or return values may be Java classes, arrays, primitives, void or type-parameters." "Lux types, such as Maybe cannot be named (otherwise, they'd be confused for Java classes)." - (import: (lux/concurrency/promise/JvmPromise A) + (import: (lux/concurrency/async/JvmAsync A) ["#::." (resolve [A] boolean) (poll [] A) (wasResolved [] boolean) (waitOn [lux/Function] void) - (#static [A] make [A] (lux/concurrency/promise/JvmPromise A))]) + (#static [A] make [A] (lux/concurrency/async/JvmAsync A))]) "Also, the names of the imported members will look like Class::member" (java/lang/Object::new []) @@ -1751,7 +1751,7 @@ (#.Apply A F) (case (type.applied (list A) F) #.None - (meta.fail (format "Cannot apply type: " (type.format F) " to " (type.format A))) + (meta.failure (format "Cannot apply type: " (type.format F) " to " (type.format A))) (#.Some type') (type_to_class_name type')) @@ -1760,7 +1760,7 @@ (type_to_class_name type') _ - (meta.fail (format "Cannot convert to JvmType: " (type.format type)))))) + (meta.failure (format "Cannot convert to JvmType: " (type.format type)))))) (syntax: #export (array_read idx array) {#.doc (doc "Loads an element from an array." |