Expand builtins and standard library

compiler_v4/src/ast.rs

@@ -131,6 +131,7 @@ pub struct AstImpl {
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct AstAssignment {
+    pub display_span: Range<Offset>,
     pub name: AstResult<AstString>,
     pub type_: Option<AstResult<AstType>>,
     pub equals_sign_error: Option<AstError>,

compiler_v4/src/ast_to_hir.rs

@@ -985,10 +985,15 @@ impl<'a> Context<'a> {
 
         let id = self.id_generator.generate();
         // TODO: infer type
-        let type_ = assignment
-            .type_
-            .as_ref()
-            .map_or(Type::Error, |it| self.lower_type(&[], None, it.value()));
+        let type_ = if let Some(type_) = assignment.type_.as_ref() {
+            self.lower_type(&[], None, type_.value())
+        } else {
+            self.add_error(
+                assignment.display_span.clone(),
+                "Assignment is missing a type",
+            );
+            Type::Error
+        };
 
         match self.global_identifiers.entry(name.string.clone()) {
             Entry::Occupied(mut entry) => {

compiler_v4/src/hir.rs

@@ -184,6 +184,9 @@ impl ToText for (&str, &TraitDefinition) {
                 .sorted_by_key(|(_, it)| it.signature.name.clone()),
             |builder, (id, function)| (*id, *function).build_text(builder),
         );
+        if !definition.functions.is_empty() {
+            builder.push_newline();
+        }
         builder.push("}");
     }
 }
@@ -254,6 +257,9 @@ impl ToText for Impl {
                 (*id, *function).build_text(builder);
             },
         );
+        if !self.functions.is_empty() {
+            builder.push_newline();
+        }
         builder.push("}");
     }
 }
