Merge pull request #231 from nature-lang/feature/generics_refactor

reacotr: generic constraint refactoring and method generic support

Author: weiwenhao

nls/src/analyzer.rs

@@ -1,6 +1,7 @@
 pub mod common;
 pub mod completion;
 pub mod flow;
+pub mod generics;
 pub mod lexer; // 声明子模块
 pub mod semantic;
 pub mod symbol;
@@ -522,35 +523,28 @@ pub fn register_global_symbol(m: &mut Module, symbol_table: &mut SymbolTable, st
                 if fndef.impl_type.kind.is_unknown() {
                     fndef.symbol_name = format_global_ident(m.ident.clone(), symbol_name.clone());
 
-                    if fndef.generics_params.is_none() {
-                        match symbol_table.define_symbol_in_scope(
-                            fndef.symbol_name.clone(),
-                            SymbolKind::Fn(fndef_mutex.clone()),
-                            fndef.symbol_start,
-                            m.scope_id,
-                        ) {
-                            Ok(symbol_id) => {
-                                fndef.symbol_id = symbol_id;
-                            }
-                            Err(_e) => {
-                                errors_push(
-                                    m,
-                                    AnalyzerError {
-                                        start: fndef.symbol_start,
-                                        end: fndef.symbol_end,
-                                        message: format!("ident '{}' redeclared", fndef.symbol_name),
-                                    },
-                                );
-                            }
+                    match symbol_table.define_symbol_in_scope(
+                        fndef.symbol_name.clone(),
+                        SymbolKind::Fn(fndef_mutex.clone()),
+                        fndef.symbol_start,
+                        m.scope_id,
+                    ) {
+                        Ok(symbol_id) => {
+                            fndef.symbol_id = symbol_id;
+                        }
+                        Err(_e) => {
+                            errors_push(
+                                m,
+                                AnalyzerError {
+                                    start: fndef.symbol_start,
+                                    end: fndef.symbol_end,
+                                    message: format!("ident '{}' redeclared", fndef.symbol_name),
+                                },
+                            );
                         }
-
-                        let _ = symbol_table.define_global_symbol(
-                            fndef.symbol_name.clone(),
-                            SymbolKind::Fn(fndef_mutex.clone()),
-                            fndef.symbol_start,
-                            m.scope_id,
-                        );
                     }
+
+                    let _ = symbol_table.define_global_symbol(fndef.symbol_name.clone(), SymbolKind::Fn(fndef_mutex.clone()), fndef.symbol_start, m.scope_id);
                 } else {
                     // dealy semantic analyze
                 }

nls/src/analyzer/common.rs

@@ -416,8 +416,13 @@ impl Type {
                     | TypeKind::Struct(..)
                     | TypeKind::Arr(..)
                     | TypeKind::Enum(..)
-                    | TypeKind::Union(..)
                     | TypeKind::Tuple(..)
+                    | TypeKind::Vec(..)
+                    | TypeKind::String
+                    | TypeKind::Set(..)
+                    | TypeKind::Map(..)
+                    | TypeKind::Tuple(..)
+                    | TypeKind::Union(..)
                     | TypeKind::TaggedUnion(..)
             )
     }
@@ -840,11 +845,6 @@ pub enum ExprOp {
     Bnot,
     #[strum(to_string = "&")]
     La,
-    #[strum(to_string = "&?")]
-    SafeLa,
-    #[strum(to_string = "&!")]
-    UnsafeLa,
-
     #[strum(to_string = "*")]
     Ia,
 
@@ -918,7 +918,6 @@ pub enum AstNode {
 
     // marco
     MacroSizeof(Type),       // (target_type)
-    MacroUla(Box<Expr>),     // (src)
     MacroReflectHash(Type),  // (target_type)
     MacroTypeEq(Type, Type), // (left_type, right_type)
     MacroAsync(MacroAsyncExpr),
@@ -1155,14 +1154,14 @@ impl Default for ImportStmt {
 #[derive(Debug, Clone)]
 pub struct GenericsParam {
     pub ident: String,
-    pub constraints: (Vec<Type>, bool, bool, bool), // (elements, any, and, or)
+    pub constraints: Vec<Type>, // interface constraints, default AND
 }
 
 impl GenericsParam {
     pub fn new(ident: String) -> Self {
         Self {
             ident,
-            constraints: (Vec::new(), true, false, false),
+            constraints: Vec::new(),
         }
     }
 }
@@ -1253,6 +1252,7 @@ pub struct AstFnDef {
     pub test_name: String,
     pub ret_target_types: Vec<Type>,
     pub linkid: Option<String>,
+    pub pending_where_params: Option<Vec<GenericsParam>>,
     pub fn_name: String, // default empty
     pub rel_path: Option<String>,
 
@@ -1296,6 +1296,7 @@ impl Default for AstFnDef {
             is_local: false,
             is_tpl: false,
             linkid: None,
+            pending_where_params: None,
             is_generics: false,
             is_async: false,
             is_private: false,