Merge #833

833: Optimize the parser r=Marwes a=Marwes

Gives a 10-16% improvement (on benchmarks)

bors r+

Co-authored-by: Markus Westerlind <[email protected]>

Author: bors[bot]

Cargo.lock

@@ -143,8 +143,8 @@ path = "examples/lisp/main.rs"
 [package.metadata.docs.rs]
 features = ["docs_rs"]
 
-[profile.bench]
-debug = 1
-
-[profile.release]
-debug = 1
+# [profile.bench]
+# debug = 2
+#
+# [profile.release]
+# debug = 2

Cargo.toml

@@ -19,7 +19,7 @@ use crate::{
 
 use crate::{
     kind::ArcKind,
-    metadata::{Comment, Metadata},
+    metadata::{BaseMetadata, Comment, Metadata},
     pos::{self, BytePos, HasSpan, Span, Spanned},
     resolve::remove_aliases_cow,
     symbol::Symbol,
@@ -78,7 +78,7 @@ impl<'a, T: ?Sized + IdentEnv> IdentEnv for &'a mut T {
 
 #[derive(Eq, PartialEq, Debug, AstClone)]
 pub struct InnerAstType<'ast, Id> {
-    metadata: Option<Metadata>,
+    metadata: BaseMetadata<'ast>,
     typ: Spanned<Type<Id, AstType<'ast, Id>>, BytePos>,
 }
 
@@ -137,7 +137,7 @@ pub trait HasMetadata {
 
 impl<Id> HasMetadata for AstType<'_, Id> {
     fn metadata(&self) -> Option<&Metadata> {
-        self._typ.metadata.as_ref()
+        self._typ.metadata.metadata.as_ref().map(|m| &**m)
     }
 }
 
@@ -148,7 +148,7 @@ impl<'ast, Id> AstType<'ast, Id> {
     ) -> Self {
         AstType {
             _typ: arena.alloc(InnerAstType {
-                metadata: None,
+                metadata: Default::default(),
                 typ,
             }),
         }
@@ -164,7 +164,7 @@ impl<'ast, Id> AstType<'ast, Id> {
         typ: Spanned<Type<Id, AstType<'ast, Id>>, BytePos>,
     ) -> Self
     where
-        T: Into<Option<Metadata>>,
+        T: Into<BaseMetadata<'ast>>,
     {
         AstType {
             _typ: arena.alloc(InnerAstType {
@@ -176,7 +176,7 @@ impl<'ast, Id> AstType<'ast, Id> {
 
     pub fn set_metadata<T>(&mut self, metadata: T)
     where
-        T: Into<Option<Metadata>>,
+        T: Into<BaseMetadata<'ast>>,
     {
         self._typ.metadata = metadata.into();
     }
@@ -308,6 +308,10 @@ pub enum Pattern<'ast, Id> {
     Error,
 }
 
+// Safeguard against growing Pattern
+#[cfg(target_pointer_width = "64")]
+const _: [u8; 48] = [0; std::mem::size_of::<Pattern<'static, Symbol>>()];
+
 pub fn pattern_names<'a, 'ast, Id>(
     fields: &'a [PatternField<'ast, Id>],
 ) -> impl Iterator<Item = &'a Spanned<Id, BytePos>> + Captures<'ast> {
@@ -355,10 +359,6 @@ pub fn pattern_types<'a, 'ast, Id>(
     })
 }
 
-// Safeguard against growing Pattern
-#[cfg(target_pointer_width = "64")]
-const _: [u8; 48] = [0; std::mem::size_of::<Pattern<'static, Symbol>>()];
-
 impl<Id> Default for Pattern<'_, Id> {
     fn default() -> Self {
         Pattern::Error
@@ -393,8 +393,8 @@ pub type SpannedAlias<'ast, Id> = Spanned<AliasData<Id, AstType<'ast, Id>>, Byte
 pub type SpannedAstType<'ast, Id> = Spanned<Type<Id, AstType<'ast, Id>>, BytePos>;
 
 #[derive(Eq, PartialEq, Debug, AstClone)]
-pub struct ExprField<Id, E> {
-    pub metadata: Metadata,
+pub struct ExprField<'ast, Id, E> {
+    pub metadata: BaseMetadata<'ast>,
     pub name: Spanned<Id, BytePos>,
     pub value: Option<E>,
 }
@@ -447,8 +447,8 @@ pub enum Expr<'ast, Id> {
     /// Record construction
     Record {
         typ: ArcType<Id>,
-        types: &'ast mut [ExprField<Id, ArcType<Id>>],
-        exprs: &'ast mut [ExprField<Id, SpannedExpr<'ast, Id>>],
+        types: &'ast mut [ExprField<'ast, Id, ArcType<Id>>],
+        exprs: &'ast mut [ExprField<'ast, Id, SpannedExpr<'ast, Id>>],
         base: Option<&'ast mut SpannedExpr<'ast, Id>>,
     },
     /// Tuple construction
@@ -591,7 +591,7 @@ impl<'ast, Id> Expr<'ast, Id> {
 
 #[derive(Eq, PartialEq, Debug, AstClone)]
 pub struct TypeBinding<'ast, Id> {
-    pub metadata: Metadata,
+    pub metadata: BaseMetadata<'ast>,
     pub name: Spanned<Id, BytePos>,
     pub alias: SpannedAlias<'ast, Id>,
     pub finalized_alias: Option<Alias<Id, ArcType<Id>>>,
@@ -680,7 +680,7 @@ impl<'a, 'ast, Id> IntoIterator for &'a mut ValueBindings<'ast, Id> {
 
 #[derive(Eq, PartialEq, Debug, AstClone)]
 pub struct ValueBinding<'ast, Id> {
-    pub metadata: Metadata,
+    pub metadata: BaseMetadata<'ast>,
     pub name: SpannedPattern<'ast, Id>,
     pub typ: Option<AstType<'ast, Id>>,
     pub resolved_type: ArcType<Id>,
@@ -1272,8 +1272,8 @@ impl_ast_arena! {
     SpannedExpr<'ast, Id> => exprs,
     SpannedPattern<'ast, Id> => patterns,
     PatternField<'ast, Id> => pattern_field,
-    ExprField<Id, ArcType<Id>> => expr_field_types,
-    ExprField<Id, SpannedExpr<'ast, Id>> => expr_field_exprs,
+    ExprField<'ast, Id, ArcType<Id>> => expr_field_types,
+    ExprField<'ast, Id, SpannedExpr<'ast, Id>> => expr_field_exprs,
     TypeBinding<'ast, Id> => type_bindings,
     ValueBinding<'ast, Id> => value_bindings,
     Do<'ast, Id> => do_exprs,
@@ -1284,6 +1284,7 @@ impl_ast_arena! {
     Generic<Id> => generics,
     Field<Id, AstType<'ast, Id>> => type_fields,
     Field<Id, Alias<Id, AstType<'ast, Id>>> => type_type_fields,
+    Metadata => metadata,
 }
 
 pub struct RootExpr<Id: 'static> {
@@ -1494,7 +1495,8 @@ impl<'ast, Id, T> AstClone<'ast, Id> for PhantomData<T> {
 impl<'ast, Id, T> AstClone<'ast, Id> for Arc<[crate::types::AliasData<Id, T>]>
 where
     Id: Clone + AstClone<'ast, Id>,
-    T: AstClone<'ast, Id>,
+    T: AstClone<'ast, Id> + TypePtr<Id = Id>,
+    T::Generics: AstClone<'ast, Id>,
 {
     fn ast_clone(&self, arena: ArenaRef<'_, 'ast, Id>) -> Self {
         Arc::from(self.iter().map(|e| e.ast_clone(arena)).collect::<Vec<_>>())

base/src/ast.rs

@@ -1,4 +1,4 @@
-use std::{collections::BTreeMap, fmt, sync::Arc};
+use std::{collections::BTreeMap, fmt, mem, sync::Arc};
 
 use crate::{
     ast::Argument,
@@ -52,6 +52,17 @@ impl fmt::Display for Attribute {
     }
 }
 
+#[derive(Debug, Default, Eq, PartialEq, Hash, gluon_codegen::AstClone)]
+pub struct BaseMetadata<'ast> {
+    pub metadata: Option<&'ast mut Metadata>,
+}
+
+impl From<BaseMetadata<'_>> for Metadata {
+    fn from(meta: BaseMetadata<'_>) -> Self {
+        meta.metadata.map(|m| m.clone()).unwrap_or_default()
+    }
+}
+
 #[derive(Clone, Debug, Default, Eq, PartialEq, Hash)]
 #[cfg_attr(feature = "serde_derive", derive(Deserialize, Serialize))]
 pub struct Metadata {
@@ -124,6 +135,17 @@ impl Metadata {
         }
     }
 
+    pub fn merge_with_base(mut self, other: &BaseMetadata<'_>) -> Self {
+        self.merge_with_base_ref(other);
+        self
+    }
+
+    pub fn merge_with_base_ref(&mut self, other: &BaseMetadata<'_>) {
+        if let Some(other) = &other.metadata {
+            self.merge_with_ref(other);
+        }
+    }
+
     pub fn get_attribute(&self, name: &str) -> Option<&str> {
         self.attributes()
             .find(|attribute| attribute.name == name)
@@ -134,3 +156,41 @@ impl Metadata {
         self.attributes.iter()
     }
 }
+
+impl<'ast> BaseMetadata<'ast> {
+    pub fn has_data(&self) -> bool {
+        self.metadata.is_some()
+    }
+
+    pub fn merge(&mut self, metadata: BaseMetadata<'ast>) {
+        match &mut self.metadata {
+            Some(self_) => {
+                if let Some(metadata) = metadata.metadata {
+                    self_.merge_with(mem::take(metadata));
+                }
+            }
+            None => *self = metadata,
+        }
+    }
+
+    pub fn comment(&self) -> Option<&Comment> {
+        self.metadata.as_ref().and_then(|m| m.comment.as_ref())
+    }
+
+    pub fn get_attribute(&self, name: &str) -> Option<&str> {
+        self.attributes()
+            .find(|attribute| attribute.name == name)
+            .map(|t| t.arguments.as_ref().map_or("", |s| s))
+    }
+
+    pub fn attributes(&self) -> impl Iterator<Item = &Attribute> {
+        self.metadata.iter().flat_map(|m| m.attributes())
+    }
+
+    pub fn to_metadata(&self) -> Metadata {
+        self.metadata
+            .as_ref()
+            .map(|m| (**m).clone())
+            .unwrap_or_default()
+    }
+}

base/src/metadata.rs

@@ -40,6 +40,12 @@ impl fmt::Display for Location {
     }
 }
 
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Default)]
+pub struct Positioned<T, Pos> {
+    pub pos: Pos,
+    pub value: T,
+}
+
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Default)]
 pub struct Spanned<T, Pos> {
     pub span: Span<Pos>,

base/src/pos.rs

@@ -13,7 +13,7 @@ use crate::serde::ser::{SerializeState, Serializer};
 
 use crate::kind::ArcKind;
 use crate::symbol::Symbol;
-use crate::types::{AliasData, ArcType, Type, TypeExt, TypePtr};
+use crate::types::{AliasData, ArcType, Generic, Type, TypeExt, TypePtr};
 
 #[derive(Default)]
 pub struct SeSeed {
@@ -88,6 +88,7 @@ where
         + Clone
         + ::std::any::Any
         + DeserializeState<'de, Seed<Id, T>>,
+    T::Generics: Default + Extend<Generic<Id>> + Clone,
 {
     let seed = SharedSeed::new(seed);
     DeserializeSeed::deserialize(seed, deserializer).map(|vec: Vec<_>| Arc::from(vec))