From c2946e7a9b36a808f41bb97c255b05f9a67c721c Mon Sep 17 00:00:00 2001 From: Araozu Date: Mon, 21 Nov 2022 16:58:51 -0500 Subject: [PATCH] Scan integers --- LICENSE.md | 280 +++++++++++++++++++++++++++++++++++ src/main.rs | 1 + src/repl/mod.rs | 12 +- src/syntax/mod.rs | 97 ++++++++++++ src/syntax/scanner/mod.rs | 8 + src/syntax/scanner/number.rs | 62 ++++++++ src/syntax/token.rs | 46 ++++++ src/syntax/utils.rs | 6 + 8 files changed, 510 insertions(+), 2 deletions(-) create mode 100644 LICENSE.md create mode 100644 src/syntax/mod.rs create mode 100644 src/syntax/scanner/mod.rs create mode 100644 src/syntax/scanner/number.rs create mode 100644 src/syntax/token.rs create mode 100644 src/syntax/utils.rs diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..d8cf7d4 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/src/main.rs b/src/main.rs index d05e9e2..16946af 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,6 +2,7 @@ use std::io; use chrono::{prelude::Utc, Datelike}; mod repl; +mod syntax; const VERSION: &str = "0.0.1"; diff --git a/src/repl/mod.rs b/src/repl/mod.rs index e8af747..1cc43af 100644 --- a/src/repl/mod.rs +++ b/src/repl/mod.rs @@ -1,5 +1,11 @@ use std::io::{self, Write}; +use super::syntax; + +fn compile(input: &String) { + let tokens = syntax::get_tokens(input); +} + pub fn run() -> io::Result<()> { let stdin = io::stdin(); let mut buffer = String::new(); @@ -8,19 +14,21 @@ pub fn run() -> io::Result<()> { loop { print!("> "); let _ = io::stdout().flush(); + buffer.clear(); let read = stdin.read_line(&mut buffer); match read { Ok(0) => { println!("\nBye"); - return Ok(()); + break Ok(()) }, Ok(_) => { println!("{}", buffer); + compile(&buffer); }, Err(error) => { eprintln!("Error reading stdin."); - return Err(error); + break Err(error) } }; } diff --git a/src/syntax/mod.rs b/src/syntax/mod.rs new file mode 100644 index 0000000..481f59a --- /dev/null +++ b/src/syntax/mod.rs @@ -0,0 +1,97 @@ +mod utils; +mod scanner; +mod token; +use token::{Token, TokenType}; + +type Chars = Vec; + +/// Scans and returns all the tokens in the input String +pub fn get_tokens(input: &String) -> Vec { + let chars: Vec = input.chars().into_iter().collect(); + let mut results = Vec::new(); + let mut current_pos: usize = 0; + + while has_input(&chars, current_pos) { + let (possible_token, next_pos) = next_token(&chars, current_pos); + current_pos = next_pos; + + if let Some(token) = possible_token { + results.push(token); + } + } + + results.push(token::new_eof(0)); + results +} + +fn next_token(chars: &Chars, current_pos: usize) -> (Option, usize) { + let next_char = peek(chars, current_pos); + + // Handle whitespace + if next_char == ' ' { + return next_token(chars, current_pos + 1) + } + + // Test number + if utils::is_digit(next_char) { + let (token, next_pos) = scanner::number(chars, current_pos); + (Some(token), next_pos) + } else { + (None, current_pos) + } +} + +fn peek(input: &Chars, pos: usize) -> char { + let result = input.get(pos).unwrap_or(&'\0'); + *result +} + +fn has_input(input: &Vec, current_pos: usize) -> bool { + input.len() < current_pos +} + + + +#[cfg(test)] +mod tests { + use super::*; + use token::{Token, TokenType}; + + /// Should return an EOF token if the input has no tokens + #[test] + fn test1() { + let input = String::from(""); + let tokens = get_tokens(&input); + assert_eq!(1, tokens.len()); + let first = tokens.get(0).unwrap(); + assert_eq!(TokenType::EOF, first.token_type); + + let input = String::from(" "); + let tokens = get_tokens(&input); + assert_eq!(1, tokens.len()); + let first = tokens.get(0).unwrap(); + assert_eq!(TokenType::EOF, first.token_type); + + let input = String::from(" \n "); + let tokens = get_tokens(&input); + assert_eq!(1, tokens.len()); + let first = tokens.get(0).unwrap(); + assert_eq!(TokenType::EOF, first.token_type); + } + + /// Should scan numbers + #[test] + fn number_test() { + let input = String::from("126 278.98 0.282398 1798e+1 239.3298e-103"); + let tokens = get_tokens(&input); + + // assert_eq!("126", tokens.get(0).unwrap().value); + /* + assert_eq!("278.98", tokens.get(1).unwrap().value); + assert_eq!("0.282398", tokens.get(2).unwrap().value); + assert_eq!("1798e+1", tokens.get(3).unwrap().value); + assert_eq!("239.3298e-103", tokens.get(4).unwrap().value); + assert_eq!(TokenType::EOF, tokens.get(5).unwrap().token_type); + */ + } +} diff --git a/src/syntax/scanner/mod.rs b/src/syntax/scanner/mod.rs new file mode 100644 index 0000000..6bb0898 --- /dev/null +++ b/src/syntax/scanner/mod.rs @@ -0,0 +1,8 @@ +use super::token::Token; + +mod number; + +pub fn number(chars: &Vec, start_pos: usize) -> (Token, usize) { + number::scan(chars, start_pos) +} + diff --git a/src/syntax/scanner/number.rs b/src/syntax/scanner/number.rs new file mode 100644 index 0000000..716049e --- /dev/null +++ b/src/syntax/scanner/number.rs @@ -0,0 +1,62 @@ +use crate::syntax::{token::{Token, self}, utils}; + +pub fn scan(chars: &Vec, start_pos: usize) -> (Token, usize) { + scan_decimal(chars, start_pos, String::from("")) +} + +fn scan_decimal(chars: &Vec, start_pos: usize, current: String) -> (Token, usize) { + let next_char = chars.get(start_pos); + + if let Some(c) = next_char { + if utils::is_digit(*c) { + let new_value = format!("{}{}", current, *c); + scan_decimal(chars, start_pos + 1, new_value) + } else { + (token::new_number(current, start_pos as i32), start_pos) + } + } else { + (token::new_number(current, start_pos as i32), start_pos) + } +} + + + +#[cfg(test)] +mod tests { + use crate::syntax::token::TokenType; + + use super::*; + + fn str_to_vec(s: &str) -> Vec { + s.chars().collect() + } + + #[test] + fn test_int() { + let input = str_to_vec("123"); + let start_pos = 0; + + let (token, next) = scan(&input, start_pos); + assert_eq!(3, next); + assert_eq!(TokenType::Number, token.token_type); + assert_eq!("123", token.value); + + + let input = str_to_vec("0123"); + let start_pos = 0; + + let (token, next) = scan(&input, start_pos); + assert_eq!(4, next); + assert_eq!(TokenType::Number, token.token_type); + assert_eq!("0123", token.value); + + + let input = str_to_vec(" 123456 789"); + let start_pos = 2; + + let (token, next) = scan(&input, start_pos); + assert_eq!(8, next); + assert_eq!(TokenType::Number, token.token_type); + assert_eq!("123456", token.value); + } +} diff --git a/src/syntax/token.rs b/src/syntax/token.rs new file mode 100644 index 0000000..9599537 --- /dev/null +++ b/src/syntax/token.rs @@ -0,0 +1,46 @@ +#[derive(PartialEq, Debug)] +pub enum TokenType { + NewLine, + Identifier, + Comment, + Number, + String, + Unit, + Operator, + LeftParen, + RightParen, + LeftBracket, + RightBracket, + LeftBrace, + RightBrace, + Indent, + Dedent, + VAR, + VAL, + EOF, +} + +pub struct Token { + pub token_type: TokenType, + // The token as a raw string + pub value: String, + /// The absolute position of this token, from the + /// start of the file + position: i32, +} + +pub fn new_eof(position: i32) -> Token { + Token { + token_type: TokenType::EOF, + value: String::from(""), + position, + } +} + +pub fn new_number(value: String, position: i32) -> Token { + Token { + token_type: TokenType::Number, + value, + position + } +} diff --git a/src/syntax/utils.rs b/src/syntax/utils.rs new file mode 100644 index 0000000..9f1b3fd --- /dev/null +++ b/src/syntax/utils.rs @@ -0,0 +1,6 @@ + +pub fn is_digit(c: char) -> bool { + '0' <= c && c <= '9' +} + +