Skip to content

Fixed coki to run under Rust nightly 1.7 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
White-Oak wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed coki to run under Rust nightly 1.7 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6df468b
Added #![feature(custom_derive)] to the crate to add derives to custo…
White-Oak Dec 22, 2015
8a48490
Changed all #[derive(Show)] to #[derive(Debug)]
White-Oak Dec 22, 2015
d61ac9e
Added missing unwraps
White-Oak Dec 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

#[derive(Show)]
#[derive(Debug)]
#[derive(Clone)]
#[derive(PartialEq)]
pub enum AddOp {
Add,
Subtract,
}

#[derive(Show)]
#[derive(Debug)]
#[derive(Clone)]
#[derive(PartialEq)]
pub enum MultOp {
Expand All @@ -17,16 +17,16 @@ pub enum MultOp {
}

#[derive(Clone)]
#[derive(Show)]
#[derive(Debug)]
#[derive(PartialEq)]
pub struct AddTerm(pub AddOp, pub Expr);

#[derive(Clone)]
#[derive(Show)]
#[derive(Debug)]
#[derive(PartialEq)]
pub struct MultTerm(pub MultOp, pub Expr);

#[derive(Show)]
#[derive(Debug)]
#[derive(Clone)]
#[derive(PartialEq)]
pub enum Expr {
Expand All @@ -38,12 +38,12 @@ pub enum Expr {


//for now this is it's own type and not a statement
#[derive(Show)]
#[derive(Debug)]
#[derive(Clone)]
#[derive(PartialEq)]
pub struct Block(pub Vec<Statement>);

#[derive(Show)]
#[derive(Debug)]
#[derive(Clone)]
#[derive(PartialEq)]
pub enum Statement {
Expand All @@ -53,7 +53,7 @@ pub enum Statement {
While(Expr, Comparator, Expr, Block),
}

#[derive(Show)]
#[derive(Debug)]
#[derive(Clone)]
#[derive(Eq)]
#[derive(PartialEq)]
Expand All @@ -68,7 +68,7 @@ pub enum Comparator {



#[derive(Show)]
#[derive(Debug)]
#[derive(Eq)]
#[derive(PartialEq)]
#[derive(Clone)]
Expand Down
4 changes: 2 additions & 2 deletions src/lexer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ use std::str::FromStr;
pub fn token() -> Box<SliceParser<I=str, O=Vec<Token>>> {

fn lt(s: &str, t: Token) -> RegexLiteralParser<Token> {
str_lit((String::from_str(r"^[ \t]*") + s).as_str(), t)
str_lit((String::from_str(r"^[ \t]*").unwrap() + s).as_str(), t)
}

let ident = capture(r"^[ \t]*([a-zA-Z]\w*)[ \t]*", |caps| Token::Ident(String::from_str(caps.at(1).unwrap())));
let ident = capture(r"^[ \t]*([a-zA-Z]\w*)[ \t]*", |caps| Token::Ident(String::from_str(caps.at(1).unwrap()).unwrap()));

let number = capture(r"^[ \t]*(\d+)[ \t]*", |caps| Token::Number(FromStr::from_str(caps.at(1).unwrap()).unwrap()));

Expand Down
1 change: 1 addition & 0 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![feature(custom_derive)]
#![feature(unboxed_closures)]
#![feature(collections)]
#![feature(convert)]
Expand Down