Merge branch 'master' of https://gitee.com/lveyou/dl
This commit is contained in:
+100
-11
@@ -55,11 +55,11 @@ namespace dl
|
||||
script_print(ScriptLogType::E_debug, fmt::format("源:\n{}", src_raw));
|
||||
|
||||
ScriptBlock ret;
|
||||
ret._name = src_raw;
|
||||
ret._varSpaceIteral._index = SCRIPT_INDEX_VS_NAG_1;
|
||||
|
||||
|
||||
// 预处理
|
||||
g_script->PreprocessLineNumber(ret, src_raw);
|
||||
std::string src = g_script->Preprocess(src_raw);
|
||||
|
||||
|
||||
@@ -71,6 +71,8 @@ namespace dl
|
||||
|
||||
// 括号层级
|
||||
size_t level_brace = 0;
|
||||
// 行号
|
||||
size_t line_number = 0;
|
||||
|
||||
enum class State
|
||||
{
|
||||
@@ -144,7 +146,10 @@ namespace dl
|
||||
}
|
||||
|
||||
seg._allExpr.push_back({});
|
||||
|
||||
ScriptExpr& expr = seg._allExpr.back();
|
||||
expr._lineNumber = line_number;
|
||||
expr._strRaw = ret._vecSource[expr._lineNumber];
|
||||
|
||||
|
||||
// 例:print a + b
|
||||
@@ -282,7 +287,6 @@ namespace dl
|
||||
{
|
||||
// end为当前字符
|
||||
char ch = src[end];
|
||||
|
||||
#ifndef NDEBUG
|
||||
std::string_view word_current = fn_string();
|
||||
#endif
|
||||
@@ -315,6 +319,7 @@ namespace dl
|
||||
if (ch == '\n' && level_brace == 0)
|
||||
{
|
||||
fn_expr(seg); // 解析表达式
|
||||
++line_number;
|
||||
}
|
||||
++end;
|
||||
beg = end;
|
||||
@@ -453,12 +458,28 @@ namespace dl
|
||||
if (ch == '\n')
|
||||
{
|
||||
mode = 0;
|
||||
ret.push_back(ch);
|
||||
}
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
void ScriptSystem::PreprocessLineNumber(ScriptBlock& block, std::string_view src)
|
||||
{
|
||||
std::vector<std::string_view> vec = String::SplitView(src, "\n");
|
||||
|
||||
for (auto& iter : vec)
|
||||
block._vecSource.push_back(std::string{ iter });
|
||||
/*if (vec.empty())
|
||||
return;
|
||||
for (size_t i = 0; i < vec.size() - 1; ++i)
|
||||
{
|
||||
block._vecSource.push_back(vec[i] + "\n");
|
||||
}
|
||||
block._vecSource.push_back(std::string{ vec.back() });*/
|
||||
}
|
||||
|
||||
bool ScriptSystem::IsOperator(std::string_view str)
|
||||
{
|
||||
return _allOperator.contains(str);
|
||||
@@ -701,6 +722,12 @@ namespace dl
|
||||
script_print(ScriptLogType::E_print, vm.Variable2String(param[0]));
|
||||
return 0;
|
||||
}
|
||||
int ex_script_assert(ScriptVM& vm, ScriptParam param)
|
||||
{
|
||||
if (!vm.Variable2Bool(param[0]))
|
||||
vm.Throw();
|
||||
return 0;
|
||||
}
|
||||
|
||||
ScriptSystem::ScriptSystem()
|
||||
{
|
||||
@@ -718,22 +745,24 @@ namespace dl
|
||||
_allKeyword["for"] = 0;
|
||||
_allKeyword["goto"] = 0;
|
||||
|
||||
_allOperator["+"] = 0;
|
||||
_allOperator["-"] = 0;
|
||||
_allOperator["*"] = 10;
|
||||
_allOperator["/"] = 10;
|
||||
_allOperator["="] = 20;
|
||||
_allOperator["=="] = 0;
|
||||
_allOperator["+"] = 10;
|
||||
_allOperator["-"] = 10;
|
||||
_allOperator["*"] = 20;
|
||||
_allOperator["/"] = 20;
|
||||
_allOperator["="] = 30;
|
||||
_allOperator["("] = SCRIPT_OPERATOR_PRIORITY_PARENTHESES_L;
|
||||
_allOperator[")"] = SCRIPT_OPERATOR_PRIORITY_PARENTHESES_R;
|
||||
|
||||
_varSpaceGlobal._index = 0;
|
||||
|
||||
RegisterFunction("print", ex_script_print);
|
||||
RegisterFunction("assert", ex_script_assert);
|
||||
}
|
||||
|
||||
void ScriptVM::Execute(const ScriptBlock& block)
|
||||
{
|
||||
script_print(ScriptLogType::E_info, fmt::format("开始执行代码块:{}", block._name));
|
||||
script_print(ScriptLogType::E_info, fmt::format("开始执行代码块:\n{}", block.GetSource()));
|
||||
|
||||
// 记录代码块
|
||||
_block = █
|
||||
@@ -766,22 +795,37 @@ namespace dl
|
||||
case ScriptSegmentType::E_for:
|
||||
break;
|
||||
default:
|
||||
script_print(ScriptLogType::E_damage, fmt::format("未知表达式类型:{}行,{}", seg._lineNumber, (int)seg._type));
|
||||
script_print(ScriptLogType::E_damage,
|
||||
fmt::format("未知表达式类型:{}行,{}", expr._lineNumber + 1, (int)seg._type));
|
||||
return;
|
||||
}
|
||||
if (_bThrow)
|
||||
{
|
||||
script_print(ScriptLogType::E_err,
|
||||
fmt::format("line{}: {}", expr._lineNumber + 1, expr._strRaw));
|
||||
break;
|
||||
}
|
||||
++cur_expr;
|
||||
_clear_expr();
|
||||
}
|
||||
delete _allVarSpace.back();
|
||||
_allVarSpace.pop_back();
|
||||
++cur;
|
||||
if (_bThrow)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
// 变量空间出栈
|
||||
_block = nullptr;
|
||||
script_print(ScriptLogType::E_info, fmt::format("完成执行代码块:{}", block._name));
|
||||
if(_bThrow)
|
||||
script_print(ScriptLogType::E_info, fmt::format("执行代码块出错:\n{}", block.GetSource()));
|
||||
else
|
||||
script_print(ScriptLogType::E_info, fmt::format("执行代码块完成:\n{}", block.GetSource()));
|
||||
}
|
||||
|
||||
ScriptVM::ScriptVM()
|
||||
ScriptVM::ScriptVM():
|
||||
_bThrow{false}
|
||||
{
|
||||
g_script->CopyVariableToVm(*this);
|
||||
_allVarSpace.push_back(&_varSpaceGlobal);
|
||||
@@ -1016,6 +1060,31 @@ namespace dl
|
||||
return "error_variable";
|
||||
}
|
||||
|
||||
bool ScriptVM::Variable2Bool(const ScriptVar& var)
|
||||
{
|
||||
switch (var.GetType())
|
||||
{
|
||||
case ScriptVarType::E_null:
|
||||
return false;
|
||||
case ScriptVarType::E_int:
|
||||
return var.ToInt();
|
||||
case ScriptVarType::E_float:
|
||||
return var.ToFloat();
|
||||
case ScriptVarType::E_string:
|
||||
return !GetVariableString(var).empty();
|
||||
case ScriptVarType::E_class:
|
||||
case ScriptVarType::E_vector:
|
||||
case ScriptVarType::E_table:
|
||||
case ScriptVarType::E_function:
|
||||
case ScriptVarType::E_userdata:
|
||||
case ScriptVarType::E_operator:
|
||||
case ScriptVarType::E_max:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
assert(0);
|
||||
}
|
||||
|
||||
std::string_view ScriptVar::GetTypeString() const
|
||||
{
|
||||
switch (_type)
|
||||
@@ -1087,4 +1156,24 @@ namespace dl
|
||||
}
|
||||
|
||||
|
||||
std::string ScriptBlock::GetSource(bool line_number /*= true*/,
|
||||
bool header /*= true*/, bool footer /*= true*/) const
|
||||
{
|
||||
std::string ret;
|
||||
if (header)
|
||||
ret += "--------------------------------\n";
|
||||
for (size_t i = 0; i < _vecSource.size(); ++i)
|
||||
{
|
||||
if (line_number)
|
||||
ret += fmt::format("{: >5}.|", i + 1);
|
||||
ret += _vecSource[i];
|
||||
ret += "\n";
|
||||
}
|
||||
if (footer)
|
||||
ret += "--------------------------------";
|
||||
else
|
||||
ret.pop_back();
|
||||
return ret;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user