Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed String -> Text

Browse Source
This commit is contained in:
Bruce Hill 2018-01-11 01:09:26 -08:00
parent c0333ca315
commit 6f4b67632a
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/operators.nom
View File

@ -24,7 +24,7 @@ compile [..]
local condition = nomsu:tree_to_lua(\%condition).expr; local condition = nomsu:tree_to_lua(\%condition).expr;
local when_true = nomsu:tree_to_lua(\%when_true_expr).expr; local when_true = nomsu:tree_to_lua(\%when_true_expr).expr;
local when_false = nomsu:tree_to_lua(\%when_false_expr).expr; local when_false = nomsu:tree_to_lua(\%when_false_expr).expr;
local safe = {String=true, List=true, Dict=true, Number=true}; local safe = {Text=true, List=true, Dict=true, Number=true};
if safe[\%when_true_expr.type] then if safe[\%when_true_expr.type] then
return "("..condition.." and "..when_true.." or "..when_false..")"; return "("..condition.." and "..when_true.." or "..when_false..")";
else else

4
lib/utils.nom
View File

@ -12,7 +12,7 @@ compile [assert %condition %msg] to code: ".."
parse [assert %condition] as: assert %condition (nil) parse [assert %condition] as: assert %condition (nil)
# String functions # Text functions
rule [join %strs with glue %glue] =: rule [join %strs with glue %glue] =:
lua do> ".." lua do> ".."
local str_bits = {} local str_bits = {}
@ -93,7 +93,7 @@ compile [sort %items by %key_expr] to: ".."
return \(%key_expr as lua); return \(%key_expr as lua);
end) end)
# String utilities # Text utilities
compile [nl, newline, line feed, linefeed, lf] to: "'\\n'" compile [nl, newline, line feed, linefeed, lf] to: "'\\n'"
compile [tab] to: "'\\t'" compile [tab] to: "'\\t'"
compile [bell] to: "'\\a'" compile [bell] to: "'\\a'"

4
lib/utils2.nom
View File

@ -6,11 +6,11 @@ require "lib/collections.nom"
compile [say %str] to: compile [say %str] to:
"nomsu:writeln(\(%str as lua))" if ((%str's "type") == "String") "nomsu:writeln(\(%str as lua))" if ((%str's "type") == "Text")
..else "nomsu:writeln(nomsu:stringify(\(%str as lua)))" ..else "nomsu:writeln(nomsu:stringify(\(%str as lua)))"
compile [do %action] to code: compile [do %action] to code:
(%action as lua statements) if ((%action's "type") == "Thunk") (%action as lua statements) if ((%action's "type") == "Block")
..else "(\(%action as lua))(nomsu);" ..else "(\(%action as lua))(nomsu);"
# With statement # With statement

10
nomsu.lua
View File

@ -647,7 +647,7 @@ end]]):format(lua_code))
end end
end end
return buff, inline return buff, inline
elseif "String" == _exp_0 then elseif "Text" == _exp_0 then
local buff = "\"" local buff = "\""
local longbuff = "\"..\"\n |" local longbuff = "\"..\"\n |"
local inline = true local inline = true
@ -873,7 +873,7 @@ end]]):format(lua_code))
return { return {
expr = self.__class:comma_separated_items("nomsu.defs[" .. tostring(repr(tree.stub)) .. "].fn(", args, ")") expr = self.__class:comma_separated_items("nomsu.defs[" .. tostring(repr(tree.stub)) .. "].fn(", args, ")")
} }
elseif "String" == _exp_0 then elseif "Text" == _exp_0 then
local concat_parts = { } local concat_parts = { }
local string_buffer = "" local string_buffer = ""
local _list_0 = tree.value local _list_0 = tree.value
@ -987,7 +987,7 @@ end]]):format(lua_code))
return return
end end
local _exp_0 = tree.type local _exp_0 = tree.type
if "List" == _exp_0 or "File" == _exp_0 or "Block" == _exp_0 or "FunctionCall" == _exp_0 or "String" == _exp_0 then if "List" == _exp_0 or "File" == _exp_0 or "Block" == _exp_0 or "FunctionCall" == _exp_0 or "Text" == _exp_0 then
local _list_0 = tree.value local _list_0 = tree.value
for _index_0 = 1, #_list_0 do for _index_0 = 1, #_list_0 do
local v = _list_0[_index_0] local v = _list_0[_index_0]
@ -1040,7 +1040,7 @@ end]]):format(lua_code))
if vars[tree.value] ~= nil then if vars[tree.value] ~= nil then
tree = vars[tree.value] tree = vars[tree.value]
end end
elseif "File" == _exp_0 or "Nomsu" == _exp_0 or "Block" == _exp_0 or "List" == _exp_0 or "FunctionCall" == _exp_0 or "String" == _exp_0 then elseif "File" == _exp_0 or "Nomsu" == _exp_0 or "Block" == _exp_0 or "List" == _exp_0 or "FunctionCall" == _exp_0 or "Text" == _exp_0 then
local new_value = self:replaced_vars(tree.value, vars) local new_value = self:replaced_vars(tree.value, vars)
if new_value ~= tree.value then if new_value ~= tree.value then
do do
@ -1118,7 +1118,7 @@ end]]):format(lua_code))
self:error("Invalid type for getting stub: " .. tostring(type(x)) .. " for:\n" .. tostring(repr(x))) self:error("Invalid type for getting stub: " .. tostring(type(x)) .. " for:\n" .. tostring(repr(x)))
end end
local _exp_0 = x.type local _exp_0 = x.type
if "String" == _exp_0 then if "Text" == _exp_0 then
return self:get_stub(x.value) return self:get_stub(x.value)
elseif "FunctionCall" == _exp_0 then elseif "FunctionCall" == _exp_0 then
return self:get_stub(x.src) return self:get_stub(x.src)

