From 23639dd66eb4a45dd7d5338230c11355be544c6c Mon Sep 17 00:00:00 2001 From: Miraculous Ladybugreport <3642643+PeyTy@users.noreply.github.com> Date: Fri, 12 Jul 2024 22:19:14 +0300 Subject: [PATCH] [C2HEXA] Fix type string --- source/toHexa/clang/clangGenerator.hexa | 8 ++++---- source/toHexa/clang/clangTree.hexa | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/toHexa/clang/clangGenerator.hexa b/source/toHexa/clang/clangGenerator.hexa index 6e5c51b..ace7970 100644 --- a/source/toHexa/clang/clangGenerator.hexa +++ b/source/toHexa/clang/clangGenerator.hexa @@ -254,7 +254,7 @@ class ClangGenerator { case VarDecl: { let name = toCamelCase(node.name) // TODO let readonly = node.type!.qualType.endsWith('const') - let readonly = (node.type as! ClangType).qualType.endsWith('const') + let readonly = node.type.qualType.endsWith('const') let varType = typeToType(node.type) var initializer Node? = null @@ -405,12 +405,12 @@ class ClangGenerator { // TODO case BinaryOperator: // TODO better idea - var op = Lexer.tokenize(Buffer.from(node.opcode), "TEST").token[0] as! Token + let op = Lexer.tokenize(Buffer.from(node.opcode), "CLANG").token[0] as! Token // TODO if (s.opcode == '&&') s.opcode = 'and' // TODO if (s.opcode == '||') s.opcode = 'or' return Node.Binop(nodeToNode(node.inner[0]), op, nodeToNode(node.inner[1])) case CompoundAssignOperator: - var op = Lexer.tokenize(Buffer.from(node.opcode), "TEST").token[0] as! Token + var op = Lexer.tokenize(Buffer.from(node.opcode), "CLANG").token[0] as! Token return Node.AssignOp(nodeToNode(node.inner[0]), op, nodeToNode(node.inner[1])) case IntegerLiteral: // TODO type @@ -718,7 +718,7 @@ class ClangGenerator { case Object(names, el): return '{' + [for i in el.length names[i] + ': ' + stringify(el[i])].join(', ') + '}' case NodeTypeValue(t): - return DataHelper.extractTypeName(t) + return NodeType.stringify(t) case Static(f): return 'static ' + stringify(f) case Var(name, t, expr, const, external): { var body = '' diff --git a/source/toHexa/clang/clangTree.hexa b/source/toHexa/clang/clangTree.hexa index bd66795..c93dd1f 100644 --- a/source/toHexa/clang/clangTree.hexa +++ b/source/toHexa/clang/clangTree.hexa @@ -80,7 +80,7 @@ interface ClangType { interface ClangNode { let inner: [ClangNode] let kind: ClangKind? - let type: ClangType? + let type: ClangType let id: String let name: String let targetLabelDeclId: String