diff options
| author | Marius <mariausol@gmail.com> | 2013-12-22 20:20:22 +0200 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2013-12-22 20:20:22 +0200 |
| commit | b03109b881e3990c8896847c367ae73b44a59c8b (patch) | |
| tree | e4980fe9befda9bb06485f6e6c4ac294d3cf307f /metapost | |
| parent | c7912abc92bf2980fa84424a2fafb4b57092c7c5 (diff) | |
| download | context-b03109b881e3990c8896847c367ae73b44a59c8b.tar.gz | |
beta 2013.12.22 19:05
Diffstat (limited to 'metapost')
| -rw-r--r-- | metapost/context/base/mp-mlib.mpiv | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/metapost/context/base/mp-mlib.mpiv b/metapost/context/base/mp-mlib.mpiv index 9395cac8c..12840b28e 100644 --- a/metapost/context/base/mp-mlib.mpiv +++ b/metapost/context/base/mp-mlib.mpiv @@ -940,7 +940,7 @@ def mfun_array_to_lua(expr key)(suffix value)(expr first, last, stp)(text t) = special "metapost.variables['" & key & "']={" for i=first step stp until last : - & t(value[i]) & "," + & "[" & decimal i & "]=" & t(value[i]) & "," endfor & "}" ; enddef ; @@ -971,14 +971,17 @@ enddef ; def startpassingvariable(expr k) = begingroup ; - save stoppassingvariable, startarray, stoparray, starthash, stophash, key, value ; + save stoppassingvariable, startarray, stoparray, starthash, stophash, index, key, value, slot, entry ; let stoppassingvariable = mfun_stop_lua_variable ; let startarray = mfun_start_lua_array ; let stoparray = mfun_stop_lua_array ; let starthash = mfun_start_lua_hash ; let stophash = mfun_stop_lua_hash ; + let index = mfun_lua_index ; let key = mfun_lua_key ; let value = mfun_lua_value ; + let slot = mfun_lua_slot ; + let entry = mfun_lua_entry ; save s ; string s ; s := "metapost.variables['" & k & "']=" enddef ; @@ -989,6 +992,8 @@ def mfun_stop_lua_variable = endgroup ; enddef ; +% currently there is no difference between array and hash + def mfun_start_lua_array = & "{" enddef ; @@ -1009,6 +1014,10 @@ def mfun_lua_key(expr k) = & "['" & k & "']=" enddef ; +def mfun_lua_index(expr k) = + & "[" & decimal k & "]=" +enddef ; + def mfun_lua_value(expr v) = if numeric v : & mfun_numeric_to_lua(v) & "," elseif pair v : & mfun_pair_to_lua(v) & "," @@ -1021,6 +1030,16 @@ def mfun_lua_value(expr v) = fi enddef ; +def mfun_lua_entry(expr k, v) = + mfun_lua_key(k) + mfun_lua_value(v) +enddef ; + +def mfun_lua_slot(expr k, v) = + mfun_lua_index(k) + mfun_lua_value(v) +enddef ; + % moved here from mp-grap.mpiv vardef escaped_format(expr s) = |