From 751ab516f1ecb639543ba99363afb85bf1aa2e62 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Mon, 2 Mar 2015 13:04:44 -0600 Subject: matlab: move Reader.m to +types/Reader.m Fixes https://github.com/kanaka/mal/issues/18 for case insensitive file-systems. --- matlab/+types/Reader.m | 27 +++++++++++++++++++++++++++ matlab/Reader.m | 27 --------------------------- matlab/reader.m | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 matlab/+types/Reader.m delete mode 100644 matlab/Reader.m diff --git a/matlab/+types/Reader.m b/matlab/+types/Reader.m new file mode 100644 index 0000000..c18ea54 --- /dev/null +++ b/matlab/+types/Reader.m @@ -0,0 +1,27 @@ +classdef Reader < handle + properties + tokens + position + end + methods + function rdr = Reader(tokens) + rdr.tokens = tokens; + rdr.position = 1; + end + function tok = next(rdr) + rdr.position = rdr.position + 1; + if rdr.position-1 > length(rdr.tokens) + tok = false; + else + tok = rdr.tokens{rdr.position-1}; + end + end + function tok = peek(rdr) + if rdr.position > length(rdr.tokens) + tok = false; + else + tok = rdr.tokens{rdr.position}; + end + end + end +end diff --git a/matlab/Reader.m b/matlab/Reader.m deleted file mode 100644 index c18ea54..0000000 --- a/matlab/Reader.m +++ /dev/null @@ -1,27 +0,0 @@ -classdef Reader < handle - properties - tokens - position - end - methods - function rdr = Reader(tokens) - rdr.tokens = tokens; - rdr.position = 1; - end - function tok = next(rdr) - rdr.position = rdr.position + 1; - if rdr.position-1 > length(rdr.tokens) - tok = false; - else - tok = rdr.tokens{rdr.position-1}; - end - end - function tok = peek(rdr) - if rdr.position > length(rdr.tokens) - tok = false; - else - tok = rdr.tokens{rdr.position}; - end - end - end -end diff --git a/matlab/reader.m b/matlab/reader.m index 84f6806..e0018ca 100644 --- a/matlab/reader.m +++ b/matlab/reader.m @@ -115,7 +115,7 @@ classdef reader function ast = read_str(str) %fprintf('in read_str\n'); tokens = reader.tokenize(str); - rdr = Reader(tokens); + rdr = types.Reader(tokens); ast = reader.read_form(rdr); end end -- cgit v1.2.3