From 0111a8356dbe7179b9922aa8e76e0feb55356e56 Mon Sep 17 00:00:00 2001 From: Windel Bouwman Date: Tue, 3 Jul 2018 19:55:15 +0200 Subject: [PATCH] Move bytecode definitions to top level crate --- README.md | 2 ++ parser/src/compiler/mod.rs | 8 ++++---- {parser/src/compiler => py_code_object/src}/bytecode.rs | 0 py_code_object/src/lib.rs | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) rename {parser/src/compiler => py_code_object/src}/bytecode.rs (100%) diff --git a/README.md b/README.md index 3671784af..4e2460b5b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # RustPython A Python Interpreter written in Rust :snake: :scream: :metal:. +[![Build Status](https://travis-ci.org/RustPython/RustPython.svg?branch=master)](https://travis-ci.org/RustPython/RustPython) + # Usage (Not implemented yet) To test RustPython, do the following: diff --git a/parser/src/compiler/mod.rs b/parser/src/compiler/mod.rs index 3e6b69e24..44e2e78eb 100644 --- a/parser/src/compiler/mod.rs +++ b/parser/src/compiler/mod.rs @@ -5,14 +5,14 @@ mod python; pub mod ast; mod token; mod lexer; -mod compile; -mod bytecode; +// mod compile; +// mod bytecode; mod builtins; mod pyobject; -mod vm; +// mod vm; pub use self::parser::parse; -pub use self::vm::evaluate; +// pub use self::vm::evaluate; // Mimic eval code objects: diff --git a/parser/src/compiler/bytecode.rs b/py_code_object/src/bytecode.rs similarity index 100% rename from parser/src/compiler/bytecode.rs rename to py_code_object/src/bytecode.rs diff --git a/py_code_object/src/lib.rs b/py_code_object/src/lib.rs index 006ec4234..d15b9355a 100644 --- a/py_code_object/src/lib.rs +++ b/py_code_object/src/lib.rs @@ -29,6 +29,7 @@ pub enum NativeType{ pub struct PyCodeObject { pub co_consts: Vec, pub co_names: Vec, + // TODO: use vector of bytecode objects instead of strings? pub co_code: Vec<(usize, String, Option)>, //size, name, args pub co_varnames: Vec, }