language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 06:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Get it all to compile!

Browse source
This commit is contained in:
Eric Correia 2021-10-02 13:48:07 -04:00
parent 555478cdf0
commit 8272ea876f
21 changed files with 217 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/parse/src/ast.rs
View file

@ -92,7 +92,7 @@ pub enum Expr<'a> {
/// e.g. `.foo`
AccessorFunction(&'a str),
/// eg 'b'
SingleQuote(char),
SingleQuote(&'a str),
// Collection Literals
List {
@ -360,7 +360,7 @@ pub enum Pattern<'a> {
FloatLiteral(&'a str),
StrLiteral(StrLiteral<'a>),
Underscore(&'a str),
SingleQuote(char),
SingleQuote(&'a str),
// Space
SpaceBefore(&'a Pattern<'a>, &'a [CommentOrNewline<'a>]),

1
compiler/parse/src/expr.rs
View file

@ -1492,6 +1492,7 @@ fn expr_to_pattern_help<'a>(arena: &'a Bump, expr: &Expr<'a>) -> Result<Pattern<
| Expr::UnaryOp(_, _) => Err(()),
Expr::Str(string) => Ok(Pattern::StrLiteral(*string)),
Expr::SingleQuote(string) => Ok(Pattern::SingleQuote(*string)),
Expr::MalformedIdent(string, _problem) => Ok(Pattern::Malformed(string)),
}
}

27
compiler/parse/src/string_literal.rs
View file

@ -1,5 +1,3 @@
use std::convert::TryInto;
use crate::ast::{EscapedChar, StrLiteral, StrSegment};
use crate::expr;
use crate::parser::Progress::*;
@ -48,8 +46,8 @@ macro_rules! advance_state {
};
}
pub fn parse_single_quote<'a>() -> impl Parser<'a, char, EString<'a>> {
move |_arena: &'a Bump, mut state: State<'a>| {
pub fn parse_single_quote<'a>() -> impl Parser<'a, &'a str, EString<'a>> {
move |arena: &'a Bump, mut state: State<'a>| {
if state.bytes.starts_with(b"\'") {
// we will be parsing a single-quote-string
} else {
@ -73,9 +71,11 @@ pub fn parse_single_quote<'a>() -> impl Parser<'a, char, EString<'a>> {
state = advance_state!(state, 1)?;
// since we checked the current char between the single quotes we
// know they are valid UTF-8, allowing us to use 'from_u32_unchecked'
let test = unsafe { char::from_u32_unchecked(ch as u32) };
return Ok((
MadeProgress,
unsafe { char::from_u32_unchecked(ch as u32) },
&*arena.alloc_str(&test.to_string()),
state,
));
}
@ -112,6 +112,8 @@ pub fn parse_single_quote<'a>() -> impl Parser<'a, char, EString<'a>> {
let mut bytes = state.bytes.iter();
let mut end_index = 1;
// Copy paste problem in mono
loop {
match bytes.next() {
Some(b'\'') => {
@ -138,19 +140,14 @@ pub fn parse_single_quote<'a>() -> impl Parser<'a, char, EString<'a>> {
// happy case -> we have some bytes that will fit into a u32
// ending up w/ a slice of bytes that we want to convert into an integer
let bytes_array: [u8; 4] = match state.bytes[1..end_index].try_into() {
Ok(bytes) => bytes,
Err(_) => {
return Err((NoProgress, EString::Open(state.line, state.column), state));
}
};
let raw_bytes = &state.bytes[0..end_index - 1];
state = advance_state!(state, end_index)?;
match char::from_u32(u32::from_ne_bytes(bytes_array)) {
Some(ch) => {
return Ok((MadeProgress, ch, state));
match std::str::from_utf8(raw_bytes) {
Ok(string) => {
return Ok((MadeProgress, string, state));
}
None => {
Err(_) => {
// invalid UTF-8
return Err((
NoProgress,