[glsl-new] Handle local vars scopes

src/front/glsl_new/ast.rs

@@ -34,7 +34,7 @@ impl Program {
             context: Context {
                 expressions: Arena::<Expression>::new(),
                 local_variables: Arena::<LocalVariable>::new(),
-                lookup_local_variables: FastHashMap::default(),
+                scopes: vec![FastHashMap::default()],
             },
         }
     }
@@ -49,7 +49,48 @@ pub enum Profile {
 pub struct Context {
     pub expressions: Arena<Expression>,
     pub local_variables: Arena<LocalVariable>,
-    pub lookup_local_variables: FastHashMap<String, Handle<LocalVariable>>,
+    //TODO: Find less allocation heavy representation
+    pub scopes: Vec<FastHashMap<String, Handle<LocalVariable>>>,
+}
+
+impl Context {
+    pub fn lookup_local_var(&self, name: &str) -> Option<Handle<LocalVariable>> {
+        for scope in self.scopes.iter().rev() {
+            if let Some(var) = scope.get(name) {
+                return Some(*var);
+            }
+        }
+        None
+    }
+
+    pub fn lookup_local_var_current_scope(&self, name: &str) -> Option<Handle<LocalVariable>> {
+        if let Some(current) = self.scopes.last() {
+            current.get(name).cloned()
+        } else {
+            None
+        }
+    }
+
+    pub fn clear_scopes(&mut self) {
+        self.scopes.clear();
+        self.scopes.push(FastHashMap::default());
+    }
+
+    /// Add variable to current scope
+    pub fn add_local_var(&mut self, name: String, handle: Handle<LocalVariable>) {
+        if let Some(current) = self.scopes.last_mut() {
+            (*current).insert(name, handle);
+        }
+    }
+
+    /// Add new empty scope
+    pub fn push_scope(&mut self) {
+        self.scopes.push(FastHashMap::default());
+    }
+
+    pub fn remove_current_scope(&mut self) {
+        self.scopes.pop();
+    }
 }
 
 #[derive(Debug)]

src/front/glsl_new/error.rs

@@ -14,6 +14,7 @@ pub enum ErrorKind {
     ParserStackOverflow,
     NotImplemented(&'static str),
     UnknownVariable(TokenMetadata, String),
+    VariableAlreadyDeclared(String),
     ExpectedConstant,
     SemanticError(&'static str),
 }
@@ -37,6 +38,9 @@ impl fmt::Display for ErrorKind {
             ErrorKind::UnknownVariable(meta, val) => {
                 write!(f, "Unknown variable {} at {:?}", val, meta)
             }
+            ErrorKind::VariableAlreadyDeclared(val) => {
+                write!(f, "Variable {} already decalred in current scope", val)
+            }
             ErrorKind::ExpectedConstant => write!(f, "Expected constant"),
             ErrorKind::SemanticError(msg) => write!(f, "Semantic error: {}", msg),
         }

src/front/glsl_new/parser.rs

@@ -156,18 +156,17 @@ pomelo! {
             }
         } else {
             // try global and local vars
-            if let Some(global_var) = extra.lookup_global_variables.get(&v.1) {
-                ExpressionRule{
-                    expression: extra.context.expressions.append(Expression::GlobalVariable(*global_var)),
-                    statements: vec![],
-                }
-            } else if let Some(local_var) = extra.context.lookup_local_variables.get(&v.1) {
-                ExpressionRule{
-                    expression: extra.context.expressions.append(Expression::LocalVariable(*local_var)),
-                    statements: vec![],
-                }
-            } else {
-                return Err(ErrorKind::UnknownVariable(v.0, v.1))
+            let expr =
+                if let Some(local_var) = extra.context.lookup_local_var(&v.1) {
+                    Expression::LocalVariable(local_var)
+                } else if let Some(global_var) = extra.lookup_global_variables.get(&v.1) {
+                    Expression::GlobalVariable(*global_var)
+                } else {
+                    return Err(ErrorKind::UnknownVariable(v.0, v.1))
+                };
+            ExpressionRule{
+                expression: extra.context.expressions.append(expr),
+                statements: vec![],
             }
         }
     }
@@ -545,6 +544,10 @@ pomelo! {
         let mut statements = Vec::<Statement>::new();
         // local variables
         for (id, initializer) in d.ids_initializers {
+            // check if already declared in current scope
+            if extra.context.lookup_local_var_current_scope(&id).is_some() {
+                return Err(ErrorKind::VariableAlreadyDeclared(id))
+            }
             let h = extra.context.local_variables.append(
                 LocalVariable {
                     name: Some(id.clone()),
@@ -555,7 +558,7 @@ pomelo! {
                     }),
                 }
             );
-            extra.context.lookup_local_variables.insert(id, h);
+            extra.context.add_local_var(id, h);
         }
         match statements.len() {
             1 => statements.remove(0),
@@ -577,7 +580,16 @@ pomelo! {
     //simple_statement ::= jump_statement;
 
     compound_statement ::= LeftBrace RightBrace {vec![]}
-    compound_statement ::= LeftBrace statement_list(sl) RightBrace {sl}
+    compound_statement ::= left_brace_scope statement_list(sl) RightBrace {
+        extra.context.remove_current_scope();
+        sl
+    }
+
+    // extra rule to add scope before statement_list
+    left_brace_scope ::= LeftBrace {
+        extra.context.push_scope();
+    }
+
 
     compound_statement_no_new_scope ::= LeftBrace RightBrace  {vec![]}
     compound_statement_no_new_scope ::= LeftBrace statement_list(sl) RightBrace {sl}
@@ -700,6 +712,7 @@ pomelo! {
     function_definition ::= function_prototype(mut f) compound_statement_no_new_scope(cs) {
         std::mem::swap(&mut f.expressions, &mut extra.context.expressions);
         std::mem::swap(&mut f.local_variables, &mut extra.context.local_variables);
+        extra.context.clear_scopes();
         f.body = cs;
         f
     };