@@ -363,6 +369,10 @@ impl NamedType {
     pub fn ordering() -> Self {
         Self::new("Ordering", [])
     }
+    #[must_use]
+    pub fn result(t: impl Into<Type>, e: impl Into<Type>) -> Self {
+        Self::new("Result", [t.into(), e.into()])
+    }
 }
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct ParameterType {
@@ -723,7 +733,16 @@ pub struct SwitchCase {
 #[strum(serialize_all = "camelCase")]
 pub enum BuiltinFunction {
     IntAdd,
+    IntBitwiseAnd,
+    IntBitwiseOr,
+    IntBitwiseXor,
     IntCompareTo,
+    IntDivideTruncating,
+    IntMultiply,
+    IntParse,
+    IntRemainder,
+    IntShiftLeft,
+    IntShiftRight,
     IntSubtract,
     IntToText,
     ListFilled,
@@ -740,7 +759,11 @@ pub enum BuiltinFunction {
     ListReplace,
     Panic,
     Print,
+    TextCompareTo,
     TextConcat,
+    TextGetRange,
+    TextIndexOf,
+    TextLength,
 }
 impl BuiltinFunction {
     #[must_use]
@@ -761,6 +784,36 @@ impl BuiltinFunction {
                 .into(),
                 return_type: NamedType::int().into(),
             },
+            Self::IntBitwiseAnd => BuiltinFunctionSignature {
+                name: "builtinIntBitwiseAnd".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("a".into(), NamedType::int().into()),
+                    ("b".into(), NamedType::int().into()),
+                ]
+                .into(),
+                return_type: NamedType::int().into(),
+            },
+            Self::IntBitwiseOr => BuiltinFunctionSignature {
+                name: "builtinIntBitwiseOr".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("a".into(), NamedType::int().into()),
+                    ("b".into(), NamedType::int().into()),
+                ]
+                .into(),
+                return_type: NamedType::int().into(),
+            },
+            Self::IntBitwiseXor => BuiltinFunctionSignature {
+                name: "builtinIntBitwiseXor".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("a".into(), NamedType::int().into()),
+                    ("b".into(), NamedType::int().into()),
+                ]
+                .into(),
+                return_type: NamedType::int().into(),
+            },
             Self::IntCompareTo => BuiltinFunctionSignature {
                 name: "builtinIntCompareTo".into(),
                 type_parameters: Box::default(),
@@ -771,12 +824,68 @@ impl BuiltinFunction {
                 .into(),
                 return_type: NamedType::ordering().into(),
             },
+            Self::IntDivideTruncating => BuiltinFunctionSignature {
+                name: "builtinIntDivideTruncating".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("dividend".into(), NamedType::int().into()),
+                    ("divisor".into(), NamedType::int().into()),
+                ]
+                .into(),
+                return_type: NamedType::int().into(),
+            },
+            Self::IntMultiply => BuiltinFunctionSignature {
+                name: "builtinIntMultiply".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("factorA".into(), NamedType::int().into()),
+                    ("factorB".into(), NamedType::int().into()),
+                ]
+                .into(),
+                return_type: NamedType::int().into(),
+            },
+            Self::IntParse => BuiltinFunctionSignature {
+                name: "builtinIntParse".into(),
+                type_parameters: Box::default(),
+                parameters: [("text".into(), NamedType::text().into())].into(),
+                return_type: NamedType::result(NamedType::int(), NamedType::text()).into(),
+            },
+            Self::IntRemainder => BuiltinFunctionSignature {
+                name: "builtinIntRemainder".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("dividend".into(), NamedType::int().into()),
+                    ("divisor".into(), NamedType::int().into()),
+                ]
+                .into(),
+                return_type: NamedType::int().into(),
+            },
+            Self::IntShiftLeft => BuiltinFunctionSignature {
+                name: "builtinIntShiftLeft".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("value".into(), NamedType::int().into()),
+                    ("amount".into(), NamedType::int().into()),
+                ]
+                .into(),
+                return_type: NamedType::int().into(),
+            },
+            Self::IntShiftRight => BuiltinFunctionSignature {
+                name: "builtinIntShiftRight".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("value".into(), NamedType::int().into()),
+                    ("amount".into(), NamedType::int().into()),
+                ]
+                .into(),
+                return_type: NamedType::int().into(),
+            },
             Self::IntSubtract => BuiltinFunctionSignature {
                 name: "builtinIntSubtract".into(),
                 type_parameters: Box::default(),
                 parameters: [
-                    ("a".into(), NamedType::int().into()),
-                    ("b".into(), NamedType::int().into()),
+                    ("minuend".into(), NamedType::int().into()),
+                    ("subtrahend".into(), NamedType::int().into()),
                 ]
                 .into(),
                 return_type: NamedType::int().into(),
@@ -931,6 +1040,16 @@ impl BuiltinFunction {
                 parameters: [("message".into(), NamedType::text().into())].into(),
                 return_type: NamedType::nothing().into(),
             },
+            Self::TextCompareTo => BuiltinFunctionSignature {
+                name: "builtinTextCompareTo".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("a".into(), NamedType::text().into()),
+                    ("b".into(), NamedType::text().into()),
+                ]
+                .into(),
+                return_type: NamedType::ordering().into(),
+            },
             Self::TextConcat => BuiltinFunctionSignature {
                 name: "builtinTextConcat".into(),
                 type_parameters: Box::default(),
@@ -941,6 +1060,33 @@ impl BuiltinFunction {
                 .into(),
                 return_type: NamedType::text().into(),
             },
+            Self::TextGetRange => BuiltinFunctionSignature {
+                name: "builtinTextGetRange".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("text".into(), NamedType::text().into()),
+                    ("startInclusive".into(), NamedType::int().into()),
+                    ("endExclusive".into(), NamedType::int().into()),
+                ]
+                .into(),
+                return_type: NamedType::text().into(),
+            },
+            Self::TextIndexOf => BuiltinFunctionSignature {
+                name: "builtinTextIndexOf".into(),
+                type_parameters: Box::default(),
+                parameters: [
+                    ("a".into(), NamedType::text().into()),
+                    ("b".into(), NamedType::text().into()),
+                ]
+                .into(),
+                return_type: NamedType::maybe(NamedType::int()).into(),
+            },
+            Self::TextLength => BuiltinFunctionSignature {
+                name: "builtinTextLength".into(),
+                type_parameters: Box::default(),
+                parameters: [("text".into(), NamedType::text().into())].into(),
+                return_type: NamedType::int().into(),
+            },
         }
     }
 }