Mercurial Hosting > luan
diff src/luan/modules/http/Http.luan @ 1261:198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Mon, 24 Sep 2018 13:09:16 -0600 |
parents | 4b5b84853f6f |
children | 382c444a6c77 |
line wrap: on
line diff
--- a/src/luan/modules/http/Http.luan Sun Sep 23 22:32:34 2018 -0600 +++ b/src/luan/modules/http/Http.luan Mon Sep 24 13:09:16 2018 -0600 @@ -4,11 +4,11 @@ local ipairs = Luan.ipairs or error() local pairs = Luan.pairs or error() local type = Luan.type or error() -local to_luan = Luan.to_luan or error() local Io = require "luan:Io.luan" local Html = require "luan:Html.luan" local Table = require "luan:Table.luan" local clear = Table.clear or error() +local java_to_table_deep = Table.java_to_table_deep or error() local Package = require "luan:Package.luan" local String = require "luan:String.luan" local lower = String.lower or error() @@ -25,9 +25,9 @@ local Http = {} -local old_to_table = Luan.to_table or error() +local old_java_to_table_shallow = Table.java_to_table_shallow or error() -local function to_table(obj) +local function java_to_table_shallow(obj) if type(obj)=="java" and obj.instanceof(Request.MultipartFile) then return { filename = obj.filename @@ -35,7 +35,7 @@ content = obj.content } end - return old_to_table(obj) + return old_java_to_table_shallow(obj) end function Http.new_request(java) @@ -55,9 +55,9 @@ this.path = java.path or error() this.protocol = java.protocol or error() this.scheme = java.scheme or error() - this.headers = to_luan(java.headers) - this.parameters = to_luan(java.parameters,to_table) - this.cookies = to_luan(java.cookies) + this.headers = java_to_table_deep(java.headers) + this.parameters = java_to_table_deep(java.parameters,java_to_table_shallow) + this.cookies = java_to_table_deep(java.cookies) end function this.url()