cariboujs 2.0.5 → 2.0.7

package/c/CParser.js

@@ -600,7 +600,7 @@ export default class CParser extends CParserBase {
                              "Const", "Constexpr", "Continue", "Default", 
                              "Deprecated", "Do", "Double", "Else", "Enum", 
                              "Extern", "False_", "Float", "For", "Goto", 
-                             "If", "Inline", "Int", "Label", "Long", "Nulptr", 
+                             "If", "Inline", "Int", "Label", "Long", "Nullptr_", 
                              "Register", "Restrict", "Return", "Short", 
                              "Signed", "Sizeof", "Static", "Static_assert", 
                              "Struct", "Switch", "True_", "Typedef", "Typeof", 
@@ -7034,7 +7034,7 @@ CParser.Inline = 52;
 CParser.Int = 53;
 CParser.Label = 54;
 CParser.Long = 55;
-CParser.Nulptr = 56;
+CParser.Nullptr_ = 56;
 CParser.Register = 57;
 CParser.Restrict = 58;
 CParser.Return = 59;
@@ -7411,8 +7411,8 @@ class PredefinedConstantContext extends antlr4.ParserRuleContext {
 	    return this.getToken(CParser.True_, 0);
 	};
 
-	Nulptr() {
-	    return this.getToken(CParser.Nulptr, 0);
+	Nullptr_() {
+	    return this.getToken(CParser.Nullptr_, 0);
 	};
 
 	enterRule(listener) {

package/c/CParserBase.js

@@ -130,6 +130,20 @@ export default class CParserBase extends antlr4.Parser {
         const lt1 = this._input.LT(1);
         const text = lt1.text;
         if (this._debug) console.log("IsDeclarationSpecifier " + lt1);
+        if (lt1.type === CLexer.Identifier && this._ctx instanceof CParser.DeclarationSpecifiersContext) {
+            const dsCtx = this._ctx;
+            const resolvedId = this._resolveWithOutput(lt1);
+            if (resolvedId !== null && !resolvedId.predefined
+                    && !resolvedId.classification.has(TypeClassification.Variable_)
+                    && !resolvedId.classification.has(TypeClassification.Function_)) {
+                const specList = dsCtx.declarationSpecifier() ?? null;
+                if (specList) {
+                    for (const spec of specList) {
+                        if (spec.typeSpecifier() != null) return false;
+                    }
+                }
+            }
+        }
         const result = this.IsStorageClassSpecifier()
             || this.IsTypeSpecifier()
             || this.IsTypeQualifier()
@@ -531,7 +545,19 @@ export default class CParserBase extends antlr4.Parser {
         if (resolved === null) {
             result = true;
         } else if (resolved.classification.has(TypeClassification.TypeQualifier_) || resolved.classification.has(TypeClassification.TypeSpecifier_)) {
-            result = false;
+            if (lt1.type === CLexer.Identifier && resolved.classification.has(TypeClassification.TypeSpecifier_)) {
+                if (this._ctx instanceof CParser.DeclarationContext) {
+                    const declCtx = this._ctx;
+                    const dsCtx = declCtx.declarationSpecifiers();
+                    const specList = dsCtx?.declarationSpecifier() ?? null;
+                    if (specList) {
+                        for (const spec of specList) {
+                            if (spec.typeSpecifier() != null) { result = true; break; }
+                        }
+                    }
+                }
+            }
+            if (!result) result = false;
         } else {
             result = true;
         }

package/c/SymbolTable.js

@@ -35,7 +35,8 @@ export class SymbolTable {
         this.define(this._createSymbol("long", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("float", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("double", TypeClassification.TypeSpecifier_));
-        this.define(this._createSymbol("signed", TypeClassification.TypeSpecifier_));
+	this.define(this._createSymbol("signed", TypeClassification.TypeSpecifier_));
+	this.define(this._createSymbol("__signed__", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("unsigned", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("_BitInt", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("bool", TypeClassification.TypeSpecifier_));
@@ -100,6 +101,10 @@ export class SymbolTable {
         this.define(this._createSymbol("_Float32", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("_Float64", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("_Float128", TypeClassification.TypeSpecifier_));
+        this.define(this._createSymbol("_Float16x", TypeClassification.TypeSpecifier_));
+        this.define(this._createSymbol("_Float32x", TypeClassification.TypeSpecifier_));
+        this.define(this._createSymbol("_Float64x", TypeClassification.TypeSpecifier_));
+        this.define(this._createSymbol("_Float128x", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("__v8hf", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("__bf16", TypeClassification.TypeSpecifier_));
         this.define(this._createSymbol("__v16bf", TypeClassification.TypeSpecifier_));