zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-22 18:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

MAINT: Unused variable code cleanup

Browse Source
This commit is contained in:
Jeremy Wall 2019-08-20 12:57:02 -05:00
parent 45819f5406
commit e4c652b240
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/build/opcode/runtime.rs
View File

@ -411,7 +411,7 @@ impl Builtins {
// push function argument on the stack. // push function argument on the stack.
stack.push((e.clone(), list_pos.clone())); stack.push((e.clone(), list_pos.clone()));
// call function and push it's result on the stack. // call function and push it's result on the stack.
let (result, _) = VM::fcall_impl(f, stack, env.clone(), &pos)?; let (result, _) = VM::fcall_impl(f, stack, env.clone())?;
result_elems.push(result); result_elems.push(result);
} }
stack.push((Rc::new(C(List(result_elems))), list_pos)); stack.push((Rc::new(C(List(result_elems))), list_pos));
@ -421,7 +421,7 @@ impl Builtins {
for (ref name, ref val) in _flds { for (ref name, ref val) in _flds {
stack.push((val.clone(), list_pos.clone())); stack.push((val.clone(), list_pos.clone()));
stack.push((Rc::new(P(Str(name.clone()))), list_pos.clone())); stack.push((Rc::new(P(Str(name.clone()))), list_pos.clone()));
let (result, result_pos) = VM::fcall_impl(f, stack, env.clone(), &fptr_pos)?; let (result, result_pos) = VM::fcall_impl(f, stack, env.clone())?;
if let &C(List(ref fval)) = result.as_ref() { if let &C(List(ref fval)) = result.as_ref() {
// we expect them to be a list of exactly 2 items. // we expect them to be a list of exactly 2 items.
if fval.len() != 2 { if fval.len() != 2 {
@ -449,7 +449,7 @@ impl Builtins {
for c in s.chars() { for c in s.chars() {
stack.push((Rc::new(P(Str(c.to_string()))), list_pos.clone())); stack.push((Rc::new(P(Str(c.to_string()))), list_pos.clone()));
// call function and push it's result on the stack. // call function and push it's result on the stack.
let (result, result_pos) = VM::fcall_impl(f, stack, env.clone(), &fptr_pos)?; let (result, result_pos) = VM::fcall_impl(f, stack, env.clone())?;
if let &P(Str(ref s)) = result.as_ref() { if let &P(Str(ref s)) = result.as_ref() {
buf.push_str(s); buf.push_str(s);
} else { } else {
@ -507,7 +507,7 @@ impl Builtins {
// push function argument on the stack. // push function argument on the stack.
stack.push((e.clone(), list_pos.clone())); stack.push((e.clone(), list_pos.clone()));
// call function and push it's result on the stack. // call function and push it's result on the stack.
let (condition, _) = VM::fcall_impl(f, stack, env.clone(), &fptr_pos)?; let (condition, _) = VM::fcall_impl(f, stack, env.clone())?;
// Check for empty or boolean results and only push e back in // Check for empty or boolean results and only push e back in
// if they are non empty and true // if they are non empty and true
match condition.as_ref() { match condition.as_ref() {
@ -524,7 +524,7 @@ impl Builtins {
for (ref name, ref val) in _flds { for (ref name, ref val) in _flds {
stack.push((val.clone(), list_pos.clone())); stack.push((val.clone(), list_pos.clone()));
stack.push((Rc::new(P(Str(name.clone()))), list_pos.clone())); stack.push((Rc::new(P(Str(name.clone()))), list_pos.clone()));
let (condition, _) = VM::fcall_impl(f, stack, env.clone(), &pos)?; let (condition, _) = VM::fcall_impl(f, stack, env.clone())?;
// Check for empty or boolean results and only push e back in // Check for empty or boolean results and only push e back in
// if they are non empty and true // if they are non empty and true
match condition.as_ref() { match condition.as_ref() {
@ -541,7 +541,7 @@ impl Builtins {
for c in s.chars() { for c in s.chars() {
stack.push((Rc::new(P(Str(c.to_string()))), list_pos.clone())); stack.push((Rc::new(P(Str(c.to_string()))), list_pos.clone()));
// call function and push it's result on the stack. // call function and push it's result on the stack.
let (condition, _) = VM::fcall_impl(f, stack, env.clone(), &pos)?; let (condition, _) = VM::fcall_impl(f, stack, env.clone())?;
// Check for empty or boolean results and only push c back in // Check for empty or boolean results and only push c back in
// if they are non empty and true // if they are non empty and true
match condition.as_ref() { match condition.as_ref() {
@ -640,7 +640,7 @@ impl Builtins {
stack.push((dbg!(e.clone()), list_pos.clone())); stack.push((dbg!(e.clone()), list_pos.clone()));
stack.push((dbg!(acc.clone()), acc_pos.clone())); stack.push((dbg!(acc.clone()), acc_pos.clone()));
// call function and push it's result on the stack. // call function and push it's result on the stack.
let (new_acc, new_acc_pos) = VM::fcall_impl(f, stack, env.clone(), &fptr_pos)?; let (new_acc, new_acc_pos) = VM::fcall_impl(f, stack, env.clone())?;
acc = new_acc; acc = new_acc;
acc_pos = new_acc_pos; acc_pos = new_acc_pos;
} }
@ -652,7 +652,7 @@ impl Builtins {
stack.push((Rc::new(P(Str(name.clone()))), list_pos.clone())); stack.push((Rc::new(P(Str(name.clone()))), list_pos.clone()));
stack.push((dbg!(acc.clone()), acc_pos.clone())); stack.push((dbg!(acc.clone()), acc_pos.clone()));
// call function and push it's result on the stack. // call function and push it's result on the stack.
let (new_acc, new_acc_pos) = VM::fcall_impl(f, stack, env.clone(), &fptr_pos)?; let (new_acc, new_acc_pos) = VM::fcall_impl(f, stack, env.clone())?;
acc = new_acc; acc = new_acc;
acc_pos = new_acc_pos; acc_pos = new_acc_pos;
} }
@ -663,7 +663,7 @@ impl Builtins {
stack.push((dbg!(Rc::new(P(Str(c.to_string())))), list_pos.clone())); stack.push((dbg!(Rc::new(P(Str(c.to_string())))), list_pos.clone()));
stack.push((dbg!(acc.clone()), acc_pos.clone())); stack.push((dbg!(acc.clone()), acc_pos.clone()));
// call function and push it's result on the stack. // call function and push it's result on the stack.
let (new_acc, new_acc_pos) = VM::fcall_impl(f, stack, env.clone(), &fptr_pos)?; let (new_acc, new_acc_pos) = VM::fcall_impl(f, stack, env.clone())?;
acc = new_acc; acc = new_acc;
acc_pos = new_acc_pos; acc_pos = new_acc_pos;
} }

3
src/build/opcode/scope.rs
View File

@ -11,8 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use std::collections::{BTreeMap, BTreeSet}; use std::collections::BTreeMap;
use std::iter::FromIterator;
use std::rc::Rc; use std::rc::Rc;
use super::Value; use super::Value;

3
src/build/opcode/vm.rs
View File

@ -370,7 +370,6 @@ where
f: &Func, f: &Func,
stack: &mut Vec<(Rc<Value>, Position)>, stack: &mut Vec<(Rc<Value>, Position)>,
env: Rc<RefCell<Environment<O, E>>>, env: Rc<RefCell<Environment<O, E>>>,
pos: &Position,
) -> Result<(Rc<Value>, Position), Error> { ) -> Result<(Rc<Value>, Position), Error> {
let Func { let Func {
ref ptr, ref ptr,
@ -404,7 +403,7 @@ where
fn op_fcall(&mut self, pos: Position) -> Result<(), Error> { fn op_fcall(&mut self, pos: Position) -> Result<(), Error> {
let (f, _) = dbg!(self.pop())?; let (f, _) = dbg!(self.pop())?;
if let &F(ref f) = f.as_ref() { if let &F(ref f) = f.as_ref() {
let (val, _) = Self::fcall_impl(f, &mut self.stack, self.env.clone(), &pos)?; let (val, _) = Self::fcall_impl(f, &mut self.stack, self.env.clone())?;
self.push(dbg!(val), pos.clone())?; self.push(dbg!(val), pos.clone())?;
} }
Ok(()) Ok(())