Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
target/
1 change: 1 addition & 0 deletions crates/typr-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ rand.workspace = true
anyhow.workspace = true
countmap.workspace = true
bincode = "1.3"
rowan = "0.16.1"

[dev-dependencies]
insta = { version = "1", features = ["yaml"] }
Expand Down
4 changes: 4 additions & 0 deletions crates/typr-core/src/components/error_message/help_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ pub struct HelpData {
}

impl HelpData {
pub fn new(offset: usize, file_name: String) -> Self {
HelpData { offset, file_name }
}

pub fn get_offset(&self) -> usize {
self.offset
}
Expand Down
1 change: 1 addition & 0 deletions crates/typr-core/src/components/language/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pub mod array_lang;
pub mod function_lang;
pub mod module_lang;
pub mod operators;
pub mod syntax;
pub mod use_lang;
pub mod var;
pub mod var_function;
Expand Down
23 changes: 23 additions & 0 deletions crates/typr-core/src/components/language/syntax/language.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
use crate::components::language::syntax::syntax_kind::SyntaxKind;

#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum TyprLanguage {}

impl rowan::Language for TyprLanguage {
type Kind = SyntaxKind;

fn kind_from_raw(raw: rowan::SyntaxKind) -> Self::Kind {
// This is safe because rowan guarantees it only ever
// passes back the u16s it was given when building
// the tree.
unsafe { std::mem::transmute(raw.0) }
}

fn kind_to_raw(kind: Self::Kind) -> rowan::SyntaxKind {
rowan::SyntaxKind(kind as u16)
}
}

pub type SyntaxNode = rowan::SyntaxNode<TyprLanguage>;
pub type SyntaxToken = rowan::SyntaxToken<TyprLanguage>;
pub type SyntaxElement = rowan::SyntaxElement<TyprLanguage>;
2 changes: 2 additions & 0 deletions crates/typr-core/src/components/language/syntax/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pub mod language;
pub mod syntax_kind;
210 changes: 210 additions & 0 deletions crates/typr-core/src/components/language/syntax/syntax_kind.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
#[derive(Debug, Clone, Copy, Eq, PartialEq)]
pub struct Token {
pub kind: SyntaxKind,
pub len: usize,
}

#[derive(Debug, Clone, Copy, Eq, PartialEq, PartialOrd, Ord, Hash)]
#[repr(u16)]
#[allow(non_camel_case_types)]
pub enum SyntaxKind {
// Keywords
LET_KW,
FN_KW,
FUNCTION_KW,
TYPE_CONSTRUCTOR_KW,
RECURSIVE_KW,
TYPE_KW,
OPAQUE_KW,
MODULE_KW,
MOD_KW,
IMPORT_KW,
AS_KW,
USE_KW,
TEST_KW,
LIBRARY_KW,
EMBED_KW,
INTERFACE_KW,
CLASS_KW,
JS_KW,
RETURN_KW,
BREAK_KW,
NEXT_KW,

// Record identifiers
RECORD_KW,
OBJECT_KW,
LIST_KW,

ANY_KW,
SELF_KW,
EMPTY_KW,

// Conditional
IF_KW,
ELSE_KW,

// Types keywords
DATAFRAME_KW,
ARRAY_KW,
VEC_KW,
NUM_KW,
INT_KW,
BOOL_KW,
TUPLE_KW,

// Dynamic tokens
IDENT,
NUMBER,
STRING,

// Value keywords
TRUE_KW,
FALSE_KW,
NULL_KW,
NA_KW,

// Loops
FOR_KW,
WHILE_KW,
LOOP_KW,

// Annotations
AT_EXPORT,
AT_PUB,
AT_TESTABLE,
AT_IMPORT_FROM,

// Operators
ADD,
ADD2,
MINUS,
MINUS2,
MUL,
MUL2,
DIV,
DIV2,
AT,
AT2,
MODULO,
MODULO2,
PIPE,
PIPE2,
DOLLAR,
DOLLAR2,
EQ,
EQ2,
DOT,
DOT2,
DOT3,
NOT_EQ,
LESSER_OR_EQUAL,
GREATER_OR_EQUAL,
LESSER_THAN,
GREATER_THAN,
IN_OP,
AND,
AND2,
OR,
OR2,
CUSTOM,
AS_EXCL,
L_ARROW, // <-
R_ARROW, // ->

// Punctuation
L_CURLY,
R_CURLY,
L_BRACK,
R_BRACK,
L_PAREN,
R_PAREN,
L_VECTORIAL,
R_VECTORIAL,
SEMICOLON,
COLON,
COLON2,
COMMA,
STAR, // *
EXCLAMATION,
CARET, // ^
QUESTION_MARK,
UNDERSCORE,
BACKSLASH,

// Trivia
WHITESPACE,
COMMENT,

// Special
ERROR,
EOF,

// Nodes
SOURCE_FILE,
LITERAL_EXPR,
IDENT_EXPR,
BINARY_EXPR,
PREFIX_EXPR,
PAREN_EXPR,
CALL_EXPR,
ARRAY_EXPR,
LET_STMT,
EXPR_STMT,
BLOCK_EXPR,
INDEX_EXPR,
}

impl SyntaxKind {
pub fn from_keyword(text: &str) -> Option<Self> {
match text {
"let" => Some(Self::LET_KW),
"fn" => Some(Self::FN_KW),
"function" => Some(Self::FUNCTION_KW),
"type_constructor" => Some(Self::TYPE_CONSTRUCTOR_KW),
"recursive" => Some(Self::RECURSIVE_KW),
"type" => Some(Self::TYPE_KW),
"opaque" => Some(Self::OPAQUE_KW),
"module" => Some(Self::MODULE_KW),
"mod" => Some(Self::MOD_KW),
"import" => Some(Self::IMPORT_KW),
"as" => Some(Self::AS_KW),
"use" => Some(Self::USE_KW),
"test" => Some(Self::TEST_KW),
"library" => Some(Self::LIBRARY_KW),
"embed" => Some(Self::EMBED_KW),
"interface" => Some(Self::INTERFACE_KW),
"class" => Some(Self::CLASS_KW),
"JS" => Some(Self::JS_KW),
"return" => Some(Self::RETURN_KW),
"break" => Some(Self::BREAK_KW),
"next" => Some(Self::NEXT_KW),
"record" => Some(Self::RECORD_KW),
"object" => Some(Self::OBJECT_KW),
"list" => Some(Self::LIST_KW),
"any" => Some(Self::ANY_KW),
"self" => Some(Self::SELF_KW),
"empty" => Some(Self::EMPTY_KW),
"if" => Some(Self::IF_KW),
"else" => Some(Self::ELSE_KW),
"dataframe" | "df" => Some(Self::DATAFRAME_KW),
"array" => Some(Self::ARRAY_KW),
"vec" => Some(Self::VEC_KW),
"num" => Some(Self::NUM_KW),
"int" => Some(Self::INT_KW),
"bool" => Some(Self::BOOL_KW),
"tuple" => Some(Self::TUPLE_KW),
"true" => Some(Self::TRUE_KW),
"false" => Some(Self::FALSE_KW),
"null" => Some(Self::NULL_KW),
"NA" => Some(Self::NA_KW),
"for" => Some(Self::FOR_KW),
"while" => Some(Self::WHILE_KW),
"loop" => Some(Self::LOOP_KW),
"and" => Some(Self::AND2),
"or" => Some(Self::OR2),
"in" => Some(Self::IN_OP),
_ => None,
}
}
}
19 changes: 19 additions & 0 deletions crates/typr-core/src/processes/lexing/input.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
use crate::{
components::language::syntax::syntax_kind::SyntaxKind, processes::lexing::lexed_str::LexedStr,
};

pub struct Input {
pub tokens: Vec<SyntaxKind>,
}

impl Input {
pub fn new(lexed_str: &LexedStr) -> Self {
let mut tokens = lexed_str.kinds.clone();
tokens.retain(|kind| *kind != SyntaxKind::WHITESPACE && *kind != SyntaxKind::COMMENT);
Self { tokens }
}

pub fn kind(&self, index: usize) -> SyntaxKind {
self.tokens.get(index).copied().unwrap_or(SyntaxKind::EOF)
}
}
Loading
Loading