json.c: Simplify stringify_value by invoking expect_value to catch all the scalar cases

1 files changed, 3 insertions, 26 deletions

diff --git a/json.c b/json.c
index a0756e5..9c75820 100644
--- a/json.c
+++ b/json.c
@@ -484,24 +484,6 @@ stringify_value(StringInfo buf, const char *s, const char *e,
 
 	switch (*s)
 	{
-		case 'n':
-			appendStringInfoString(buf, "null");
-			return s + 4;
-		case 'f':
-			appendStringInfoString(buf, "false");
-			return s + 5;
-		case 't':
-			appendStringInfoString(buf, "true");
-			return s + 4;
-		case '-':
-			s2 = expect_number(s, e);
-			appendBinaryStringInfo(buf, s, s2 - s);
-			return s2;
-		case '"':
-			s2 = expect_string(s, e);
-			appendBinaryStringInfo(buf, s, s2 - s);
-			return s2;
-		
 		case '[':
 			appendStringInfoString(buf, "[\n");
 			s++;
@@ -552,14 +534,9 @@ stringify_value(StringInfo buf, const char *s, const char *e,
 			return s + 1;
 		
 		default:
-			if (is_digit(*s))
-			{
-				s2 = expect_number(s, e);
-				appendBinaryStringInfo(buf, s, s2 - s);
-				return s2;
-			}
-			report_corrupt_json();
-			return NULL;
+			s2 = expect_value(s, e);
+			appendBinaryStringInfo(buf, s, s2 - s);
+			return s2;
 	}
 }