Merge pull request #8 from peterhuene/export-resolution

Implement export statement resolution.

Author: peterhuene

Cargo.lock

@@ -35,20 +35,20 @@ wat = ["wac-parser/wat"]
 
 [workspace.dependencies]
 wac-parser = { path = "crates/wac-parser", default-features = false }
-wit-parser = "0.12.1"
-wasmparser = "0.115.0"
-wit-component = "0.16.0"
+wit-parser = "0.13.0"
+wasmparser = "0.116.1"
+wit-component = "0.18.0"
 anyhow = "1.0.75"
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.7", features = ["derive"] }
 semver = "1.0.20"
 pretty_env_logger = "0.5.0"
 log = "0.4.20"
 tokio = { version = "1.33.0", default-features = false, features = ["macros", "rt-multi-thread"] }
 owo-colors = { version = "3.5.0", features = ["supports-colors"] }
-indexmap = { version = "2.0.2", features = ["serde"] }
+indexmap = { version = "2.1.0", features = ["serde"] }
 id-arena = "2.2.1"
-serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.107"
-wat = "1.0.77"
+serde = { version = "1.0.191", features = ["derive"] }
+serde_json = "1.0.108"
+wat = "1.0.79"
 logos = "0.13.0"
 thiserror = "1.0.50"

Cargo.toml

@@ -2,7 +2,7 @@ use super::{
     display, expr::Expr, parse_optional, parse_token, DocComment, Lookahead, Parse, ParseResult,
     Peek,
 };
-use crate::lexer::{Lexer, Token};
+use crate::lexer::{Lexer, Span, Token};
 use serde::Serialize;
 
 /// Represents an export statement in the AST.
@@ -11,6 +11,8 @@ use serde::Serialize;
 pub struct ExportStatement<'a> {
     /// The doc comments for the statement.
     pub docs: Vec<DocComment<'a>>,
+    /// The span of the export keyword.
+    pub span: Span<'a>,
     /// The optional `with` string.
     pub with: Option<super::String<'a>>,
     /// The expression to export.
@@ -20,11 +22,16 @@ pub struct ExportStatement<'a> {
 impl<'a> Parse<'a> for ExportStatement<'a> {
     fn parse(lexer: &mut Lexer<'a>) -> ParseResult<'a, Self> {
         let docs = Parse::parse(lexer)?;
-        parse_token(lexer, Token::ExportKeyword)?;
+        let span = parse_token(lexer, Token::ExportKeyword)?;
         let expr = Parse::parse(lexer)?;
         let with = parse_optional(lexer, Token::WithKeyword, Parse::parse)?;
         parse_token(lexer, Token::Semicolon)?;
-        Ok(Self { docs, expr, with })
+        Ok(Self {
+            docs,
+            span,
+            expr,
+            with,
+        })
     }
 }