Rename to Unnamed and Named

coolreader18 · coolreader18 · commit e35cc813a896 · 2019-03-20T08:59:37.000-05:00
diff --git a/parser/src/ast.rs b/parser/src/ast.rs
@@ -395,8 +395,8 @@ pub enum StringGroup {
 #[derive(Debug, PartialEq)]
 pub enum Varargs {
     None,
-    NoCapture,
-    Capture(Parameter),
+    Unnamed,
+    Named(Parameter),
 }
 
 impl Default for Varargs {
@@ -409,8 +409,8 @@ 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::Capture(param),
-                None => Varargs::NoCapture,
+                Some(param) => Varargs::Named(param),
+                None => Varargs::Unnamed,
             },
             None => Varargs::None,
         }
diff --git a/vm/src/bytecode.rs b/vm/src/bytecode.rs
@@ -240,8 +240,8 @@ pub enum UnaryOperator {
 #[derive(Debug, Clone, PartialEq)]
 pub enum Varargs {
     None,
-    NoCapture,
-    Capture(String),
+    Unnamed,
+    Named(String),
 }
 
 /*
@@ -413,8 +413,8 @@ impl From<ast::Varargs> for Varargs {
     fn from(varargs: ast::Varargs) -> Varargs {
         match varargs {
             ast::Varargs::None => Varargs::None,
-            ast::Varargs::NoCapture => Varargs::NoCapture,
-            ast::Varargs::Capture(param) => Varargs::Capture(param.arg),
+            ast::Varargs::Unnamed => Varargs::Unnamed,
+            ast::Varargs::Named(param) => Varargs::Named(param.arg),
         }
     }
 }
@@ -423,8 +423,8 @@ impl<'a> From<&'a ast::Varargs> for Varargs {
     fn from(varargs: &'a ast::Varargs) -> Varargs {
         match varargs {
             ast::Varargs::None => Varargs::None,
-            ast::Varargs::NoCapture => Varargs::NoCapture,
-            ast::Varargs::Capture(ref param) => Varargs::Capture(param.arg.clone()),
+            ast::Varargs::Unnamed => Varargs::Unnamed,
+            ast::Varargs::Named(ref param) => Varargs::Named(param.arg.clone()),
         }
     }
 }
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -402,7 +402,7 @@ impl VirtualMachine {
 
         // Pack other positional arguments in to *args:
         match code_object.varargs {
-            bytecode::Varargs::Capture(ref vararg_name) => {
+            bytecode::Varargs::Named(ref vararg_name) => {
                 let mut last_args = vec![];
                 for i in n..nargs {
                     let arg = &args.args[i];
@@ -412,7 +412,7 @@ impl VirtualMachine {
 
                 locals.set_item(&self.ctx, vararg_name, vararg_value);
             }
-            bytecode::Varargs::NoCapture => {
+            bytecode::Varargs::Unnamed => {
                 // just ignore the rest of the args
             }
             bytecode::Varargs::None => {
@@ -428,12 +428,12 @@ impl VirtualMachine {
 
         // Do we support `**kwargs` ?
         let kwargs = match code_object.varkeywords {
-            bytecode::Varargs::Capture(ref kwargs_name) => {
+            bytecode::Varargs::Named(ref kwargs_name) => {
                 let d = self.new_dict();
                 locals.set_item(&self.ctx, kwargs_name, d.clone());
                 Some(d)
             }
-            bytecode::Varargs::NoCapture => Some(self.new_dict()),
+            bytecode::Varargs::Unnamed => Some(self.new_dict()),
             bytecode::Varargs::None => None,
         };
 

Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,8 @@ pub enum UnaryOperator {`
`240`	`240`	`#[derive(Debug, Clone, PartialEq)]`
`241`	`241`	`pub enum Varargs {`
`242`	`242`	`None,`
`243`		`- NoCapture,`
`244`		`- Capture(String),`
	`243`	`+ Unnamed,`
	`244`	`+ Named(String),`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`/*`
`@@ -413,8 +413,8 @@ impl From<ast::Varargs> for Varargs {`
`413`	`413`	`fn from(varargs: ast::Varargs) -> Varargs {`
`414`	`414`	`match varargs {`
`415`	`415`	`ast::Varargs::None => Varargs::None,`
`416`		`- ast::Varargs::NoCapture => Varargs::NoCapture,`
`417`		`- ast::Varargs::Capture(param) => Varargs::Capture(param.arg),`
	`416`	`+ ast::Varargs::Unnamed => Varargs::Unnamed,`
	`417`	`+ ast::Varargs::Named(param) => Varargs::Named(param.arg),`
`418`	`418`	`}`
`419`	`419`	`}`
`420`	`420`	`}`
`@@ -423,8 +423,8 @@ impl<'a> From<&'a ast::Varargs> for Varargs {`
`423`	`423`	`fn from(varargs: &'a ast::Varargs) -> Varargs {`
`424`	`424`	`match varargs {`
`425`	`425`	`ast::Varargs::None => Varargs::None,`
`426`		`- ast::Varargs::NoCapture => Varargs::NoCapture,`
`427`		`- ast::Varargs::Capture(ref param) => Varargs::Capture(param.arg.clone()),`
	`426`	`+ ast::Varargs::Unnamed => Varargs::Unnamed,`
	`427`	`+ ast::Varargs::Named(ref param) => Varargs::Named(param.arg.clone()),`
`428`	`428`	`}`
`429`	`429`	`}`
`430`	`430`	`}`