Changeset eb7586e for tests

Timestamp:

Apr 28, 2024, 7:50:11 PM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

c5c123f

Parents:

7042c60

Message:

1. Change return value of typed Enum in null context: they now return the position. Therefore, printf with enumeration value will no longer be supported. 2. sout now will return the enumeration value. So sout | enumValue will print what we expect. 3. Provide enum.hfa, which contains traits that related to enum. 4. Implement functions declare in enum.hfa for enum types, so enum type fulfill the traits. Known defeat: error if we use the enum traits on enum types. They work but c compiler gives an warning

Location:

tests/enum_tests

Files:

• .expect/stringEnum.txt (modified) (1 diff)
• anonymous.cfa (modified) (1 diff)
• enumInlineValue.cfa (modified) (1 diff)
• position.cfa (modified) (2 diffs)
• stringEnum.cfa (modified) (2 diffs)
• typedIntEnum.cfa (modified) (2 diffs)

tests/enum_tests/.expect/stringEnum.txt

@@ -1 +1 @@
 zero: zero, one: one
+zero: 0, one: 1

tests/enum_tests/anonymous.cfa

@@ -1 @@
-#include <stdio.h>
+#include <fstream.hfa>
 enum(unsigned long int ) { nthreads = 17 };
 
 int main() {
-    printf("%lu", nthreads);
+    sout | nthreads;
 }
 

tests/enum_tests/enumInlineValue.cfa

@@ -12 +12 @@
     enum enumB val = A;
     sout | "enumB.A is" | val;
-    enum enumB val2= enumB.B;
+    enum enumB val2 = enumB.B;
     sout | "enumB.B is" | val2;
     sout | "enumB.D is" | enumB.D;

tests/enum_tests/position.cfa

@@ -12 +12 @@
 
 int main () {
-    Colour fishy; // posE()
-    fishy = Colour.Green; // value(fishy) = Colour.Green;
-    fishy; // valueE( fishy );
+    Colour fishy;
+    fishy = Colour.Green; 
+    fishy;
+    Colour c2 = fishy;
 
-    printf( "Compile Time: blue value: %s, position: %d, label: %s, default return value: %s \n", valueE(Colour.Blue), posE(Colour.Blue), labelE(Colour.Blue), Colour.Blue );
-    printf( "Runtime: fishy value: %s, position: %d, label: %s, default return value: %s\n", valueE(fishy), posE(fishy), labelE(fishy), fishy );
-    Colour c2 = fishy;
-    printf( "Runtime: C2 value: %s, position: %d, label: %s, default return value: %s\n", valueE(c2), posE(c2), labelE(c2), c2 );
+    sout | "Compile Time: blue value: " | valueE(Colour.Blue) | ", position: " | posE(Colour.Blue) | ", label: " | labelE(Colour.Blue) | ", default return value: " | Colour.Blue;
+    sout | "Runtime: fishy value: " | valueE(fishy) | ", position: " | posE(fishy) | ", label: " | labelE(fishy) | ", default return value: " | fishy;
+    sout | "Runtime: C2 value: " | valueE(c2) | ", position: " | posE(c2) | ", label: " | labelE(c2) | ", default return value: " | c2;
     Colour.Red;
     char * ao = Colour.Red;
@@ -29 +29 @@
     Plain a = B;
     printf( "%d \n", a );
+    
 }

tests/enum_tests/stringEnum.cfa

@@ +1 @@
+#include <fstream.hfa>
 #include <stdio.h>
 
@@ -7 +8 @@
 
 int main() {
-    printf("zero: %s, one: %s\n", zero, one);
+    sout | "zero: "| zero | ", one: " | one;
+    printf("zero: %d, one: %d\n", zero, one);
     return 0;
 }

tests/enum_tests/typedIntEnum.cfa

@@ -1 @@
-#include <stdio.h>
+#include <fstream.hfa>
 
 enum(int) IntEnum {
@@ -12 +12 @@
 
 int main() {
-    printf("0=%d\n", zero);
-    printf("1=%d\n", one);
-    printf("1000=%d\n", thousand);
-    printf("1001=%d\n", thousand_one);
-    printf("2000=%d\n", two_thousand);
-    printf("2001=%d\n", two_thousand_one);
-    printf("2002=%d\n", two_thousand_two);
+    sout | "0=" | zero;
+    sout | "1=" | one;
+    sout | "1000=" | thousand;
+    sout | "1001=" | thousand_one;
+    sout | "2000=" | two_thousand;
+    sout | "2001=" | two_thousand_one;
+    sout | "2002=" | two_thousand_two;
     return 0;
 }