Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-01-08 01:49:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed scope orders.

Browse Source
This commit is contained in:
Relintai 2022-06-04 09:41:59 +02:00
parent 97c5fbc9fc
commit 7833c0d153
1 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
game/addons/gdc_converter/gdsparser.gd
View File

@ -13,6 +13,11 @@ enum GDScopeType {
GDSCOPE_TYPE_ENUM, GDSCOPE_TYPE_ENUM,
}; };
enum GDScopeLineType {
GDSCOPE_TYPE_LINE = 0,
GDSCOPE_TYPE_SCOPE,
};
class GDSScope: class GDSScope:
var type : int = GDScopeType.GDSCOPE_TYPE_GENERIC var type : int = GDScopeType.GDSCOPE_TYPE_GENERIC
var scope_data : String = "" var scope_data : String = ""
@ -22,6 +27,7 @@ class GDSScope:
var subscopes : Array = Array() var subscopes : Array = Array()
var scope_lines : PoolStringArray = PoolStringArray() var scope_lines : PoolStringArray = PoolStringArray()
var is_static : bool = false var is_static : bool = false
var scope_line_order : PoolIntArray
func parse(contents : PoolStringArray, current_index : int = 0, current_indent : int = 0) -> int: func parse(contents : PoolStringArray, current_index : int = 0, current_indent : int = 0) -> int:
while current_index < contents.size(): while current_index < contents.size():
@ -29,6 +35,8 @@ class GDSScope:
if cl == "tool": if cl == "tool":
scope_lines.append("#" + cl) scope_lines.append("#" + cl)
scope_line_order.push_back(GDScopeLineType.GDSCOPE_TYPE_LINE)
scope_line_order.push_back(scope_lines.size() - 1)
current_index += 1 current_index += 1
continue continue
@ -63,12 +71,16 @@ class GDSScope:
current_index += 1 current_index += 1
current_index = scope.parse(contents, current_index, curr_line_indent + 1) current_index = scope.parse(contents, current_index, curr_line_indent + 1)
subscopes.append(scope) subscopes.append(scope)
scope_line_order.push_back(GDScopeLineType.GDSCOPE_TYPE_SCOPE)
scope_line_order.push_back(subscopes.size() - 1)
#don't #don't
#current_index += 1 #current_index += 1
continue continue
scope_lines.append(clstripped) scope_lines.append(clstripped)
scope_line_order.push_back(GDScopeLineType.GDSCOPE_TYPE_LINE)
scope_line_order.push_back(scope_lines.size() - 1)
current_index += 1 current_index += 1
return current_index return current_index
@ -133,17 +145,18 @@ class GDSScope:
indents += " " indents += " "
for l in scope_lines: for i in range(0, scope_line_order.size(), 2):
s += indents + l + "\n" if scope_line_order[i] == GDScopeLineType.GDSCOPE_TYPE_LINE:
s += indents + scope_lines[scope_line_order[i + 1]] + "\n"
for subs in subscopes: else:
s += "\n" s += "\n"
s += subs.convert_to_string(current_scope_level + 1) s += subscopes[scope_line_order[i + 1]].convert_to_string(current_scope_level + 1)
s += "\n" s += "\n"
return s return s
func type_to_print_string() -> String: func type_to_print_string() -> String:
if type == GDScopeType.GDSCOPE_TYPE_CLASS: if type == GDScopeType.GDSCOPE_TYPE_CLASS:
return "(CLASS)" return "(CLASS)"
@ -357,13 +370,44 @@ class GDSScope:
s += "\n" s += "\n"
indents += " " indents += " "
for subs in subscopes: if type == GDScopeType.GDSCOPE_TYPE_CLASS:
var scstr : String = subs.get_cpp_impl_string(current_scope_level + 1, owner_class_name) for subs in subscopes:
var scstr : String = subs.get_cpp_impl_string(current_scope_level + 1, owner_class_name)
if scstr != "":
s += scstr
s += "\n"
s += "\n"
else:
for i in range(0, scope_line_order.size(), 2):
if scope_line_order[i] == GDScopeLineType.GDSCOPE_TYPE_LINE:
var l : String = scope_lines[scope_line_order[i + 1]]
if l.begins_with("#"):
l = l.replace("#", "//")
s += indents + l + ";\n"
continue
if l.begins_with("var "):
if l.find("preload") != -1:
s += indents + "//" + l + ";\n"
continue
s += indents + " " + transform_variable_to_cpp(l) + ";\n"
else:
s += indents + l + ";\n"
else:
var scstr : String = subscopes[scope_line_order[i + 1]].get_cpp_impl_string(current_scope_level + 1, owner_class_name)
if scstr != "":
s += "\n"
s += scstr
s += "\n"
if scstr != "": s += "}\n"
s += scstr
s += "\n"
if type == GDScopeType.GDSCOPE_TYPE_CLASS: if type == GDScopeType.GDSCOPE_TYPE_CLASS:
s += "\n" s += "\n"
s += indents + scope_data + "::" + scope_data + "() {\n" s += indents + scope_data + "::" + scope_data + "() {\n"
@ -401,26 +445,6 @@ class GDSScope:
s += indents + "*/\n" s += indents + "*/\n"
s += indents + "}\n\n" s += indents + "}\n\n"
s += "\n"
if type != GDScopeType.GDSCOPE_TYPE_CLASS:
for l in scope_lines:
if l.begins_with("#"):
l = l.replace("#", "//")
s += indents + l + ";\n"
continue
if l.begins_with("var "):
if l.find("preload") != -1:
s += indents + "//" + l + ";\n"
continue
s += indents + " " + transform_variable_to_cpp(l) + ";\n"
else:
s += indents + l + ";\n"
s += "}\n"
return s return s
func create_cpp_getter_setter(line : String, header : bool, indent : String, class_prefix : String = "") -> String: func create_cpp_getter_setter(line : String, header : bool, indent : String, class_prefix : String = "") -> String: