allow top level module

This commit is contained in:
Edgar 2024-03-13 11:12:36 +01:00
parent 0ea6ac3085
commit 7c3bc054e5
No known key found for this signature in database
GPG key ID: 70ADAE8F35904387
8 changed files with 52 additions and 59 deletions

View file

@ -5,7 +5,6 @@ An experimental statically-typed compiled programming language made with LLVM an
Syntax is subject to change any time right now. It has a rusty style for now.
```rust
mod Main {
pub fn main() -> i32 {
let b: i32 = factorial(4);
return b;
@ -18,7 +17,6 @@ mod Main {
return n * factorial(n - 1);
}
}
}
```
## edb: The edlang builder

View file

@ -114,30 +114,18 @@ fn main() -> Result<()> {
if bin {
std::fs::write(
path.join("src").join("main.ed"),
format!(
r#"
mod {} {{
pub fn main() -> i32 {{
r#"pub fn main() -> i32 {{
return 0;
}}
}}"#,
name
),
}"#,
)?;
}
if lib {
std::fs::write(
path.join("src").join("lib.ed"),
format!(
r#"
mod {} {{
pub fn hello_world() -> i32 {{
r#"pub fn main() -> i32 {{
return 0;
}}
}}"#,
name
),
}"#,
)?;
}

View file

@ -99,10 +99,13 @@ pub fn compile(args: &CompilerArgs) -> Result<PathBuf> {
for path in files {
let source = std::fs::read_to_string(&path)?;
let modules_ast = edlang_parser::parse_ast(&source);
let module_ast = edlang_parser::parse_ast(
&source,
&path.file_stem().expect("no file stem").to_string_lossy(),
);
let modules_temp = match modules_ast {
Ok(modules) => modules,
let module_temp = match module_ast {
Ok(module) => module,
Err(error) => {
let path = path.display().to_string();
let report = edlang_parser::error_to_report(&path, &error)?;
@ -110,7 +113,7 @@ pub fn compile(args: &CompilerArgs) -> Result<PathBuf> {
std::process::exit(1)
}
};
modules.push((path, source, modules_temp));
modules.push((path, source, module_temp));
}
let session = Session {

View file

@ -34,7 +34,7 @@ pub fn compile_program(
name: &str,
library: bool,
) -> Result<CompileResult, Box<dyn std::error::Error>> {
let modules = edlang_parser::parse_ast(source).unwrap();
let module = edlang_parser::parse_ast(source, name).unwrap();
let test_dir = tempfile::tempdir().unwrap();
let test_dir_path = test_dir.path().canonicalize()?;
@ -61,7 +61,7 @@ pub fn compile_program(
output_asm: false,
};
let program_ir = lower_modules(&[modules]).unwrap();
let program_ir = lower_modules(&[module]).unwrap();
let object_path = edlang_codegen_llvm::compile(&session, &program_ir).unwrap();

View file

@ -33,6 +33,7 @@ pub struct ProgramBody {
pub structs: BTreeMap<DefId, AdtBody>,
/// The function signatures.
pub function_signatures: BTreeMap<DefId, (Vec<TypeInfo>, TypeInfo)>,
pub file_names: BTreeMap<usize, String>,
}
#[derive(Debug, Clone)]

View file

@ -15,24 +15,19 @@ mod common;
pub mod errors;
mod prepass;
pub fn lower_modules(modules: &[Vec<ast::Module>]) -> Result<ProgramBody, LoweringError> {
pub fn lower_modules(modules: &[ast::Module]) -> Result<ProgramBody, LoweringError> {
let mut ctx = BuildCtx::default();
// resolve symbols
for (file_id, modules) in modules.iter().enumerate() {
for module in modules {
for (file_id, module) in modules.iter().enumerate() {
ctx = prepass::prepass_module(ctx, module, file_id)?;
}
}
// resolve imports
for (file_id, modules) in modules.iter().enumerate() {
for module in modules {
for (file_id, module) in modules.iter().enumerate() {
ctx = prepass::prepass_imports(ctx, module, file_id)?;
}
}
for modules in modules {
for mod_def in modules {
let id = *ctx
.body
@ -42,7 +37,6 @@ pub fn lower_modules(modules: &[Vec<ast::Module>]) -> Result<ProgramBody, Loweri
ctx = lower_module(ctx, mod_def, id)?;
}
}
Ok(ctx.body)
}

View file

@ -3,7 +3,7 @@ use crate::lexer::LexicalError;
use edlang_ast as ast;
use std::str::FromStr;
grammar;
grammar<'module_name>(module_name: &'module_name str);
extern {
type Location = usize;
@ -478,8 +478,16 @@ pub(crate) Import: ast::Import = {
}
}
pub Modules: Vec<ast::Module> = {
<Module+> => <>
pub TopLevelModule: ast::Module = {
<lo:@L> <imports:List<Import>?> <contents:List<ModuleStatement>> <hi:@R> => ast::Module {
name: ast::Ident {
name: module_name.to_string(),
span: ast::Span::new(0, 0),
},
imports: imports.unwrap_or(vec![]),
contents,
span: ast::Span::new(lo, hi),
}
}
pub Module: ast::Module = {

View file

@ -22,10 +22,11 @@ pub mod grammar {
pub fn parse_ast(
source: &str,
) -> Result<Vec<edlang_ast::Module>, ParseError<usize, Token, LexicalError>> {
module_name: &str,
) -> Result<edlang_ast::Module, ParseError<usize, Token, LexicalError>> {
let lexer = Lexer::new(source);
let parser = grammar::ModulesParser::new();
parser.parse(lexer)
let parser = grammar::TopLevelModuleParser::new();
parser.parse(module_name, lexer)
}
pub fn print_report<'a>(