diff --git a/all.sas b/all.sas index f50f197..81087a3 100644 --- a/all.sas +++ b/all.sas @@ -12374,7 +12374,7 @@ data _null_; infile = io.open (sas.symget("fpath1"), "r") outfile = io.open (sas.symget("fpath2"), "w") io.input(infile) - local resp=json2sas.decode(io.read()) + local resp=json.decode(io.read()) local job=resp["code"] outfile:write(job) io.close(infile) @@ -13549,7 +13549,7 @@ filename &fref1 clear; data _null_; file "%sysfunc(pathname(work))/ml_json.lua"; put '-- '; - put '-- json.lua (modified from json.lua) '; + put '-- json.lua '; put '-- '; put '-- Copyright (c) 2019 rxi '; put '-- '; diff --git a/doxy/Doxyfile b/doxy/Doxyfile index 106e6f3..f559e5a 100644 --- a/doxy/Doxyfile +++ b/doxy/Doxyfile @@ -19,7 +19,7 @@ HTML_FOOTER = ./doxy/new_footer.html HTML_EXTRA_STYLESHEET = ./doxy/new_stylesheet.css INHERIT_DOCS = NO INLINE_INFO = NO -INPUT = base meta metax viya +INPUT = base meta metax viya lua LAYOUT_FILE = ./doxy/DoxygenLayout.xml MAX_INITIALIZER_LINES = 0 PROJECT_NAME = Macro Core diff --git a/doxy/build.sh b/doxy/build.sh index 1241a5f..e7578f6 100755 --- a/doxy/build.sh +++ b/doxy/build.sh @@ -16,6 +16,7 @@ mkdir $BUILD_FOLDER cp -r base $BUILD_FOLDER cp -r meta $BUILD_FOLDER cp -r metax $BUILD_FOLDER +cp -r lua $BUILD_FOLDER cp -r viya $BUILD_FOLDER cp -r doxy $BUILD_FOLDER cp main.dox $BUILD_FOLDER diff --git a/lua/json.lua b/lua/json.lua index fc39240..b7f7827 100644 --- a/lua/json.lua +++ b/lua/json.lua @@ -1,5 +1,5 @@ -- --- json.lua (modified from json.lua) +-- json.lua -- -- Copyright (c) 2019 rxi -- @@ -368,4 +368,4 @@ function json.decode(str) return res end -return json \ No newline at end of file +return json diff --git a/lua/ml_json.sas b/lua/ml_json.sas index fc4d5ad..ffd00a6 100644 --- a/lua/ml_json.sas +++ b/lua/ml_json.sas @@ -13,7 +13,7 @@ data _null_; file "%sysfunc(pathname(work))/ml_json.lua"; put '-- '; - put '-- json.lua (modified from json.lua) '; + put '-- json.lua '; put '-- '; put '-- Copyright (c) 2019 rxi '; put '-- '; diff --git a/main.dox b/main.dox index f4c6cf6..3069611 100644 --- a/main.dox +++ b/main.dox @@ -50,4 +50,15 @@ * No X command * Prefixes: _mv_ + */ + + /*! \dir lua + * \brief Lua macros + * \details These macros have the following attributes: + + * OS independent + * Work as LUA functions (they are immediately executed/compiled) + * Auto-generated from the plain source `.lua` files in the same directory + * Prefixes: _ml_ + */ \ No newline at end of file diff --git a/viya/mv_getjobcode.sas b/viya/mv_getjobcode.sas index f45d9cb..7ac7d83 100644 --- a/viya/mv_getjobcode.sas +++ b/viya/mv_getjobcode.sas @@ -125,7 +125,7 @@ data _null_; infile = io.open (sas.symget("fpath1"), "r") outfile = io.open (sas.symget("fpath2"), "w") io.input(infile) - local resp=json2sas.decode(io.read()) + local resp=json.decode(io.read()) local job=resp["code"] outfile:write(job) io.close(infile)