data: merge 'Data_*.gd' into 'Types.gd'

Author: umarcor

data/Data.gd

@@ -1,7 +1,9 @@
 extends Node
 
 
-const Project = preload('res://data/Data_Project.gd')
+const Types = preload('res://data/Types.gd')
+const Project = Types.Project
+const Source = Types.Source
 
 const icons = {
 	'check': preload('res://data/btn/check.svg'),
@@ -72,9 +74,9 @@ func _init():
 		'architectures': {}
 	}
 	projects.append(Project.new('Example project', [
-		Project.Source.new('/t/neorv32', Project.source_types.GLOB),
-		Project.Source.new('/t/vunit/vunit', Project.source_types.GLOB),
-		Project.Source.new('/t/vunit/osvb/AXI4Stream', Project.source_types.PYCAPI)
+		Source.new('/t/neorv32', Types.source_types.GLOB),
+		Source.new('/t/vunit/vunit', Types.source_types.GLOB),
+		Source.new('/t/vunit/osvb/AXI4Stream', Types.source_types.PYCAPI)
 	]));
 
 

data/Data_Architecture.gd

@@ -0,0 +1,76 @@
+#
+# Project
+#
+
+class Project extends Object:
+
+	var Name : String;
+	var Sources : Array;
+
+	func _init(
+		name : String,
+		sources : Array
+	):
+		Name = name
+		Sources = sources
+
+#
+# Source
+#
+
+enum source_types {
+	GLOB
+	PYCAPI
+	FUSESOC
+}
+
+const source_types_str = 'glob,pyCAPI,FuseSoC';
+
+class Source extends Object:
+	var Location : String;
+	var Type : int;
+	#var entities
+	#var architectures
+
+	func _init(
+		path : String,
+		type : int
+	):
+		Location = path;
+		Type = type;
+
+#
+# Design
+#
+
+class Design extends Object:
+	var Name : String
+
+#
+# Target
+#
+
+class Target extends Object:
+	var Board : String
+	
+#
+# Entity
+#
+
+class Entity extends Object:
+
+	#var name
+	var Context
+	var Generics
+	var Ports
+	var Types
+
+#
+# Architecture
+#
+
+class Architecture extends Object:
+
+	#var name
+	var Entity
+	var Type

data/Data_Entity.gd

@@ -82,7 +82,7 @@ func _Projects_init_Project(
 	item = prj_tree.create_item(root);
 	item.set_text(0, 'New source location');
 	item.set_editable(0, true);
-	_add_Range_Cell(Data.Project.source_types_str, item, 1);
+	_add_Range_Cell(Data.Types.source_types_str, item, 1);
 	_add_Buttons([
 		{
 			'text': 'Check',
@@ -99,12 +99,12 @@ func _Projects_init_Project(
 
 func _Projects_init_Source(
 	root : TreeItem,
-	src : Data.Project.Source
+	src : Data.Source
 ) -> void:
 	root.set_metadata(0, {"Location": src});
 	root.set_text(0, src.Location);
 	root.add_button(0, Data.icons.pencil, project_buttons.EDIT, false, 'Edit');
-	_add_Range_Cell(Data.Project.source_types_str, root, 1, src.Type);
+	_add_Range_Cell(Data.Types.source_types_str, root, 1, src.Type);
 	_add_Buttons([
 		{
 			'text': 'Check',
@@ -285,7 +285,7 @@ func _get_last(item):
 
 
 func _Projects_set_Project(
-	prj : Project,
+	prj : Data.Types.Project,
 	item : TreeItem
 ) -> void:
 	var name = item.get_text(0);
@@ -294,7 +294,7 @@ func _Projects_set_Project(
 
 
 func _Projects_set_Source(
-	_prj : Project,
+	_prj : Data.Types.Project,
 	item : TreeItem
 ) -> void:
 	var path = item.get_text(0);
@@ -322,15 +322,15 @@ func _Projects_add_Project(
 
 
 func _Projects_add_Source(
-	prj : Project,
+	prj : Data.Types.Project,
 	item : TreeItem
 ) -> void:
 	var path = item.get_text(0);
 	var type = item.get_range(1);
 	item.set_text(0, 'New source location');
-	item.set_range(1, Data.Project.source_types.GLOB);
+	item.set_range(1, Data.Types.source_types.GLOB);
 
-	var src = Data.Project.Source.new(path, type);
+	var src = Data.Source.new(path, type);
 	prj.Sources.append(src);
 
 	var parent = item.get_parent();
@@ -340,15 +340,15 @@ func _Projects_add_Source(
 
 
 func _Projects_remove_Project(
-	prj : Project,
+	prj : Data.Types.Project,
 	item : TreeItem
 ) -> void:
 	prj.free();
 	item.free();
 
 
 func _Projects_remove_Source(
-	prj : Project,
+	prj : Data.Types.Project,
 	item : TreeItem
 ) -> void:
 	prj.Sources.erase(item.get_metadata(0)["Location"]);

data/Data_Project.gd

@@ -9,16 +9,6 @@
 config_version=4
 
 _global_script_classes=[ {
-"base": "Reference",
-"class": "Architecture",
-"language": "GDScript",
-"path": "res://data/Data_Architecture.gd"
-}, {
-"base": "Reference",
-"class": "Entity",
-"language": "GDScript",
-"path": "res://data/Data_Entity.gd"
-}, {
 "base": "GNode",
 "class": "GBlock",
 "language": "GDScript",
@@ -38,26 +28,12 @@ _global_script_classes=[ {
 "class": "GSlice",
 "language": "GDScript",
 "path": "res://mode/graph/GSlice.gd"
-}, {
-"base": "Object",
-"class": "Project",
-"language": "GDScript",
-"path": "res://data/Data_Project.gd"
-}, {
-"base": "Reference",
-"class": "Repository",
-"language": "GDScript",
-"path": "res://data/Data_Repository.gd"
 } ]
 _global_script_class_icons={
-"Architecture": "",
-"Entity": "",
 "GBlock": "",
 "GLabel": "",
 "GNode": "",
-"GSlice": "",
-"Project": "",
-"Repository": ""
+"GSlice": ""
 }
 
 [application]