Merge pull request #247 from ThakeeNathees/json-impl

json library added

scripts/amalgamate.py

@@ -66,7 +66,9 @@ def parse(path):
   text = ""  
   with open(path, 'r') as fp:
     for line in fp.readlines():
-      if "//<< AMALG_INLINE >>" in line:
+      if "//<< AMALG_IGNORE >>" in line:
+        continue
+      elif "//<< AMALG_INLINE >>" in line:
         path = join(dir, _get_include_path(line))
         path = path.replace('\\', '/')
         text += parse(path) + '\n'

scripts/run_tests.py

@@ -34,6 +34,7 @@ TEST_SUITE = {
     "modules/dummy.pk",
     "modules/math.pk",
     "modules/io.pk",
+    "modules/json.pk",
   ),
 
   "Random Scripts" : (

src/core/core.c

@@ -518,6 +518,30 @@ DEF(coreOrd,
   }
 }
 
+DEF(coreMin,
+  "min(a:var, b:var) -> Bool\n"
+  "Returns minimum of [a] and [b].") {
+
+  Var a = ARG(1), b = ARG(2);
+  Var islesser = varLesser(vm, a, b);
+  if (VM_HAS_ERROR(vm)) RET(VAR_NULL);
+
+  if (toBool(islesser)) RET(a);
+  RET(b);
+}
+
+DEF(coreMax,
+  "max(a:var, b:var) -> Bool\n"
+  "Returns maximum of [a] and [b].") {
+
+  Var a = ARG(1), b = ARG(2);
+  Var islesser = varLesser(vm, a, b);
+  if (VM_HAS_ERROR(vm)) RET(VAR_NULL);
+
+  if (toBool(islesser)) RET(b);
+  RET(a);
+}
+
 DEF(corePrint,
   "print(...) -> void\n"
   "Write each argument as space seperated, to the stdout and ends with a "
@@ -650,6 +674,8 @@ static void initializeBuiltinFunctions(PKVM* vm) {
   INITIALIZE_BUILTIN_FN("str",       coreToString, 1);
   INITIALIZE_BUILTIN_FN("chr",       coreChr,      1);
   INITIALIZE_BUILTIN_FN("ord",       coreOrd,      1);
+  INITIALIZE_BUILTIN_FN("min",       coreMin,      2);
+  INITIALIZE_BUILTIN_FN("max",       coreMax,      2);
   INITIALIZE_BUILTIN_FN("print",     corePrint,   -1);
   INITIALIZE_BUILTIN_FN("input",     coreInput,   -1);
   INITIALIZE_BUILTIN_FN("exit",      coreExit,    -1);
@@ -1475,17 +1501,19 @@ Closure* getSuperMethod(PKVM* vm, Var self, String* name) {
 
 #define RIGHT_OPERAND "Right operand"
 
-#define CHECK_NUMERIC_OP(op)                                \
+#define CHECK_NUMERIC_OP_AS(op, as)                         \
   do {                                                      \
     double n1, n2;                                          \
     if (isNumeric(v1, &n1)) {                               \
       if (validateNumeric(vm, v2, &n2, RIGHT_OPERAND)) {    \
-        return VAR_NUM(n1 op n2);                           \
+        return as(n1 op n2);                                \
       }                                                     \
       return VAR_NULL;                                      \
     }                                                       \
   } while (false)
 
+#define CHECK_NUMERIC_OP(op) CHECK_NUMERIC_OP_AS(op, VAR_NUM)
+
 #define CHECK_BITWISE_OP(op)                                \
   do {                                                      \
     int64_t i1, i2;                                         \
@@ -1708,7 +1736,7 @@ Var varEqals(PKVM* vm, Var v1, Var v2) {
 }
 
 Var varGreater(PKVM* vm, Var v1, Var v2) {
-  CHECK_NUMERIC_OP(>);
+  CHECK_NUMERIC_OP_AS(>, VAR_BOOL);
   const bool inplace = false;
   CHECK_INST_BINARY_OP(">");
   UNSUPPORTED_BINARY_OP(">");
@@ -1716,7 +1744,7 @@ Var varGreater(PKVM* vm, Var v1, Var v2) {
 }
 
 Var varLesser(PKVM* vm, Var v1, Var v2) {
-  CHECK_NUMERIC_OP(<);
+  CHECK_NUMERIC_OP_AS(< , VAR_BOOL);
   const bool inplace = false;
   CHECK_INST_BINARY_OP("<");
   UNSUPPORTED_BINARY_OP("<");

src/core/value.c

@@ -1451,6 +1451,19 @@ bool isValuesEqual(Var v1, Var v2) {
       return true;
     }
 
+    case OBJ_MAP: {
+      Map *m1 = (Map*) o1, *m2 = (Map*) o2;
+
+      MapEntry* e = m1->entries;
+      for (; e < m1->entries + m1->capacity; e++) {
+        if (IS_UNDEF(e->key)) continue;
+        Var v = mapGet(m2, e->key);
+        if (IS_UNDEF(v)) return false;
+        if (!isValuesEqual(e->value, v)) return false;
+      }
+      return true;
+    }
+
     default:
       return false;
   }

src/core/vm.h

@@ -14,7 +14,7 @@
 
 // The maximum number of temporary object reference to protect them from being
 // garbage collected.
-#define MAX_TEMP_REFERENCE 16
+#define MAX_TEMP_REFERENCE 64
 
 // The capacity of the builtin function array in the VM.
 #define BUILTIN_FN_CAPACITY 50

src/libs/libs.c

@@ -16,6 +16,7 @@ void registerModuleTime(PKVM* vm);
 void registerModuleIO(PKVM* vm);
 void registerModulePath(PKVM* vm);
 void registerModuleOS(PKVM* vm);
+void registerModuleJson(PKVM* vm);
 void registerModuleDummy(PKVM* vm);
 
 // Extra libraries.
@@ -31,6 +32,7 @@ void registerLibs(PKVM* vm) {
   registerModuleIO(vm);
   registerModulePath(vm);
   registerModuleOS(vm);
+  registerModuleJson(vm);
   registerModuleDummy(vm);
 
   registerModuleTerm(vm);

src/libs/std_io.c

@@ -424,10 +424,10 @@ DEF(_open, NULL /* == _fileOpen */) {
 
 void registerModuleIO(PKVM* vm) {
 
-  pkRegisterBuiltinFn(vm, "open", _open, -1, DOCSTRING(_fileOpen));
-
   PkHandle* io = pkNewModule(vm, "io");
 
+  pkRegisterBuiltinFn(vm, "open", _open, -1, DOCSTRING(_fileOpen));
+
   pkReserveSlots(vm, 2);
   pkSetSlotHandle(vm, 0, io);         // slot[0]        = io
   pkSetSlotNumber(vm, 1, 0);          // slot[1]        = 0
@@ -450,6 +450,17 @@ void registerModuleIO(PKVM* vm) {
   pkClassAddMethod(vm, cls_file, "tell",     _fileTell,     0);
   pkReleaseHandle(vm, cls_file);
 
+  // A convinent function to read file by io.readfile(path).
+  pkModuleAddSource(vm, io,
+    "## Reads a file and return it's content as string.\n"
+    "def readfile(filepath)\n"
+    "  fp = File()\n"
+    "  fp.open(filepath, 'r')\n"
+    "  text = fp.read()\n"
+    "  fp.close()\n"
+    "  return text\n"
+    "end\n");
+
   pkRegisterModule(vm, io);
   pkReleaseHandle(vm, io);
 }

src/libs/std_json.c

@@ -0,0 +1,122 @@
+/*
+ *  Copyright (c) 2020-2022 Thakee Nathees
+ *  Copyright (c) 2021-2022 Pocketlang Contributors
+ *  Distributed Under The MIT License
+ */
+
+#include <math.h>
+
+#ifndef PK_AMALGAMATED
+#include "libs.h"
+#include "../core/vm.h"
+#endif
+
+#include "thirdparty/cJSON/cJSON.h" //<< AMALG_INLINE >>
+#include "thirdparty/cJSON/cJSON.c" //<< AMALG_INLINE >>
+
+// TODO:
+// Convert a cJSON object into pocket variable. Note that the depth shouldn't
+// exceed MAX_TEMP_REFERENCE of the PKVM and we should throw error if the dept
+// is too much (cJSON complain at depth 1000), add depth as a parameter.
+static Var _cJsonToPocket(PKVM* vm, cJSON* item) {
+
+  switch ((item->type) & 0xFF) {
+    case cJSON_NULL:
+      return VAR_NULL;
+
+    case cJSON_False:
+      return VAR_FALSE;
+
+    case cJSON_True:
+      return VAR_TRUE;
+
+    case cJSON_Number:
+      return VAR_NUM(item->valuedouble);
+
+    case cJSON_Raw:
+    case cJSON_String: {
+      const char* s = item->valuestring ? item->valuestring : "";
+      return VAR_OBJ(newString(vm, s));
+    }
+
+    case cJSON_Array: {
+      List* list = newList(vm, 8);
+      vmPushTempRef(vm, &list->_super); // list.
+
+      cJSON* elem = item->child;
+      while (elem != NULL) {
+        Var v = _cJsonToPocket(vm, elem);
+        if (IS_OBJ(v)) vmPushTempRef(vm, AS_OBJ(v)); // v.
+        listAppend(vm, list, v);
+        if (IS_OBJ(v)) vmPopTempRef(vm); // v.
+        elem = elem->next;
+      }
+      vmPopTempRef(vm); // list.
+      return VAR_OBJ(list);
+    }
+
+    case cJSON_Object: {
+      Map* map = newMap(vm);
+      vmPushTempRef(vm, &map->_super); // map.
+      cJSON* elem = item->child;
+      while (elem != NULL) {
+        String* key = newString(vm, elem->string);
+        vmPushTempRef(vm, &key->_super); // key.
+        {
+          Var value = _cJsonToPocket(vm, elem);
+          if (IS_OBJ(value)) vmPushTempRef(vm, AS_OBJ(value)); // value.
+          mapSet(vm, map, VAR_OBJ(key), value);
+          if (IS_OBJ(value)) vmPopTempRef(vm); // value.
+        }
+        vmPopTempRef(vm); // key.
+        elem = elem->next;
+      }
+      vmPopTempRef(vm); // map.
+      return VAR_OBJ(map);
+    }
+
+  default:
+    UNREACHABLE();
+  }
+
+  UNREACHABLE();
+}
+
+DEF(_jsonParse,
+  "json.parse(json_str:String) -> var\n"
+  "Parse a json string into pocket lang object.") {
+
+  const char* string;
+  if (!pkValidateSlotString(vm, 1, &string, NULL)) return;
+
+  cJSON* tree = cJSON_Parse(string);
+
+  if (tree == NULL) {
+
+    // TODO: Print the position.
+    // const char* position = cJSON_GetErrorPtr();
+    // if (position != NULL) ...
+    pkSetRuntimeError(vm, "Invalid json string");
+    return;
+  }
+
+  Var obj = _cJsonToPocket(vm, tree);
+  cJSON_Delete(tree);
+
+  // Json is a standard libray "std_json" and has the direct access
+  // to the vm's internal stack.
+  vm->fiber->ret[0] = obj;
+}
+
+/*****************************************************************************/
+/* MODULE REGISTER                                                           */
+/*****************************************************************************/
+
+void registerModuleJson(PKVM* vm) {
+  PkHandle* json = pkNewModule(vm, "json");
+
+  pkModuleAddFunction(vm, json, "parse", _jsonParse, 1);
+
+  pkRegisterModule(vm, json);
+  pkReleaseHandle(vm, json);
+}

src/libs/std_path.c

@@ -13,9 +13,8 @@
 // check if it's MSVC (and tcc in windows) or not for posix headers and
 // Refactor the bellow macro includes.
 
-#define _CWALK_IMPL
 #include "thirdparty/cwalk/cwalk.h" //<< AMALG_INLINE >>
-#undef _CWALK_IMPL
+#include "thirdparty/cwalk/cwalk.c" //<< AMALG_INLINE >>
 
 #include <sys/stat.h>
 
@@ -94,14 +93,25 @@ static char* tryImportPaths(PKVM* vm, char* path, char* buff) {
   size_t path_size = 0;
 
   static const char* EXT[] = {
+    // Path can already end with '.pk' or anything when running from
+    // pkRunFile() so it's mandatory for the bellow empty string.
     "",
+
     ".pk",
     "/_init.pk",
+
 #ifndef PK_NO_DL
-  #ifdef _WIN32
+  #if defined(_WIN32)
     ".dll",
-  #else
+    "/_init.dll",
+
+  #elif defined(__APPLE__)
+    ".dylib",
+    "/_init.dylib",
+
+  #elif defined(__linux__)
     ".so",
+    "/_init.so",
   #endif
 #endif
     NULL, // Sentinal to mark the array end.

src/libs/thirdparty/cJSON/cJSON.h

@@ -0,0 +1,300 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifndef cJSON__h
+#define cJSON__h
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
+#define __WINDOWS__
+#endif
+
+#ifdef __WINDOWS__
+
+/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 3 define options:
+
+CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
+CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
+CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
+
+For *nix builds that support visibility attribute, you can define similar behavior by
+
+setting default visibility to hidden by adding
+-fvisibility=hidden (for gcc)
+or
+-xldscope=hidden (for sun cc)
+to CFLAGS
+
+then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
+
+*/
+
+#define CJSON_CDECL __cdecl
+#define CJSON_STDCALL __stdcall
+
+/* export symbols by default, this is necessary for copy pasting the C and header file */
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_EXPORT_SYMBOLS
+#endif
+
+#if defined(CJSON_HIDE_SYMBOLS)
+#define CJSON_PUBLIC(type)   type CJSON_STDCALL
+#elif defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllexport) type CJSON_STDCALL
+#elif defined(CJSON_IMPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllimport) type CJSON_STDCALL
+#endif
+#else /* !__WINDOWS__ */
+#define CJSON_CDECL
+#define CJSON_STDCALL
+
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
+#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
+#else
+#define CJSON_PUBLIC(type) type
+#endif
+#endif
+
+/* project version */
+#define CJSON_VERSION_MAJOR 1
+#define CJSON_VERSION_MINOR 7
+#define CJSON_VERSION_PATCH 15
+
+#include <stddef.h>
+
+/* cJSON Types: */
+#define cJSON_Invalid (0)
+#define cJSON_False  (1 << 0)
+#define cJSON_True   (1 << 1)
+#define cJSON_NULL   (1 << 2)
+#define cJSON_Number (1 << 3)
+#define cJSON_String (1 << 4)
+#define cJSON_Array  (1 << 5)
+#define cJSON_Object (1 << 6)
+#define cJSON_Raw    (1 << 7) /* raw json */
+
+#define cJSON_IsReference 256
+#define cJSON_StringIsConst 512
+
+/* The cJSON structure: */
+typedef struct cJSON
+{
+    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
+    struct cJSON *next;
+    struct cJSON *prev;
+    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
+    struct cJSON *child;
+
+    /* The type of the item, as above. */
+    int type;
+
+    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
+    char *valuestring;
+    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
+    int valueint;
+    /* The item's number, if type==cJSON_Number */
+    double valuedouble;
+
+    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
+    char *string;
+} cJSON;
+
+typedef struct cJSON_Hooks
+{
+      /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
+      void *(CJSON_CDECL *malloc_fn)(size_t sz);
+      void (CJSON_CDECL *free_fn)(void *ptr);
+} cJSON_Hooks;
+
+typedef int cJSON_bool;
+
+/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_NESTING_LIMIT
+#define CJSON_NESTING_LIMIT 1000
+#endif
+
+/* returns the version of cJSON as a string */
+CJSON_PUBLIC(const char*) cJSON_Version(void);
+
+/* Supply malloc, realloc and free functions to cJSON */
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
+
+/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
+/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length);
+/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated);
+
+/* Render a cJSON entity to text for transfer/storage. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
+/* Render a cJSON entity to text for transfer/storage without any formatting. */
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
+/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
+/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
+/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
+/* Delete a cJSON entity and all subentities. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item);
+
+/* Returns the number of items in an array (or object). */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
+/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
+/* Get item "string" from object. Case insensitive. */
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
+/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
+
+/* Check item type and return its value */
+CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item);
+CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item);
+
+/* These functions check the type of an item */
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
+
+/* These calls create a cJSON item of the appropriate type. */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
+/* raw json */
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
+
+/* Create a string where valuestring references a string so
+ * it will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
+/* Create an object/array that only references it's elements so
+ * they will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
+
+/* These utilities create an Array of count items.
+ * The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count);
+
+/* Append item to the specified array/object. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
+/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
+ * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
+ * writing to `item->string` */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
+/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
+
+/* Remove/Detach items from Arrays/Objects. */
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
+
+/* Update array items. */
+CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
+
+/* Duplicate a cJSON item */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
+/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
+ * need to be released. With recurse!=0, it will duplicate any children connected to the item.
+ * The item->next and ->prev pointers are always zero on return from Duplicate. */
+/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
+ * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
+
+/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings.
+ * The input pointer json cannot point to a read-only address area, such as a string constant, 
+ * but should point to a readable and writable address area. */
+CJSON_PUBLIC(void) cJSON_Minify(char *json);
+
+/* Helper functions for creating and adding items to an object at the same time.
+ * They return the added item or NULL on failure. */
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
+
+/* When assigning an integer value, it needs to be propagated to valuedouble too. */
+#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
+/* helper for the cJSON_SetNumberValue macro */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
+#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
+/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
+CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
+
+/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/
+#define cJSON_SetBoolValue(object, boolValue) ( \
+    (object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \
+    (object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \
+    cJSON_Invalid\
+)
+
+/* Macro for iterating over an array or object */
+#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
+
+/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
+CJSON_PUBLIC(void) cJSON_free(void *object);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

tests/lang/builtin_fn.pk

@@ -8,5 +8,22 @@ assert(list_join([1, 2, 3]) == "123")
 assert(list_join(["hello", " world"]) == "hello world")
 assert(list_join([[], []]) == "[][]")
 
+assert(min(-1, 2) == -1)
+assert(max(100, -200) == 100)
+
+class N
+  def _init(n)
+    self.n = n
+  end
+  def < (other)
+    return self.n < other.n
+  end
+end
+
+n1 = N(1)
+n2 = N(2)
+assert(min(n1, n2) == n1)
+assert(max(n1, n2) == n2)
+
 ## If we got here, that means all test were passed.
 print('All TESTS PASSED')

tests/lang/builtin_ty.pk

@@ -132,6 +132,20 @@ assert(l == ['h', 'e', 'l', 'l', 'o'])
 ## MAP
 ###############################################################################
 
+m = { 'fruit': 'Apple' }
+m['size'] = 'Large'
+m['colors'] = []
+colors = m['colors']
+colors.append('Red')
+colors.append('Green')
+colors.append('Blue')
+
+assert(m == {
+  "fruit": "Apple",
+  "size": "Large",
+  "colors": ["Red", "Green", "Blue"]
+})
+
 swtich = {
   0 : fn return 1 end,
   1 : fn return 2 end,

tests/modules/json.pk

@@ -0,0 +1,46 @@
+
+import io, json, path
+
+## https://support.oneskyapp.com/hc/en-us/articles/208047697-JSON-sample-files
+jsonfile = path.join(path.dirname(__file__), 'test.json')
+
+obj = json.parse(io.readfile(jsonfile))
+assert(obj is Map)
+
+sports_q1 = obj['quiz']['sport']['q1']
+assert(sports_q1['question'] == 'Which one is correct team name in NBA?')
+
+assert(sports_q1['options'] ==
+      [
+        "New York Bulls",
+        "Los Angeles Kings",
+        "Golden State Warriros",
+        "Huston Rocket",
+      ])
+
+assert(obj['quiz']['maths'] ==
+      {
+        "q1": {
+          "question": "5 + 7 = ?",
+          "options": [
+            "10",
+            "11",
+            "12",
+            "13",
+          ],
+          "answer": "12"
+        },
+        "q2": {
+          "question": "12 - 8 = ?",
+          "options": [
+            "1",
+            "2",
+            "3",
+            "4",
+          ],
+          "answer": "4"
+        }
+      })
+
+# If we got here, that means all test were passed.
+print('All TESTS PASSED')

tests/modules/path.pk

@@ -3,3 +3,6 @@ import path
 THIS_PATH = path.dirname(__file__)
 
 assert('path.pk' in path.listdir(THIS_PATH))
+
+# If we got here, that means all test were passed.
+print('All TESTS PASSED')

tests/modules/test.json

@@ -0,0 +1,38 @@
+{
+    "quiz": {
+        "sport": {
+            "q1": {
+                "question": "Which one is correct team name in NBA?",
+                "options": [
+                    "New York Bulls",
+                    "Los Angeles Kings",
+                    "Golden State Warriros",
+                    "Huston Rocket"
+                ],
+                "answer": "Huston Rocket"
+            }
+        },
+        "maths": {
+            "q1": {
+                "question": "5 + 7 = ?",
+                "options": [
+                    "10",
+                    "11",
+                    "12",
+                    "13"
+                ],
+                "answer": "12"
+            },
+            "q2": {
+                "question": "12 - 8 = ?",
+                "options": [
+                    "1",
+                    "2",
+                    "3",
+                    "4"
+                ],
+                "answer": "4"
+            }
+        }
+    }
+}