10
nomsu.moon
View File

@ -427,7 +427,7 @@ end]]\format(lua_code))
buff ..= nomsu buff ..= nomsu
return buff, inline return buff, inline
when "String" when "Text"
buff = "\"" buff = "\""
longbuff = "\"..\"\n |" longbuff = "\"..\"\n |"
inline = true inline = true
@ -583,7 +583,7 @@ end]]\format(lua_code))
remove @compilestack remove @compilestack
return expr:@@comma_separated_items("nomsu.defs[#{repr tree.stub}].fn(", args, ")") return expr:@@comma_separated_items("nomsu.defs[#{repr tree.stub}].fn(", args, ")")
when "String" when "Text"
concat_parts = {} concat_parts = {}
string_buffer = "" string_buffer = ""
for bit in *tree.value for bit in *tree.value
@ -653,7 +653,7 @@ end]]\format(lua_code))
if type(tree) != 'table' or not tree.type if type(tree) != 'table' or not tree.type
return return
switch tree.type switch tree.type
when "List", "File", "Block", "FunctionCall", "String" when "List", "File", "Block", "FunctionCall", "Text"
for v in *tree.value for v in *tree.value
@walk_tree(v, depth+1) @walk_tree(v, depth+1)
when "Dict" when "Dict"
@ -703,7 +703,7 @@ end]]\format(lua_code))
when "Var" when "Var"
if vars[tree.value] ~= nil if vars[tree.value] ~= nil
tree = vars[tree.value] tree = vars[tree.value]
when "File", "Nomsu", "Block", "List", "FunctionCall", "String" when "File", "Nomsu", "Block", "List", "FunctionCall", "Text"
new_value = @replaced_vars tree.value, vars new_value = @replaced_vars tree.value, vars
if new_value != tree.value if new_value != tree.value
tree = {k,v for k,v in pairs(tree)} tree = {k,v for k,v in pairs(tree)}
@ -747,7 +747,7 @@ end]]\format(lua_code))
if type(x) != 'table' if type(x) != 'table'
@error "Invalid type for getting stub: #{type(x)} for:\n#{repr x}" @error "Invalid type for getting stub: #{type(x)} for:\n#{repr x}"
switch x.type switch x.type
when "String" then return @get_stub(x.value) when "Text" then return @get_stub(x.value)
when "FunctionCall" then return @get_stub(x.src) when "FunctionCall" then return @get_stub(x.src)
else @error "Unsupported get stub type: #{x.type} for #{repr x}" else @error "Unsupported get stub type: #{x.type} for #{repr x}"

18
nomsu.peg
View File

@ -24,10 +24,10 @@ eol_nomsu (Nomsu): "\" noeol_expression
indented_nomsu (Nomsu): "\" expression indented_nomsu (Nomsu): "\" expression
inline_expression: inline_expression:
number / variable / inline_string / inline_list / inline_dict / inline_nomsu number / variable / inline_text / inline_list / inline_dict / inline_nomsu
/ ("(" %ws* (inline_block / inline_statement) %ws* ")") / ("(" %ws* (inline_block / inline_statement) %ws* ")")
noeol_expression: noeol_expression:
indented_string / indented_nomsu / indented_list / indented_dict / indented_block indented_text / indented_nomsu / indented_list / indented_dict / indented_block
/ ("(..)" indent / ("(..)" indent
statement statement
(dedent / (("" -> "Error while parsing indented expression") => error)) (dedent / (("" -> "Error while parsing indented expression") => error))
@ -44,20 +44,20 @@ functioncall (FunctionCall):
word (Word): { %operator / (!number plain_word) } word (Word): { %operator / (!number plain_word) }
inline_string (String): inline_text (Text):
'"' {| '"' {|
({~ (('\"' -> '"') / ('\\' -> '\') / ('\..' -> '..') / %escape_char / [^%nl\"])+ ~} ({~ (('\"' -> '"') / ('\\' -> '\') / ('\..' -> '..') / %escape_char / [^%nl\"])+ ~}
/ string_interpolation)* / text_interpolation)*
|} '"' |} '"'
indented_string (String): indented_text (Text):
'".."' %ws* line_comment? %nl %gt_nodented? {| '".."' %ws* line_comment? %nl %gt_nodented? {|
({~ ({~
(("\\" -> "\") / (("\" eol %nl %gt_nodented "..") -> "") (("\\" -> "\") / (("\" eol %nl %gt_nodented "..") -> "")
/ (%nl+ {~ %gt_nodented -> "" ~}) / [^%nl\])+ / (%nl+ {~ %gt_nodented -> "" ~}) / [^%nl\])+
~} / string_interpolation)* ~} / text_interpolation)*
|} ((!.) / (&(%nl+ !%gt_nodented)) / (("" -> "Error while parsing String") => error)) |} ((!.) / (&(%nl+ !%gt_nodented)) / (("" -> "Error while parsing Text") => error))
string_interpolation: text_interpolation:
"\" (variable / inline_list / inline_dict / inline_string / ("(" %ws* (inline_block / inline_statement) %ws* ")")) "\" (variable / inline_list / inline_dict / inline_text / ("(" %ws* (inline_block / inline_statement) %ws* ")"))
number (Number): (("-"? (([0-9]+ "." [0-9]+) / ("." [0-9]+) / ([0-9]+)))-> tonumber) number (Number): (("-"? (([0-9]+ "." [0-9]+) / ("." [0-9]+) / ([0-9]+)))-> tonumber)