This lets some structures which would otherwise recurse (and crash)
get converted to json, assuming the hidden members aren't relevant.
Signed-off-by: Keith Packard <keithp@keithp.com>
public int altitude_32;
/* Strings returned */
public int altitude_32;
/* Strings returned */
- public LinkedList<String> lines;
+ public LinkedList<String> __lines;
/* Config information */
/* HAS_FLIGHT*/
/* Config information */
/* HAS_FLIGHT*/
}
public Iterator<String> iterator() {
}
public Iterator<String> iterator() {
- return lines.iterator();
+ return __lines.iterator();
}
public int log_space() {
}
public int log_space() {
- lines = new LinkedList<String>();
+ __lines = new LinkedList<String>();
manufacturer = "unknown";
product = "unknown";
manufacturer = "unknown";
product = "unknown";
}
public void parse_line(String line) {
}
public void parse_line(String line) {
/* Version replies */
try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {}
try { product = get_string(line, "product"); } catch (Exception e) {}
/* Version replies */
try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {}
try { product = get_string(line, "product"); } catch (Exception e) {}
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);
- 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");
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("{");
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, "[");
- JsonToken(int token, StringBuffer bval) {
+ JsonToken(int token, Writer bval) {
this(token, bval.toString());
}
}
this(token, bval.toString());
}
}
* Lexer for json
*/
class JsonLexer extends JsonUtil {
* Lexer for json
*/
class JsonLexer extends JsonUtil {
int line;
int ungot = -2;
StringBuffer pending_token;
int line;
int ungot = -2;
StringBuffer pending_token;
return new JsonToken(JsonToken._long, lval);
}
case '"':
return new JsonToken(JsonToken._long, lval);
}
case '"':
- StringBuffer bval = new StringBuffer();
+ Writer bval = new StringWriter();
for (;;) {
c = ch();
if (c == '"')
for (;;) {
c = ch();
if (c == '"')
- bval.appendCodePoint(c);
}
return new JsonToken(JsonToken._string, bval);
default:
}
return new JsonToken(JsonToken._string, bval);
default:
line = 1;
token = null;
}
line = 1;
token = null;
}
+
+ JsonLexer(Reader f) {
+ this.f = f;
+ line = 1;
+ token = null;
+ }
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 {
/* 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);
}
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() {
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
*/
+ 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) {
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;