Replace global typeof with JSON.typeof(...)

Author: sandeepmistry

examples/JSONArray/JSONArray.ino

@@ -29,22 +29,22 @@ void demoParse() {
 
   JSONVar myArray = JSON.parse(input);
 
-  // typeof(jsonVar) can be used to get the type of the var
-  if (typeof(myArray) == "undefined") {
+  // JSON.typeof(jsonVar) can be used to get the type of the var
+  if (JSON.typeof(myArray) == "undefined") {
     Serial.println("Parsing input failed!");
     return;
   }
 
-  Serial.print("typeof(myArray) = ");
-  Serial.println(typeof(myArray)); // prints: array
+  Serial.print("JSON.typeof(myArray) = ");
+  Serial.println(JSON.typeof(myArray)); // prints: array
 
   // myArray.length() can be used to get the length of the array
   Serial.print("myArray.length() = ");
   Serial.println(myArray.length());
   Serial.println();
 
-  Serial.print("typeof(myArray[0]) = ");
-  Serial.println(typeof(myArray[0]));
+  Serial.print("JSON.typeof(myArray[0]) = ");
+  Serial.println(JSON.typeof(myArray[0]));
 
   Serial.print("myArray[0] = ");
   Serial.println(myArray[0]);
@@ -87,10 +87,10 @@ void demoCreation() {
   for (int i = 0; i < myArray.length(); i++) {
     JSONVar value = myArray[i];
 
-    Serial.print("typeof(myArray[");
+    Serial.print("JSON.typeof(myArray[");
     Serial.print(i);
     Serial.print("]) = ");
-    Serial.println(typeof(value));
+    Serial.println(JSON.typeof(value));
 
     Serial.print("myArray[");
     Serial.print(i);

examples/JSONKitchenSink/JSONKitchenSink.ino

@@ -36,8 +36,8 @@ void booleanDemo() {
 
   JSONVar myBoolean = true;
 
-  Serial.print("typeof(myBoolean) = ");
-  Serial.println(typeof(myBoolean)); // prints: boolean
+  Serial.print("JSON.typeof(myBoolean) = ");
+  Serial.println(JSON.typeof(myBoolean)); // prints: boolean
 
   Serial.print("myBoolean = ");
   Serial.println(myBoolean); // prints: true
@@ -56,8 +56,8 @@ void intDemo() {
 
   JSONVar myInt = 42;
 
-  Serial.print("typeof(myInt) = ");
-  Serial.println(typeof(myInt)); // prints: number
+  Serial.print("JSON.typeof(myInt) = ");
+  Serial.println(JSON.typeof(myInt)); // prints: number
 
   Serial.print("myInt = ");
   Serial.println(myInt); // prints: 42
@@ -76,8 +76,8 @@ void doubleDemo() {
 
   JSONVar myDouble = 42.5;
 
-  Serial.print("typeof(myDouble) = ");
-  Serial.println(typeof(myDouble)); // prints: number
+  Serial.print("JSON.typeof(myDouble) = ");
+  Serial.println(JSON.typeof(myDouble)); // prints: number
 
   Serial.print("myDouble = ");
   Serial.println(myDouble); // prints: 42.5
@@ -96,8 +96,8 @@ void stringDemo() {
 
   JSONVar myString = "Hello World!";
 
-  Serial.print("typeof(myString) = ");
-  Serial.println(typeof(myString)); // prints: string
+  Serial.print("JSON.typeof(myString) = ");
+  Serial.println(JSON.typeof(myString)); // prints: string
 
   Serial.print("myString = ");
   Serial.println(myString); // prints: Hello World!
@@ -118,8 +118,8 @@ void arrayDemo() {
 
   myArray[0] = 42;
 
-  Serial.print("typeof(myArray) = ");
-  Serial.println(typeof(myArray)); // prints: array
+  Serial.print("JSON.typeof(myArray) = ");
+  Serial.println(JSON.typeof(myArray)); // prints: array
 
   Serial.print("myArray = ");
   Serial.println(myArray); // prints: [42]
@@ -146,8 +146,8 @@ void objectDemo() {
 
   myObject["foo"] = "bar";
 
-  Serial.print("typeof(myObject) = ");
-  Serial.println(typeof(myObject)); // prints: object
+  Serial.print("JSON.typeof(myObject) = ");
+  Serial.println(JSON.typeof(myObject)); // prints: object
 
   Serial.print("myObject.keys() = ");
   Serial.println(myObject.keys()); // prints: ["foo"]

examples/JSONObject/JSONObject.ino

@@ -29,14 +29,14 @@ void demoParse() {
 
   JSONVar myObject = JSON.parse(input);
 
-  // typeof(jsonVar) can be used to get the type of the var
-  if (typeof(myObject) == "undefined") {
+  // JSON.typeof(jsonVar) can be used to get the type of the var
+  if (JSON.typeof(myObject) == "undefined") {
     Serial.println("Parsing input failed!");
     return;
   }
 
-  Serial.print("typeof(myObject) = ");
-  Serial.println(typeof(myObject)); // prints: object
+  Serial.print("JSON.typeof(myObject) = ");
+  Serial.println(JSON.typeof(myObject)); // prints: object
 
   // myObject.hasOwnProperty(key) checks if the object contains an entry for key
   if (myObject.hasOwnProperty("result")) {
@@ -97,10 +97,10 @@ void demoCreation() {
   for (int i = 0; i < keys.length(); i++) {
     JSONVar value = myObject[keys[i]];
 
-    Serial.print("typeof(myObject[");
+    Serial.print("JSON.typeof(myObject[");
     Serial.print(keys[i]);
     Serial.print("]) = ");
-    Serial.println(typeof(value));
+    Serial.println(JSON.typeof(value));
 
     Serial.print("myObject[");
     Serial.print(keys[i]);

src/JSON.cpp

@@ -72,11 +72,6 @@ JSONClass::~JSONClass()
 {
 }
 
-String typeof(const JSONVar& value)
-{
-  return JSONVar::typeof(value);
-}
-
 JSONVar JSONClass::parse(const char* s)
 {
   return JSONVar::parse(s);
@@ -92,4 +87,9 @@ String JSONClass::stringify(const JSONVar& value)
   return JSONVar::stringify(value);
 }
 
+String JSONClass::typeof(const JSONVar& value)
+{
+  return JSONVar::typeof(value);
+}
+
 JSONClass JSON;

src/JSON.h

@@ -24,8 +24,6 @@
 
 #include "JSONVar.h"
 
-String typeof(const JSONVar& value);
-
 class JSONClass {
 public:
   JSONClass();
@@ -35,6 +33,8 @@ class JSONClass {
   JSONVar parse(const String& s);
 
   String stringify(const JSONVar& value);
+
+  String typeof(const JSONVar& value);
 };
 
 extern JSONClass JSON;