Merge pull request RustPython#718 from RustPython/master

Update the demo page, since we have a new shiny console added!

Author: coolreader18

.gitignore

@@ -1,4 +1,5 @@
 /target
+/*/target
 **/*.rs.bk
 **/*.bytecode
 __pycache__

.travis.yml

@@ -115,6 +115,26 @@ matrix:
         - TRAVIS_RUST_VERSION=nightly
         - REGULAR_TEST=false
         - CODE_COVERAGE=true
+    - name: test WASM
+      language: python
+      python: 3.6
+      cache:
+        pip: true
+        # Because we're using the Python Travis environment, we can't use
+        # the built-in cargo cacher
+        directories:
+          - /home/travis/.cargo
+          - target
+      addons:
+        firefox: latest
+      install:
+        - nvm install node
+        - pip install pipenv
+      script:
+        - wasm/tests/.travis-runner.sh
+      env:
+        - REGULAR_TEST=true
+        - TRAVIS_RUST_VERSION=stable
   allow_failures:
     - rust: nightly
       env: REGULAR_TEST=true

Cargo.lock

@@ -5,7 +5,7 @@ authors = ["Windel Bouwman", "Shing Lyu <[email protected]>"]
 edition = "2018"
 
 [workspace]
-members = [".", "vm", "wasm/lib", "parser"]
+members = [".", "derive", "vm", "wasm/lib", "parser"]
 
 [dependencies]
 log="0.4.1"
@@ -15,6 +15,3 @@ rustpython_parser = {path = "parser"}
 rustpython_vm = {path = "vm"}
 rustyline = "2.1.0"
 xdg = "2.2.0"
-
-[profile.release]
-opt-level = "s"

Cargo.toml

@@ -97,7 +97,7 @@ $ pipenv install
 $ pipenv run pytest -v
 ```
 
-There also are some unit tests, you can run those will cargo:
+There also are some unit tests, you can run those with cargo:
 
 ```shell
 $ cargo test --all
@@ -201,6 +201,10 @@ The code style used is the default rustfmt codestyle. Please format your code ac
 
 Chat with us on [gitter][gitter].
 
+# Code of conduct
+
+Our code of conduct [can be found here](code-of-conduct.md).
+
 # Credit
 
 The initial work was based on [windelbouwman/rspython](https://github.com/windelbouwman/rspython) and [shinglyu/RustPython](https://github.com/shinglyu/RustPython)

README.md

@@ -0,0 +1,77 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
+

code-of-conduct.md

@@ -0,0 +1,13 @@
+[package]
+name = "rustpython_derive"
+version = "0.1.0"
+authors = ["Joey <[email protected]>"]
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "0.15.29"
+quote = "0.6.11"
+proc-macro2 = "0.4.27"

derive/Cargo.toml

@@ -0,0 +1,48 @@
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+use syn::{Data, DeriveInput, Fields};
+
+#[proc_macro_derive(FromArgs)]
+pub fn derive_from_args(input: TokenStream) -> TokenStream {
+    let ast: DeriveInput = syn::parse(input).unwrap();
+
+    let gen = impl_from_args(&ast);
+    gen.to_string().parse().unwrap()
+}
+
+fn impl_from_args(input: &DeriveInput) -> TokenStream2 {
+    // FIXME: This references types using `crate` instead of `rustpython_vm`
+    //        so that it can be used in the latter. How can we support both?
+    let fields = match input.data {
+        Data::Struct(ref data) => {
+            match data.fields {
+                Fields::Named(ref fields) => fields.named.iter().map(|field| {
+                    let name = &field.ident;
+                    quote! {
+                        #name: crate::pyobject::TryFromObject::try_from_object(
+                            vm,
+                            args.take_keyword(stringify!(#name)).unwrap_or_else(|| vm.ctx.none())
+                        )?,
+                    }
+                }),
+                Fields::Unnamed(_) | Fields::Unit => unimplemented!(), // TODO: better error message
+            }
+        }
+        Data::Enum(_) | Data::Union(_) => unimplemented!(), // TODO: better error message
+    };
+
+    let name = &input.ident;
+    quote! {
+        impl crate::function::FromArgs for #name {
+            fn from_args(
+                vm: &crate::vm::VirtualMachine,
+                args: &mut crate::function::PyFuncArgs
+            ) -> Result<Self, crate::function::ArgumentError> {
+                Ok(#name { #(#fields)* })
+            }
+        }
+    }
+}

derive/src/lib.rs

@@ -122,6 +122,7 @@ pub enum Statement {
         // docstring: String,
         body: Vec<LocatedStatement>,
         decorator_list: Vec<Expression>,
+        returns: Option<Expression>,
     },
 }
 
@@ -217,6 +218,7 @@ pub enum Expression {
     True,
     False,
     None,
+    Ellipsis,
 }
 
 impl Expression {
@@ -259,6 +261,7 @@ impl Expression {
             Lambda { .. } => "lambda",
             IfExpression { .. } => "conditional expression",
             True | False | None => "keyword",
+            Ellipsis => "ellipsis",
         }
     }
 }
@@ -269,14 +272,20 @@ impl Expression {
  */
 #[derive(Debug, PartialEq, Default)]
 pub struct Parameters {
-    pub args: Vec<String>,
-    pub kwonlyargs: Vec<String>,
-    pub vararg: Option<Option<String>>, // Optionally we handle optionally named '*args' or '*'
-    pub kwarg: Option<Option<String>>,
+    pub args: Vec<Parameter>,
+    pub kwonlyargs: Vec<Parameter>,
+    pub vararg: Varargs, // Optionally we handle optionally named '*args' or '*'
+    pub kwarg: Varargs,
     pub defaults: Vec<Expression>,
     pub kw_defaults: Vec<Option<Expression>>,
 }
 
+#[derive(Debug, PartialEq, Default)]
+pub struct Parameter {
+    pub arg: String,
+    pub annotation: Option<Box<Expression>>,
+}
+
 #[derive(Debug, PartialEq)]
 pub enum ComprehensionKind {
     GeneratorExpression { element: Expression },
@@ -357,16 +366,53 @@ pub enum Number {
     Complex { real: f64, imag: f64 },
 }
 
+/// Transforms a value prior to formatting it.
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum ConversionFlag {
+    /// Converts by calling `str(<value>)`.
+    Str,
+    /// Converts by calling `ascii(<value>)`.
+    Ascii,
+    /// Converts by calling `repr(<value>)`.
+    Repr,
+}
+
 #[derive(Debug, PartialEq)]
 pub enum StringGroup {
     Constant {
         value: String,
     },
     FormattedValue {
         value: Box<Expression>,
+        conversion: Option<ConversionFlag>,
         spec: String,
     },
     Joined {
         values: Vec<StringGroup>,
     },
 }
+
+#[derive(Debug, PartialEq)]
+pub enum Varargs {
+    None,
+    Unnamed,
+    Named(Parameter),
+}
+
+impl Default for Varargs {
+    fn default() -> Varargs {
+        Varargs::None
+    }
+}
+
+impl From<Option<Option<Parameter>>> for Varargs {
+    fn from(opt: Option<Option<Parameter>>) -> Varargs {
+        match opt {
+            Some(inner_opt) => match inner_opt {
+                Some(param) => Varargs::Named(param),
+                None => Varargs::Unnamed,
+            },
+            None => Varargs::None,
+        }
+    }
+}