update - improve extern

Author: BaseMax

src/phase/generator/generation/generator.ts

@@ -67,10 +67,6 @@ export class Generator {
         this.setTemp("");
         return temp;
     }
-
-    pushExtendedFunction(name: string, type: AstType): void {
-        this.extendedFunctions[name] = type;
-    }
 
     pushFunction(func: string): void {
         this.functions.push(func);

src/phase/parser/parse/extern.ts

@@ -11,12 +11,11 @@ import { TokenKeywordType, TokenOperatorType } from '../../lexer/tokenizer/type'
 
 export function parserParseExtern(parser: Parser, parent_block: AstBlock): AstExtern | undefined {
     parser.expect(TokenKeywordType.TOKEN_EXTERN);
-    console.log("===> extern");
     let is_function: boolean = false;
     if (parser.skip(TokenKeywordType.TOKEN_FN)) {
         is_function = true;
     }
-    console.log(parser.currentToken.isKeyword, parser.currentToken.isDefinedIdentifier);
+
     // if (parser.currentToken.isKeyword) {
     //     parser.pushError(parserMessageRenderer(parser.getLanguageId(), ParserMessageKeys.PARSER_FUNCTION_NAME_IS_NOT_VALID_IDENTIFIER));
     //     return undefined;
@@ -28,8 +27,6 @@ export function parserParseExtern(parser: Parser, parent_block: AstBlock): AstEx
     //     return undefined;
     // }
 
-    console.log("is function:", is_function);
-
     let return_type: AstType | undefined = undefined;
     if (is_function === false) {
         return_type = parseType(parser);
@@ -39,15 +36,15 @@ export function parserParseExtern(parser: Parser, parent_block: AstBlock): AstEx
         }
     }
 
+    // Eating function name
     const name: string | undefined = parser.currentToken.data?.getValueString();
-    console.log("extern name:", name);
     if (name === undefined) {
         parser.pushError(parserMessageRenderer(parser.getLanguageId(), ParserMessageKeys.PARSER_FUNCTION_NAME_IS_NOT_VALID));
         return undefined;
     }
-    // Eating function name
     parser.next();
 
+    // Parameters for function externs
     let params: AstFunctionArgument[] | undefined = undefined;
     if (is_function === true) {
         params = parserParseFunctionArguments(parser);
@@ -75,6 +72,11 @@ export function parserParseExtern(parser: Parser, parent_block: AstBlock): AstEx
     }
     parser.expect(TokenKeywordType.TOKEN_IDENTIFIER);
 
+    if (return_type === undefined) {
+        parser.pushError("Invalid data type as return type of extern");
+        return undefined;
+    }
+
     const ast: AstExtern = new AstExtern(name, params, return_type, generate_name);
     return ast;
 };

src/phase/validator/validation/extern.ts

@@ -27,13 +27,10 @@ export function validateExtern(validator: Validator, parent_block: AstBlock, ext
     let generated_name: string = extern.generate_name;
 
     if (extern.args === undefined) {
+        console.log("extern var " + extern.name);
         parent_block.symbol_table.addSymbol(extern.name, extern.return_type);
     } else {
         const extern_type: AstType = AstType.createFunction(extern.name, generated_name, extern.args, extern.return_type);
         parent_block.symbol_table.addSymbol(extern.name, extern_type);
     }
-
-    // console.log("Extern:", extern.generate_name)
-    // console.log(extern_type.stringify())
-    // console.log(extern.args);
 };

src/phase/validator/validation/function/function_call.ts

@@ -36,8 +36,8 @@ export function validateExpressionFunctionCall(validator: Validator, block: AstB
 
     // if (node.generated_value !== undefined && node.left.value_type !== undefined && node.left.value_type.is_system) {
     if (node.generated_value !== undefined && node.left.value_type !== undefined) {
-        // console.log("is function", node.generated_value, node);
-        validator.pushExtendedFunction(node.generated_value, node.left.value_type);
+        // TODO: EXTERN
+        // validator.pushExtendedFunction(node.generated_value, node.left.value_type);
 
         const func_args: AstFunctionArgument[] = node.left.value_type.func_args;
         const user_func_args: AstFunctionParameter[] = node.parameters;

src/test.c

@@ -7,15 +7,13 @@
 #include <time.h>
 #include <ctype.h>
 
-// Extended functions
-extern char* int2str(int c);
-
 // Sign functions
 char* test();
 char* main();
 
 // Functions
 char* test() {
+printf("%d", age);
 return ("");
 }
 

src/test.json

@@ -6,6 +6,38 @@
       "args": [],
       "body": {
         "children": [
+          {
+            "type": "Print",
+            "value": {
+              "type": "ExpressionVariable",
+              "value_type": {
+                "type": "Type",
+                "is_system": false,
+                "is_primitive": false,
+                "type_kind": "int",
+                "is_pointer": false,
+                "is_reference": false,
+                "is_array": false,
+                "members": [],
+                "func_args": []
+              },
+              "left": {
+                "type": "ExpressionLiteral",
+                "value_type": {
+                  "type": "Type",
+                  "is_system": false,
+                  "is_primitive": false,
+                  "type_kind": "identifier",
+                  "is_pointer": false,
+                  "is_reference": false,
+                  "is_array": false,
+                  "members": [],
+                  "func_args": []
+                },
+                "value": "age"
+              }
+            }
+          },
           {
             "type": "Return",
             "value": {

src/test.salam

@@ -6,6 +6,7 @@ extern int age : age
 // end
 
 fn test -> string:
+    print age
     // string g = 33
     // string a = "Hey "
     // print int2str(412)