Rename string_Order_fn to cmp_String, close #1277 (#1310)

* Rename string_Order_fn to cmp_String, close #1277

* fix tests

Author: johnynek

c_runtime/bosatsu_ext_Bosatsu_l_Predef.c

@@ -195,7 +195,7 @@ BValue ___bsts_g_Bosatsu_l_Predef_l_shift__right__Int(BValue a, BValue b) {
   return bsts_integer_shift_left(a, negb);
 }
 
-BValue ___bsts_g_Bosatsu_l_Predef_l_string__Order__fn(BValue a, BValue b) {
+BValue ___bsts_g_Bosatsu_l_Predef_l_cmp__String(BValue a, BValue b) {
   int result = bsts_string_cmp(a, b);
   // -1, 0, 1, but we map to 0, 1, 2 which are the adt tags for LT, EQ, GT
   return alloc_enum0(result + 1);

c_runtime/bosatsu_ext_Bosatsu_l_Predef.h

@@ -34,7 +34,7 @@ BValue ___bsts_g_Bosatsu_l_Predef_l_shift__left__Int(BValue a, BValue b);
 
 BValue ___bsts_g_Bosatsu_l_Predef_l_shift__right__Int(BValue a, BValue b);
 
-BValue ___bsts_g_Bosatsu_l_Predef_l_string__Order__fn(BValue a, BValue b);
+BValue ___bsts_g_Bosatsu_l_Predef_l_cmp__String(BValue a, BValue b);
 
 BValue ___bsts_g_Bosatsu_l_Predef_l_string__to__Int(BValue a);
 

cli/src/test/scala/org/bykn/bosatsu/codegen/clang/ClangGenTest.scala

@@ -45,7 +45,7 @@ class ClangGenTest extends munit.FunSuite {
       To inspect the code, change the hash, and it will print the code out
      */
     testFilesCompilesToHash("test_workspace/Ackermann.bosatsu")(
-      "89743844829c5b4266b0c4a17ab21c52"
+      "260c81bc79b6232a3f174cb9afc04143"
     )
   }
 }

core/src/main/resources/bosatsu/predef.bosatsu

@@ -81,7 +81,7 @@ export (
   reverse,
   reverse_concat,
   sub,
-  string_Order_fn,
+  cmp_String,
   string_Order,
   times,
   trace,
@@ -236,8 +236,8 @@ external struct String
 external struct Char
 
 external def char_to_String(c: Char) -> String
-external def string_Order_fn(str0: String, str1: String) -> Comparison
-string_Order = Order(string_Order_fn)
+external def cmp_String(str0: String, str1: String) -> Comparison
+string_Order = Order(cmp_String)
 external def concat_String(items: List[String]) -> String
 
 # if this returns Some((a, b)) then arg == concat_String([a, sep, b])

core/src/main/scala/org/bykn/bosatsu/Predef.scala

@@ -59,8 +59,8 @@ object Predef {
       .add(packageName, "trace", FfiCall.Fn2(PredefImpl.trace(_, _)))
       .add(
         packageName,
-        "string_Order_fn",
-        FfiCall.Fn2(PredefImpl.string_Order_Fn(_, _))
+        "cmp_String",
+        FfiCall.Fn2(PredefImpl.cmp_String(_, _))
       )
       .add(
         packageName,
@@ -245,7 +245,7 @@ object PredefImpl {
     v
   }
 
-  def string_Order_Fn(a: Value, b: Value): Value =
+  def cmp_String(a: Value, b: Value): Value =
     (a, b) match {
       case (Value.Str(sa), Value.Str(sb)) =>
         Value.Comparison.fromInt(sa.compareTo(sb))

core/src/main/scala/org/bykn/bosatsu/codegen/python/PythonGen.scala

@@ -1042,7 +1042,7 @@ object PythonGen {
               2
             )
           ),
-          (Identifier.unsafeBindable("string_Order_fn"), (cmpFn, 2))
+          (Identifier.unsafeBindable("cmp_String"), (cmpFn, 2))
         )
 
       def bosatsuListToPython(

core/src/test/scala/org/bykn/bosatsu/EvaluationTest.scala

@@ -49,7 +49,7 @@ package Foo
 foo = "hello"
 
 def eq_String(a, b):
-  match string_Order_fn(a, b):
+  match cmp_String(a, b):
     case EQ: True
     case _: False
 
@@ -1413,9 +1413,7 @@ package A
 pairs = [("hello", 42), ("hello1", 24)]
 
 def is_hello(s):
-  match s.string_Order_fn("hello"):
-    case EQ: True
-    case _: False
+  s.cmp_String("hello") matches EQ
 
 e = { k: v for (k, v) in pairs if is_hello(k) }
 lst = e.items()
@@ -2145,7 +2143,7 @@ def equal_RowEntry(re1, re2):
   match (re1, re2):
     case (REBool(RecordValue(x1)), REBool(RecordValue(x2))): cmp_Bool.equals(x1, x2)
     case (REInt(RecordValue(x1)), REInt(RecordValue(x2))): cmp_Int.equals(x1, x2)
-    case (REString(RecordValue(x1)), REString(RecordValue(x2))): string_Order_fn.equals(x1, x2)
+    case (REString(RecordValue(x1)), REString(RecordValue(x2))): cmp_String.equals(x1, x2)
     case _: False
 
 equal_rows = (a, b) -> equal_List(equal_RowEntry, a, b)

test_workspace/Bar.bosatsu

@@ -1,4 +1,4 @@
 from Foo import x
 
 test = Assertion(
-  string_Order_fn(x, "this is Foo") matches EQ, "got the right string")
+  cmp_String(x, "this is Foo") matches EQ, "got the right string")

test_workspace/PatternExamples.bosatsu

@@ -6,7 +6,7 @@ bar = "this is bar"
 combine = "foo: ${foo} bar: ${bar}"
 
 def operator ==(a, b):
-  string_Order_fn(a, b) matches EQ
+  cmp_String(a, b) matches EQ
 
 def operator &&(a, b):
     if a: b

test_workspace/recordset.bosatsu

@@ -94,9 +94,7 @@ def and(x, y):
 operator && = and
 
 def equals(compare, x, y):
-  match compare(x,y):
-    EQ: True
-    _: False
+  compare(x,y) matches EQ
 
 def cmp_Bool(x, y):
   match (x, y):
@@ -117,7 +115,7 @@ def equal_RowEntry(re1, re2):
   match (re1, re2):
     (REBool(RecordValue(x1)), REBool(RecordValue(x2))): cmp_Bool.equals(x1, x2)
     (REInt(RecordValue(x1)), REInt(RecordValue(x2))): cmp_Int.equals(x1, x2)
-    (REString(RecordValue(x1)), REString(RecordValue(x2))): string_Order_fn.equals(x1, x2)
+    (REString(RecordValue(x1)), REString(RecordValue(x2))): cmp_String.equals(x1, x2)
     _: False
 
 equal_rows = (a, b) -> equal_List(equal_RowEntry, a, b)