Skip to content

Commit

Permalink
prepare release 0.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
WeirdConstructor committed Nov 19, 2019
1 parent f055e75 commit d797c4a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.3.4 (unreleased)
0.3.4 (2019-11-20)
==================

* Feature: Version of WLambda is printed to stderr in the executable
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wlambda"
version = "0.3.3"
version = "0.3.4"
authors = ["Weird Constructor <[email protected]>"]
license = "GPL-3.0-or-later"
edition = "2018"
Expand Down
11 changes: 2 additions & 9 deletions src/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -518,21 +518,14 @@ impl EvalContext {
Ok(prog_closures) => {
l_env.sp = 0;
l_env.set_bp(local_env_size);
//d// println!("*** PRECALL");
//d// l_env.dump_stack();
//d// println!("*** PRECALL");
let r = match l_env.with_restore_sp(
match l_env.with_restore_sp(
|e: &mut Env| { prog_closures(e) })
{
Ok(v) => Ok(v.clone()),
Err(je) =>
Err(EvalError::ExecError(
format!("Jumped out of execution: {:?}", je))),
};
//d// println!("*** POSTCALL");
//d// l_env.dump_stack();
//d// println!("*** POSTCALL");
r
}
},
Err(e) => { Err(EvalError::CompileError(e)) },
};
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use vval::Env;
use vval::VVal;
use crate::compiler::{GlobalEnv, EvalContext};

const VERSION: &'static str = env!("CARGO_PKG_VERSION");
const VERSION: &str = env!("CARGO_PKG_VERSION");

fn main() {
let global = GlobalEnv::new_default();
Expand Down
4 changes: 2 additions & 2 deletions src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ generated from the given _sm_state_.
*/

const VERSION: &'static str = env!("CARGO_PKG_VERSION");
const VERSION: &str = env!("CARGO_PKG_VERSION");

use crate::compiler::*;
use crate::vval::*;
Expand Down Expand Up @@ -1474,7 +1474,7 @@ pub fn std_symbol_table() -> SymbolTable {
Ok(VVal::vec_mv(
env.arg(0).s_raw()
.chars()
.map(|c| VVal::Int(c as u32 as i64))
.map(|c| VVal::Int(i64::from(c as u32)))
.collect()))
}, Some(1), Some(1), false);

Expand Down
2 changes: 1 addition & 1 deletion src/vval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ impl Env {
}
if n > 0 {
//d// println!("SP={}, N={}", self.sp, n);
for i in (self.sp - n)..=(self.sp - 1) {
for i in (self.sp - n)..self.sp {
//d// println!("POP[{}] {} [of {}]", i, self.args[i].s(), n);
self.args[i] = VVal::Nul;
}
Expand Down

0 comments on commit d797c4a

Please sign in to comment.