Merge remote-tracking branch 'origin/main' into jou-valgrind

self_hosted/runs_wrong.txt

@@ -43,3 +43,4 @@ tests/wrong_type/assert.jou
 tests/wrong_type/cannot_be_indexed.jou
 tests/wrong_type/index.jou
 stdlib/ascii.jou
+tests/should_succeed/ascii_test.jou

self_hosted/typecheck.jou

@@ -833,6 +833,12 @@ class Stage3TypeChecker:
                 )
             fail(call->location, message)
 
+        if call->method_call_self != NULL and not call->uses_arrow_operator:
+            snprintf(
+                message, sizeof message,
+                "cannot take address of %%s, needed for calling the %s() method", call->name)
+            ensure_can_take_address(call->method_call_self, message)
+
         signature_string = signature->to_string(False, False)
 
         expected = signature->nargs

src/print.c

@@ -19,7 +19,7 @@ static void print_string(const char *s, int len)
         else if (s[i] == '\n')
             printf("\\n");
         else
-            printf("\\x%02x", s[i]);     // TODO: \x is not yet recognized by the tokenizer
+            printf("\\x%02x", (unsigned char)s[i]);     // TODO: \x is not yet recognized by the tokenizer
     }
     putchar('"');
 }

src/typecheck.c

@@ -1028,6 +1028,14 @@ static ExpressionTypes *typecheck_expression(FileTypes *ft, const AstExpression
     case AST_EXPR_CALL_METHOD:
         temptype = typecheck_expression_not_void(ft, expr->data.methodcall.obj)->type;
         result = typecheck_function_or_method_call(ft, &expr->data.methodcall.call, temptype, expr->location);
+
+        char tmp[500];
+        snprintf(
+            tmp, sizeof tmp,
+            "cannot take address of %%s, needed for calling the %s() method",
+            expr->data.methodcall.call.calledname);
+        ensure_can_take_address(expr->data.methodcall.obj, tmp);
+
         if (!result)
             return NULL;
         break;

stdlib/ascii.jou

@@ -2,27 +2,23 @@ import "stdlib/str.jou"
 import "stdlib/mem.jou"
 
 # Test if a string is ASCII only.
-# TODO: test
 def is_ascii(s: byte*) -> bool:
     for p = s; *p != '\0'; p++:
         if *p >= 128:
             return False
     return True
 
 # Check for '0', '1', ..., '9'.
-# TODO: test
 def is_ascii_digit(b: byte) -> bool:
     return '0' <= b and b <= '9'
 
 # Checks if the given byte is an ASCII punctuation character, such as '*' or '_' or '"'.
-# TODO: test
 def is_ascii_punctuation(b: byte) -> bool:
-    return strchr("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", b) != NULL
+    return b != '\0' and strchr("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", b) != NULL
 
 # Checks if the given byte is an ASCII whitespace character, such as ' ' or '\n'.
-# TODO: test
 def is_ascii_whitespace(b: byte) -> bool:
-    return strchr("\t\n\x0b\x0c\r\x1c\x1d\x1e\x1f ", b) != NULL
+    return b != '\0' and strchr("\t\n\x0b\x0c\r\x1c\x1d\x1e\x1f ", b) != NULL
 
 # Removes ASCII whitespace from both ends of a string in-place.
 # Similar to .strip() in Python or .trim() in JavaScript.

tests/other_errors/func_then_method.jou

@@ -0,0 +1,11 @@
+import "stdlib/io.jou"
+
+class Foo:
+    def do_stuff(self) -> void:
+        printf("Doing stuff!\n")
+
+def make_foo() -> Foo:
+    return Foo{}
+
+def bar() -> void:
+    make_foo().do_stuff()  # Error: cannot take address of a function call, needed for calling the do_stuff() method

tests/should_succeed/ascii_test.jou

@@ -0,0 +1,35 @@
+import "stdlib/ascii.jou"
+import "stdlib/str.jou"
+
+def main() -> int:
+    assert is_ascii("hello")
+    assert is_ascii("hello world test!!! @$!")
+    assert is_ascii("")
+    assert not is_ascii("örkkimörkki")
+
+    assert is_ascii_digit('0')
+    assert is_ascii_digit('7')
+    assert is_ascii_digit('9')
+    assert not is_ascii_digit('x')
+    assert not is_ascii_digit('\0')
+
+    assert is_ascii_punctuation('!')
+    assert is_ascii_punctuation('_')
+    assert not is_ascii_punctuation('a')
+    assert not is_ascii_punctuation('2')
+    assert not is_ascii_punctuation('\0')
+
+    assert is_ascii_whitespace(' ')
+    assert is_ascii_whitespace('\t')
+    assert is_ascii_whitespace('\r')
+    assert is_ascii_whitespace('\n')
+    assert not is_ascii_whitespace('a')
+    assert not is_ascii_whitespace('.')
+    assert not is_ascii_whitespace('\0')
+
+    s: byte[100]
+    strcpy(s, "  hello world \r\n  \t ")
+    trim_ascii_whitespace(s)
+    assert strcmp(s, "hello world") == 0
+
+    return 0