[C2HEXA] Recognize ArrayByValue

hexalang · Jul 20, 2024 · 566bdd2 · 566bdd2
1 parent f94e38e
commit 566bdd2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/source/data/nodeType.hexa b/source/data/nodeType.hexa
@@ -19,10 +19,11 @@ enum NodeType {
 	Optional(type NodeType)
 
 	/// `T` or `path.T`
+	// TODO `(params [NodeType]? = null)` + `case Type(..., params: null)`
 	Type(name String, path String?)
 
 	/// `T<K, V>`
-	// TODO delete Type and always just use ParametricType with params==null`null!!!!`
+	// TODO delete Type and always just use ParametricType with params==null
 	ParametricType(name String, params [NodeType], path String?)
 
 	/// `(T, T) => T`
@@ -56,6 +57,9 @@ enum NodeType {
 	/// Readable string representation
 	static fun stringify(nodeType NodeType) String {
 		switch nodeType {
+			// TODO more
+			case Int(value):
+				return '' + value
 			case Optional(type):
 				return NodeType.stringify(type) + '?'
 			case Object(names, types):
@@ -77,6 +81,7 @@ enum NodeType {
 	/// Deep cloning, normally used for generic instances
 	static fun clone(nodeType NodeType) NodeType {
 		switch nodeType {
+			// TODO more
 			case Type(name, path):
 				return NodeType.Type(name, path)
 			case ParametricType(name, params, path):

diff --git a/source/server/format.hexa b/source/server/format.hexa
@@ -158,6 +158,7 @@ fun autoFormatWholeFile(file: String): String {
 						lastToken != Token.Comma and
 						lastToken != Token.Equal and
 						lastToken != Token.Unequal and
+						// Includes `??`
 						lastToken != Token.Question and
 
 						// `@demo()` but not `@demo ()`

diff --git a/source/toHexa/clang/clangGenerator.hexa b/source/toHexa/clang/clangGenerator.hexa
@@ -140,6 +140,16 @@ class ClangGenerator {
 	fun typeToNodeType(qualType String) NodeType {
 		let qualType = desugarKnownType(qualType)
 
+		// Array
+		if qualType.endsWith(']') {
+			let parts = qualType.replace(']', '').split('[')
+
+			return NodeType.ParametricType(
+				'ArrayByValue', [typeToNodeType(parts [0]), NodeType.Int(parseInt(parts [1]))],
+				null
+			)
+		}
+
 		// Function calling convention
 		if qualType.endsWith(' __attribute__((stdcall))') {
 			let clear = qualType.substr(0, qualType.length - ' __attribute__((stdcall))'.length).trim()
@@ -272,6 +282,10 @@ class ClangGenerator {
 			return Node.Call(Node.NodeTypeValue(varType), [], [])
 		}
 
+		if str.startsWith('ArrayByValue<') {
+			return Node.Array([Node.Int(0)])
+		}
+
 		if not zeroInitialize.includes(str) {
 			return Node.Null
 		}
@@ -324,7 +338,7 @@ class ClangGenerator {
 				if let decl = previousRecordDecl {
 					previousRecordDecl = null
 
-					let className = NodeType.Type(node.name, null)
+					let className = NodeType.Type(desugarQualType.get(node.name) ?? node.name, null)
 					let extend NodeType? = null
 					let implement [NodeType] = []
 					let kind = ClassKind.Class
@@ -352,7 +366,7 @@ class ClangGenerator {
 					var returnType NodeType = typeToType(typeOfReturn(node.type))
 					var body Node? = null
 					// TODO FORMAT
-					let nodes = node.inner ??([] as! [ClangNode] /*TODO*/)
+					let nodes = node.inner ?? ([] as! [ClangNode] /*TODO*/)
 
 					for functionDecl in nodes {
 						switch functionDecl.kind {
@@ -504,8 +518,8 @@ class ClangGenerator {
 
 				switch condition {
 					case Int(value): if value == 0 {
-						return Node.Block([])
-					}
+							return Node.Block([])
+						}
 				}
 
 				return Node.While(condition, wrapToBlockIfNone(nodeToNode(node.inner[0])), true)
@@ -789,7 +803,9 @@ class ClangGenerator {
 				// TODO `case`-body still contains empty blocks
 				fun noEmptyBlocks(expr Node) Bool {
 					switch expr {
-						case Block(e) if e.length == 0: return false
+						// TODO format bug
+						// case Block(e) if e.length == 0: return false
+						case Block(e): if e.length == 0 { return false }
 					}
 
 					return true