refactor: remove in-place union operator |= UI test cases. (#155)

kcl-lang · Aug 18, 2022 · 5e0ec29 · 5e0ec29
1 parent c752099
commit 5e0ec29
Show file tree

Hide file tree

Showing 36 changed files with 17 additions and 327 deletions.
diff --git a/kclvm/runner/src/exec_data/aug_assign.k b/kclvm/runner/src/exec_data/aug_assign.k
@@ -14,7 +14,6 @@ schema Data:
         }
     }
 
-    _alice.name |= {last: "value"}
     _alice.name.age += 1
     alice = _alice
 
@@ -26,6 +25,5 @@ _alice = A {
     }
 }
 
-_alice.name |= {last: "value"}
 _alice.name.age += 1
 alice = _alice
diff --git a/test/grammar/attr_operator/schema_inside/unification/test_4/main.k b/test/grammar/attr_operator/schema_inside/unification/test_4/main.k
@@ -2,7 +2,7 @@ schema Config:
     [str]: str
 
 _c = Config {}
-_c |= {
+_c: Config {
     key = "value"
 }
 c = _c
diff --git a/test/grammar/multi_file_compilation/simple/simple_2/pkg.k b/test/grammar/multi_file_compilation/simple/simple_2/pkg.k
@@ -1,4 +1,4 @@
-_list_data |= [1]
-_dict_data |= {"key2": "value2"}
+_list_data = [1]
+_dict_data = {"key2": "value2"}
 list_data = _list_data
 dict_data = _dict_data
diff --git a/test/grammar/multi_file_compilation/simple/simple_2/stdout.golden b/test/grammar/multi_file_compilation/simple/simple_2/stdout.golden
@@ -2,5 +2,4 @@ var: 1
 list_data:
 - 1
 dict_data:
-  key1: value1
   key2: value2
diff --git a/test/grammar/schema/index_signature/normal_4/main.k b/test/grammar/schema/index_signature/normal_4/main.k
@@ -4,7 +4,7 @@ schema S:
 _s: S {
     a += [1]
 }
-_s |= {
+_s: S {
     b += [1]
 }
 s = _s
diff --git a/test/grammar/schema/init/init_if_expr_1/main.k b/test/grammar/schema/init/init_if_expr_1/main.k
@@ -5,7 +5,7 @@ schema Person:
     info?: {str: int|str}
 
 schema InfoMixin:
-    info |= {"age": age} if age else {}
+    info = {"age": age} if age else {}
 
 alice = Person {
     "name": "alice",

diff --git a/test/grammar/schema/init/init_if_expr_1/stdout.golden b/test/grammar/schema/init/init_if_expr_1/stdout.golden
@@ -2,8 +2,8 @@ alice:
   name: alice
   age: 10
   info:
-    gender: girl
     age: 10
+    gender: girl
 John:
   name: john
   age: null

diff --git a/test/grammar/schema/init/init_if_expr_2/main.k b/test/grammar/schema/init/init_if_expr_2/main.k
diff --git a/test/grammar/schema/init/init_if_expr_2/stdout.golden b/test/grammar/schema/init/init_if_expr_2/stdout.golden
diff --git a/test/grammar/schema/init/init_if_expr_3/main.k b/test/grammar/schema/init/init_if_expr_3/main.k
diff --git a/test/grammar/schema/init/init_if_expr_3/stdout.golden b/test/grammar/schema/init/init_if_expr_3/stdout.golden
diff --git a/test/grammar/schema/init/init_if_expr_4/main.k b/test/grammar/schema/init/init_if_expr_4/main.k
diff --git a/test/grammar/schema/init/init_if_expr_4/stdout.golden b/test/grammar/schema/init/init_if_expr_4/stdout.golden
diff --git a/test/grammar/schema/init/init_outside_var_1/main.k b/test/grammar/schema/init/init_outside_var_1/main.k
diff --git a/test/grammar/schema/init/init_outside_var_1/stdout.golden b/test/grammar/schema/init/init_outside_var_1/stdout.golden
diff --git a/test/grammar/schema/irrelevant_order/complex_4/main.k b/test/grammar/schema/irrelevant_order/complex_4/main.k
diff --git a/test/grammar/schema/irrelevant_order/complex_4/stdout.golden b/test/grammar/schema/irrelevant_order/complex_4/stdout.golden
diff --git a/test/grammar/schema/irrelevant_order/for_2/main.k b/test/grammar/schema/irrelevant_order/for_2/main.k
@@ -3,7 +3,7 @@ schema Data:
     data: {str:str} = {
         "key1": "value1"
     }
-    data |= {
+    data = {
         "key2": "value2"
     }
     dataOther = {**data}

diff --git a/test/grammar/schema/irrelevant_order/for_2/stdout.golden b/test/grammar/schema/irrelevant_order/for_2/stdout.golden
@@ -1,10 +1,7 @@
 data:
   keys:
-  - key1
   - key2
   data:
-    key1: value1
     key2: value2
   dataOther:
-    key1: value1
     key2: value2
diff --git a/test/grammar/schema/irrelevant_order/inherit_4/main.k b/test/grammar/schema/irrelevant_order/inherit_4/main.k
@@ -10,7 +10,7 @@ schema AppConfig(Config):
     name: str = "app"
 
     if overQuota:
-        labels |= {
+        labels = {
             "key1": "value1"
             "key2": "value2"
         }

diff --git a/test/grammar/schema/irrelevant_order/inherit_5/main.k b/test/grammar/schema/irrelevant_order/inherit_5/main.k
@@ -10,11 +10,11 @@ schema AppConfig(Config):
     name: str = "app"
 
     if overQuota:
-        labels |= {
+        labels = {
             "key1": "value1"
         }
     if overQuota:
-        labels |= {
+        labels = {
             "key2": "value2"
         }
 

diff --git a/test/grammar/schema/irrelevant_order/inherit_5/stdout.golden b/test/grammar/schema/irrelevant_order/inherit_5/stdout.golden
@@ -8,10 +8,8 @@ appConfig:
   name: app
   help: app
   labels:
-    key1: value1
     key2: value2
   metaLabels:
-    key1: value1
     key2: value2
   overQuota: true
   appName: myApp
diff --git a/test/grammar/schema/irrelevant_order/mixin_2/main.k b/test/grammar/schema/irrelevant_order/mixin_2/main.k
@@ -4,7 +4,7 @@ schema Data:
     metaLabels: {str:} = labels
 
 schema DataMixin:
-    labels |= {
+    labels = {
         "key": "value"  
     }
 

diff --git a/test/grammar/schema/irrelevant_order/mixin_3/main.k b/test/grammar/schema/irrelevant_order/mixin_3/main.k
@@ -1,6 +1,6 @@
 schema ConfigMixin:
     output: str = option("output") or "default_output"
-    data |= {"output": output}
+    data = {"output": output}
 
 schema Config:
     mixin [ConfigMixin]

diff --git a/test/grammar/schema/mixin/schema_field_change_dict/main.k b/test/grammar/schema/mixin/schema_field_change_dict/main.k
diff --git a/test/grammar/schema/mixin/schema_field_change_dict/stdout.golden b/test/grammar/schema/mixin/schema_field_change_dict/stdout.golden
diff --git a/test/grammar/schema/mixin/schema_field_union_list/main.k b/test/grammar/schema/mixin/schema_field_union_list/main.k
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ schema S: @@
     _s: S {
         a += [1]
     }
-    _s |= {
+    _s: S {
         b += [1]
     }
     s = _s