Extend symtable module.

windelbouwman · windelbouwman · commit f919ed013764 · 2019-07-19T22:05:35.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -8,6 +8,7 @@ license = "MIT"
 edition = "2018"
 
 [dependencies]
+indexmap = "1.0"
 rustpython-bytecode = { path = "../bytecode", version = "0.1.0" }
 rustpython-parser = { path = "../parser", version = "0.1.0" }
 num-complex = { version = "0.2", features = ["serde"] }
diff --git a/compiler/src/symboltable.rs b/compiler/src/symboltable.rs
@@ -8,9 +8,9 @@ Inspirational file: https://github.com/python/cpython/blob/master/Python/symtabl
 */
 
 use crate::error::{CompileError, CompileErrorType};
+use indexmap::map::IndexMap;
 use rustpython_parser::ast;
 use rustpython_parser::location::Location;
-use std::collections::HashMap;
 
 pub fn make_symbol_table(program: &ast::Program) -> Result<SymbolScope, SymbolTableError> {
     let mut builder: SymbolTableBuilder = Default::default();
@@ -48,7 +48,7 @@ pub enum SymbolRole {
 #[derive(Clone)]
 pub struct SymbolScope {
     /// A set of symbols present on this scope level.
-    pub symbols: HashMap<String, SymbolRole>,
+    pub symbols: IndexMap<String, SymbolRole>,
 
     /// A list of subscopes in the order as found in the
     /// AST nodes.
@@ -81,8 +81,8 @@ impl SymbolScope {
 impl Default for SymbolScope {
     fn default() -> Self {
         SymbolScope {
-            symbols: HashMap::new(),
-            sub_scopes: vec![],
+            symbols: Default::default(),
+            sub_scopes: Default::default(),
         }
     }
 }
diff --git a/crawl_sourcecode.py b/crawl_sourcecode.py
@@ -1,3 +1,13 @@
+""" This script can be used to test the equivalence in parsing between
+rustpython and cpython.
+
+Usage example:
+
+$ python crawl_sourcecode.py crawl_sourcecode.py > cpython.txt
+$ cargo run crawl_sourcecode.py crawl_sourcecode.py > rustpython.txt
+$ diff cpython.txt rustpython.txt
+"""
+
 
 import ast
 import sys
@@ -36,7 +46,7 @@ def print_table(table, indent=0):
     print(' '*indent, 'table:', table.get_name())
     print(' '*indent, ' ', 'Syms:')
     for sym in table.get_symbols():
-        print(' '*indent, '  ', sym)
+        print(' '*indent, '  ', sym.get_name(), 'is_referenced=', sym.is_referenced(), 'is_assigned=', sym.is_assigned())
     print(' '*indent, ' ', 'Child tables:')
     for child in table.get_children():
         print_table(child, indent=indent+shift)
diff --git a/vm/src/eval.rs b/vm/src/eval.rs
@@ -14,14 +14,13 @@ pub fn eval(vm: &VirtualMachine, source: &str, scope: Scope, source_path: &str)
 }
 
 pub fn get_compile_mode(vm: &VirtualMachine, mode: &str) -> PyResult<compile::Mode> {
-    if mode == "exec" {
-        Ok(compile::Mode::Exec)
-    } else if mode == "eval" {
-        Ok(compile::Mode::Eval)
-    } else if mode == "single" {
-        Ok(compile::Mode::Single)
-    } else {
-        Err(vm.new_value_error("compile() mode must be 'exec', 'eval' or single'".to_string()))
+    match mode {
+        "exec" => Ok(compile::Mode::Exec),
+        "eval" => Ok(compile::Mode::Eval),
+        "single" => Ok(compile::Mode::Single),
+        _ => {
+            Err(vm.new_value_error("compile() mode must be 'exec', 'eval' or 'single'".to_string()))
+        }
     }
 }
 
diff --git a/vm/src/stdlib/symtable.rs b/vm/src/stdlib/symtable.rs
@@ -107,7 +107,14 @@ impl PySymbolTable {
             .symtable
             .symbols
             .iter()
-            .map(|s| vm.ctx.new_str(s.0.clone()))
+            .map(|s| {
+                (PySymbol {
+                    name: s.0.clone(),
+                    role: s.1.clone(),
+                })
+                .into_ref(vm)
+                .into_object()
+            })
             .collect();
         Ok(vm.ctx.new_list(symbols))
     }
