Fix #15

Author: sparkprime

parser.cpp

@@ -732,7 +732,7 @@ namespace {
     };
 }
 
-static unsigned long max_builtin = 15;
+static unsigned long max_builtin = 17;
 BuiltinDecl jsonnet_builtin_decl(unsigned long builtin)
 {
     switch (builtin) {
@@ -752,6 +752,8 @@ BuiltinDecl jsonnet_builtin_decl(unsigned long builtin)
         case 13: return {"objectHas", {"obj", "f"}};
         case 14: return {"length", {"x"}};
         case 15: return {"objectFields", {"obj"}};
+        case 16: return {"codepoint", {"str"}};
+        case 17: return {"char", {"n"}};
         default:
         std::cerr << "INTERNAL ERROR: Unrecognized builtin function: " << builtin << std::endl;
         std::abort();

test_suite/std.jsonnet

@@ -88,6 +88,9 @@ std.assertEqual(std.toString([1,2,"foo"]), "[1, 2, \"foo\"]") &&
 std.assertEqual(std.substr("cookie", 1, 3), "ook") &&
 std.assertEqual(std.substr("cookie", 1, 0), "") &&
 
+std.assertEqual(std.codepoint("a"), 97) &&
+std.assertEqual(std.char(97), "a") &&
+
 std.assertEqual(std.map(function(x)x*x, []), []) &&
 std.assertEqual(std.map(function(x)x*x, [1,2,3,4]), [1,4,9,16]) &&
 std.assertEqual(std.map(function(x) x*x, std.filter(function(x)x>5, std.range(1,10))), [36, 49, 64, 81, 100]) &&

vm.cpp

@@ -1574,6 +1574,34 @@ namespace {
                                     }
                                 } break;
 
+                                case 16: { // codepoint
+                                    validateBuiltinArgs(loc, builtin, args, {Value::STRING});
+                                    if (static_cast<HeapString*>(args[0].v.h)->value.length() != 1)
+                                        throw makeError(loc,
+                                                        "codepoint takes a string of length 1, "
+                                                        "got " + type_str(args[0]));
+                                    char c = static_cast<HeapString*>(args[0].v.h)->value[0];
+                                    scratch = makeDouble((unsigned char)(c));
+                                } break;
+
+                                case 17: { // char
+                                    validateBuiltinArgs(loc, builtin, args, {Value::DOUBLE});
+                                    long l = (unsigned long)(args[0].v.d);
+                                    if (l < 0) {
+                                        std::stringstream ss;
+                                        ss << "Codepoints must be >= 0, got " << l;
+                                        throw makeError(ast.location, ss.str());
+                                    }
+                                    if (l >= 128) {
+                                        std::stringstream ss;
+                                        ss << "Sorry, only ASCII supported right now.  ";
+                                        ss << "Codepoints must be < 128, got " << l;
+                                        throw makeError(ast.location, ss.str());
+                                    }
+                                    char c = l;
+                                    scratch = makeString(std::string(&c, 1));
+                                } break;
+
                                 default:
                                 std::cerr << "INTERNAL ERROR: Unrecognized builtin: " << builtin
                                           << std::endl;