TODO

examples/enums.tk

@@ -1,5 +1,5 @@
 #!/usr/bin/env tako
-// test: todo
+// test: todo type error
 
 boolean = Enum.new(
   true=1,
@@ -10,7 +10,7 @@ boolean.import_literals()
 
 color = Enum
   .based_on(
-    byte[3]
+    [byte; 3]
   )
   .open(
     red=#ff0000,

examples/generic_abstract_data_types.tk

@@ -3,16 +3,16 @@
 
 // A simple, untyped  implementation of S expressions.
 SExpr: Type = struct.new(
-  func: (args: Value[n]),
-  args: SExpr[n],
+  func: (args: [Value; n]),
+  args: [SExpr; n],
   {n: Int},
 )
 
 // A well typed, but little, language using GADTs.
 Expr(
   SubExpr(R: AllowedType): Reference(Expr(SubExpr, R))=Expr,
   R: AllowedType,
-  with {AllowedType = Integer|Boolean}
+  {AllowedType = Integer|Boolean}
 ) = gadt.new(
 
   // Control flow:

takolib/src/parser/mod.rs

@@ -547,6 +547,8 @@ impl<'src, 'toks, T: Iterator<Item = &'toks Token>> ParseState<'src, 'toks, T> {
             self.number_literal(token, location)
         } else if let Ok(token) = self.token_of_type(TokenType::StringLit) {
             self.string_literal(token, location)
+        } else if let Ok(token) = self.token_of_type(TokenType::ColorLit) {
+            self.color_literal(token, location)
         } else {
             return Err(ParseError::UnexpectedTokenTypeInExpression {
                 got: token.kind,
@@ -642,6 +644,16 @@ impl<'src, 'toks, T: Iterator<Item = &'toks Token>> ParseState<'src, 'toks, T> {
         self.ast.add_literal(Literal::Text, location)
     }
 
+    fn color_literal(&mut self, res: Token, location: Location) -> NodeId {
+        assert!(res.kind == TokenType::ColorLit);
+        trace!("Saving literal: {res:?}");
+        let _id = self
+            .ast
+            .string_interner
+            .register_str_by_loc(res.get_src(self.contents), location.start);
+        self.ast.add_literal(Literal::Color, location)
+    }
+
     fn number_literal(&mut self, res: Token, location: Location) -> NodeId {
         assert!(res.kind == TokenType::NumberLit);
         trace!("Saving literal: {res:?}");

takolib/src/test.rs

@@ -1,5 +1,5 @@
 // Integration tests
-use log::{debug, info};
+use log::{trace, info};
 use std::fs;
 use std::path::PathBuf;
 use walkdir::{DirEntry, WalkDir};
@@ -105,7 +105,7 @@ fn parse_example_files() {
         let tokens = crate::parser::tokens::lex(&contents)
             .expect(&format!("Should be able to lex: {file:?}"));
 
-        debug!("Tokens: {tokens:#?}");
+        trace!("Tokens: {tokens:#?}");
 
         // TODO: Use tasks to get 'decorate_error:
         let _ast = crate::parser::parse(&file, &contents, &tokens)