projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telefiretwo: don't try to record pre-burn sensor values in FLIGHT record
[fw/altos]
/
altoslib
/
AltosJson.java
diff --git
a/altoslib/AltosJson.java
b/altoslib/AltosJson.java
index 346144d97e07ef409f2c5d25b80b37fda1ea3856..9191be68004d6297d4fea25ae61747669478816c 100644
(file)
--- a/
altoslib/AltosJson.java
+++ b/
altoslib/AltosJson.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,39
+25,39
@@
import java.lang.*;
import java.lang.reflect.*;
class JsonUtil {
import java.lang.reflect.*;
class JsonUtil {
-
StringBuffer quote(StringBuffer result, String a)
{
-
result
.append("\"");
+
Writer quote(Writer writer, String a) throws IOException
{
+
writer
.append("\"");
for (int i = 0; i < a.length(); i++) {
char c = a.charAt(i);
switch (c) {
case '"':
case '\\':
for (int i = 0; i < a.length(); i++) {
char c = a.charAt(i);
switch (c) {
case '"':
case '\\':
-
result
.append('\\').append(c);
+
writer
.append('\\').append(c);
break;
case '\n':
break;
case '\n':
-
result
.append("\\n");
+
writer
.append("\\n");
break;
default:
break;
default:
-
result
.append(c);
+
writer
.append(c);
break;
}
}
break;
}
}
-
result
.append("\"");
- return
result
;
+
writer
.append("\"");
+ return
writer
;
}
}
-
StringBuffer append(StringBuffer result, AltosJson value, int indent, boolean pretty)
{
+
Writer append(Writer result, AltosJson value, int indent, boolean pretty) throws IOException
{
value.append(result, indent, pretty);
return result;
}
value.append(result, indent, pretty);
return result;
}
-
StringBuffer append(StringBuffer result, String string)
{
+
Writer append(Writer result, String string) throws IOException
{
result.append(string);
return result;
}
result.append(string);
return result;
}
-
StringBuffer indent(StringBuffer result, int indent)
{
+
Writer indent(Writer result, int indent) throws IOException
{
result.append("\n");
for (int i = 0; i < indent; i++)
result.append("\t");
result.append("\n");
for (int i = 0; i < indent; i++)
result.append("\t");
@@
-79,7
+80,7
@@
class JsonUtil {
class JsonHash extends JsonUtil {
Hashtable<String,AltosJson> hash;
class JsonHash extends JsonUtil {
Hashtable<String,AltosJson> hash;
- void append_hash(
StringBuffer result, int indent, boolean pretty)
{
+ void append_hash(
Writer result, int indent, boolean pretty) throws IOException
{
boolean first = true;
result.append("{");
boolean first = true;
result.append("{");
@@
-124,7
+125,7
@@
class JsonHash extends JsonUtil {
class JsonArray extends JsonUtil {
ArrayList<AltosJson> array;
class JsonArray extends JsonUtil {
ArrayList<AltosJson> array;
- void append_array(
StringBuffer result, int indent, boolean pretty)
{
+ void append_array(
Writer result, int indent, boolean pretty) throws IOException
{
boolean first = true;
append(result, "[");
boolean first = true;
append(result, "[");
@@
-184,6
+185,7
@@
class JsonToken {
static final int _colon = 9;
static final int _end = 10;
static final int _error = 11;
static final int _colon = 9;
static final int _end = 10;
static final int _error = 11;
+ static final int _none = 12;
static String token_name(int token) {
switch (token) {
static String token_name(int token) {
switch (token) {
@@
-244,7
+246,7
@@
class JsonToken {
this.sval = sval;
}
this.sval = sval;
}
- JsonToken(int token,
StringBuff
er bval) {
+ JsonToken(int token,
Writ
er bval) {
this(token, bval.toString());
}
}
this(token, bval.toString());
}
}
@@
-253,11
+255,11
@@
class JsonToken {
* Lexer for json
*/
class JsonLexer extends JsonUtil {
* Lexer for json
*/
class JsonLexer extends JsonUtil {
-
StringReader
f;
- int line;
- int ungot = -2;
- StringBuffer pending_token;
- JsonToken token;
+
Reader
f;
+ int
line;
+ int
ungot = -2;
+ StringBuffer
pending_token;
+
private
JsonToken token;
static class keyword {
String word;
static class keyword {
String word;
@@
-381,7
+383,7
@@
class JsonLexer extends JsonUtil {
return new JsonToken(JsonToken._long, lval);
}
case '"':
return new JsonToken(JsonToken._long, lval);
}
case '"':
-
StringBuffer bval = new StringBuff
er();
+
Writer bval = new StringWrit
er();
for (;;) {
c = ch();
if (c == '"')
for (;;) {
c = ch();
if (c == '"')
@@
-399,7
+401,7
@@
class JsonLexer extends JsonUtil {
break;
}
}
break;
}
}
- bval.
appendCodePoint
(c);
+ bval.
write
(c);
}
return new JsonToken(JsonToken._string, bval);
default:
}
return new JsonToken(JsonToken._string, bval);
default:
@@
-423,11
+425,17
@@
class JsonLexer extends JsonUtil {
}
void next() {
}
void next() {
- token = lex();
+ token = null;
+ }
+
+ JsonToken token() {
+ if (token == null)
+ token = lex();
+ return token;
}
JsonToken expect(int e) {
}
JsonToken expect(int e) {
- JsonToken t = token;
+ JsonToken t = token
()
;
if (t.token != e)
throw new IllegalArgumentException(String.format("got \"%s\" while expecting \"%s\"",
token.token_name(),
if (t.token != e)
throw new IllegalArgumentException(String.format("got \"%s\" while expecting \"%s\"",
token.token_name(),
@@
-441,6
+449,12
@@
class JsonLexer extends JsonUtil {
line = 1;
token = null;
}
line = 1;
token = null;
}
+
+ JsonLexer(Reader f) {
+ this.f = f;
+ line = 1;
+ token = null;
+ }
}
/*
}
/*
@@
-463,7
+477,7
@@
class JsonParse {
lexer.next();
for (;;) {
/* Allow for empty hashes */
lexer.next();
for (;;) {
/* Allow for empty hashes */
- if (lexer.token.token == JsonToken._cc) {
+ if (lexer.token
()
.token == JsonToken._cc) {
lexer.next();
return hash;
}
lexer.next();
return hash;
}
@@
-474,7
+488,7
@@
class JsonParse {
AltosJson value = value();
hash.put(key, value);
AltosJson value = value();
hash.put(key, value);
- switch (lexer.token.token) {
+ switch (lexer.token
()
.token) {
case JsonToken._comma:
lexer.next();
break;
case JsonToken._comma:
lexer.next();
break;
@@
-482,7
+496,7
@@
class JsonParse {
lexer.next();
return hash;
default:
lexer.next();
return hash;
default:
- parse_error("got %s expect \",\" or \"}\"", lexer.token.token_name());
+ parse_error("got %s expect \",\" or \"}\"", lexer.token
()
.token_name());
return null;
}
}
return null;
}
}
@@
-495,14
+509,14
@@
class JsonParse {
lexer.next();
for (int i = 0;; i++) {
/* Allow for empty arrays */
lexer.next();
for (int i = 0;; i++) {
/* Allow for empty arrays */
- if (lexer.token.token == JsonToken._cs) {
+ if (lexer.token
()
.token == JsonToken._cs) {
lexer.next();
return array;
}
AltosJson value = value();
array.put(i, value);
lexer.next();
return array;
}
AltosJson value = value();
array.put(i, value);
- switch (lexer.token.token) {
+ switch (lexer.token
()
.token) {
case JsonToken._comma:
lexer.next();
break;
case JsonToken._comma:
lexer.next();
break;
@@
-510,7
+524,7
@@
class JsonParse {
lexer.next();
return array;
default:
lexer.next();
return array;
default:
- parse_error("got %s expect \",\" or \"]\"", lexer.token.token_name());
+ parse_error("got %s expect \",\" or \"]\"", lexer.token
()
.token_name());
return null;
}
}
return null;
}
}
@@
-520,29
+534,29
@@
class JsonParse {
* identify the next object in the input
*/
AltosJson value() {
* identify the next object in the input
*/
AltosJson value() {
- switch (lexer.token.token) {
+ switch (lexer.token
()
.token) {
case JsonToken._oc:
return new AltosJson(hash());
case JsonToken._os:
return new AltosJson(array());
case JsonToken._double:
case JsonToken._oc:
return new AltosJson(hash());
case JsonToken._os:
return new AltosJson(array());
case JsonToken._double:
- double dval = lexer.token.dval;
+ double dval = lexer.token
()
.dval;
lexer.next();
return new AltosJson(dval);
case JsonToken._long:
lexer.next();
return new AltosJson(dval);
case JsonToken._long:
- long lval = lexer.token.lval;
+ long lval = lexer.token
()
.lval;
lexer.next();
return new AltosJson(lval);
case JsonToken._string:
lexer.next();
return new AltosJson(lval);
case JsonToken._string:
- String sval = lexer.token.sval;
+ String sval = lexer.token
()
.sval;
lexer.next();
return new AltosJson(sval);
case JsonToken._boolean:
lexer.next();
return new AltosJson(sval);
case JsonToken._boolean:
- boolean bval = lexer.token.bval;
+ boolean bval = lexer.token
()
.bval;
lexer.next();
return new AltosJson(bval);
default:
lexer.next();
return new AltosJson(bval);
default:
- parse_error("Unexpected token \"%s\"", lexer.token.token_name());
+ parse_error("Unexpected token \"%s\"", lexer.token
()
.token_name());
}
return null;
}
}
return null;
}
@@
-555,6
+569,10
@@
class JsonParse {
JsonParse(String s) {
lexer = new JsonLexer(s);
}
JsonParse(String s) {
lexer = new JsonLexer(s);
}
+
+ JsonParse(Reader f) {
+ lexer = new JsonLexer(f);
+ }
}
public class AltosJson extends JsonUtil {
}
public class AltosJson extends JsonUtil {
@@
-577,7
+595,7
@@
public class AltosJson extends JsonUtil {
/* Generate string representation of the value
*/
/* Generate string representation of the value
*/
-
StringBuffer append(StringBuffer result, int indent, boolean pretty)
{
+
Writer append(Writer result, int indent, boolean pretty) throws IOException
{
switch (type) {
case type_hash:
hash.append_hash(result, indent, pretty);
switch (type) {
case type_hash:
hash.append_hash(result, indent, pretty);
@@
-614,9
+632,13
@@
public class AltosJson extends JsonUtil {
}
private String toString(int indent, boolean pretty) {
}
private String toString(int indent, boolean pretty) {
- StringBuffer result = new StringBuffer();
- append(result, indent, pretty);
- return result.toString();
+ try {
+ Writer result = new StringWriter();
+ append(result, indent, pretty);
+ return result.toString();
+ } catch (Exception e) {
+ return null;
+ }
}
public String toString() {
}
public String toString() {
@@
-627,6
+649,14
@@
public class AltosJson extends JsonUtil {
return toString(0, true);
}
return toString(0, true);
}
+ public void write(Writer w, int indent, boolean pretty) throws IOException {
+ append(w, indent, pretty);
+ }
+
+ public void write(Writer w) throws IOException {
+ write(w, 0, true);
+ }
+
/* Parse string representation to a value
*/
/* Parse string representation to a value
*/
@@
-640,6
+670,16
@@
public class AltosJson extends JsonUtil {
}
}
}
}
+ public static AltosJson fromReader(Reader f) {
+ JsonParse parse = new JsonParse(f);
+ try {
+ return parse.parse();
+ } catch (IllegalArgumentException ie) {
+ System.out.printf("json:\n%s\n", ie.getMessage());
+ return null;
+ }
+ }
+
/* Accessor functions
*/
private boolean assert_type(boolean setting, int type, int other_type, String error) {
/* Accessor functions
*/
private boolean assert_type(boolean setting, int type, int other_type, String error) {
@@
-1063,7
+1103,7
@@
public class AltosJson extends JsonUtil {
} else {
object = c.newInstance();
}
} else {
object = c.newInstance();
}
- for (; c !=
null
; c = c.getSuperclass()) {
+ for (; c !=
Object.class
; c = c.getSuperclass()) {
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
Class fieldClass = field.getType();
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
Class fieldClass = field.getType();
@@
-1208,10
+1248,14
@@
public class AltosJson extends JsonUtil {
}
} else {
assert_hash(true);
}
} else {
assert_hash(true);
- for (Class c = object.getClass(); c !=
null
; c = c.getSuperclass()) {
+ for (Class c = object.getClass(); c !=
Object.class
; c = c.getSuperclass()) {
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
+ /* XXX hack to allow fields to be not converted */
+ if (fieldName.startsWith("__"))
+ continue;
+
/* Skip static fields */
if (Modifier.isStatic(field.getModifiers()))
continue;
/* Skip static fields */
if (Modifier.isStatic(field.getModifiers()))
continue;