Replaced Dict with more versatile Table which can take keys of any ty…

…pe. Also changed 'Get' to '.'
cognate-lang · Aug 31, 2024 · 2151742 · 2151742
1 parent 05c166f
commit 2151742
Show file tree

Hide file tree

Showing 7 changed files with 150 additions and 82 deletions.
diff --git a/src/builtins.c b/src/builtins.c
@@ -110,9 +110,9 @@
 {.name="cosh",                  .calltype=call, .argc=1, .args={number},      .returns=true, .rettype=number},
 {.name="tanh",                  .calltype=call, .argc=1, .args={number},      .returns=true, .rettype=number},
 
-{.name="dict",                  .calltype=call, .argc=1, .args={block}, .returns=true, .rettype=dict},
-{.name="insert",                .calltype=call, .argc=3, .args={string, any, dict}, .returns=true, .rettype=dict},
-{.name="get",                   .calltype=call, .argc=2, .args={string, dict}, .returns=true, .rettype=any},
+{.name="table",                 .calltype=call, .argc=1, .args={block}, .returns=true, .rettype=table},
+{.name="insert",                .calltype=call, .argc=3, .args={any, any, table}, .returns=true, .rettype=table},
+{.name=".",                     .calltype=call, .argc=2, .args={any, table}, .returns=true, .rettype=any},
 
 /* Builtin stack operations */
 //{.name="drop",                .calltype=stack_op, .stack_shuffle=&drop_register},

diff --git a/src/cognac.c b/src/cognac.c
@@ -727,7 +727,7 @@ const char* print_val_type(val_type_t type)
 	switch (type)
 	{
 		case number: return "number";
-		case dict:   return "dict";
+		case table:   return "table";
 		case symbol: return "symbol";
 		case string: return "string";
 		case block:  return "block";
@@ -749,7 +749,7 @@ const char* c_val_type(val_type_t type)
 	switch (type)
 	{
 		case number: return "NUMBER";
-		case dict:   return "DICT";
+		case table:   return "TABLE";
 		case symbol: return "SYMBOL";
 		case string: return "STRING";
 		case block:  return "BLOCK";
@@ -771,7 +771,8 @@ char* sanitize(char* s)
 	{
 		switch(str[i])
 		{
-			case '-':  str[i] = 'D'; break;
+			case '.':  str[i] = 'D'; break;
+			case '-':  str[i] = 'H'; break;
 			case '!':  str[i] = 'X'; break;
 			case '?':  str[i] = 'Q'; break;
 			case '=':  str[i] = 'E'; break;

diff --git a/src/cognac.h b/src/cognac.h
@@ -61,7 +61,7 @@ typedef enum _val_type_t
 	NIL=0,
 	number,
 	symbol,
-	dict,
+	table,
 	string,
 	boolean,
 	block,

diff --git a/src/lexer.l b/src/lexer.l
@@ -26,8 +26,8 @@ int last_openbrace_col;
 
 %x BLOCK_COMMENT
 
-ALLOWCHAR [A-Za-z0-9\-\?\!\'\+\/\*\>\=\<\^]
-FORMAL    [A-Z\-\?\!\+\/\*\>\<\=\^]
+ALLOWCHAR [A-Za-z0-9\-\?\!\'\+\/\*\>\=\<\^\.]
+FORMAL    [A-Z\-\?\!\+\/\*\>\<\=\^\.]
 END       [;\(\)$^\~[:space:]]
 ESCAPES   [abfnrtv\\\"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,7 +61,7 @@ typedef enum _val_type_t @@
     	NIL=0,
     	number,
     	symbol,
-    	dict,
+    	table,
     	string,
     	boolean,
     	block,
@@ Expand Down @@