From a576e4c5f167ec5ceaddb1b819d44519fcdda5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarrige=20Cl=C3=A9ment?= Date: Wed, 26 Apr 2017 14:43:38 +0200 Subject: [PATCH 1/2] Add output valuation byte support and add variable name --- src/examples/features/simple/example.jpf | 2 ++ src/main/gov/nasa/jpf/jdart/JDart.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/examples/features/simple/example.jpf b/src/examples/features/simple/example.jpf index d19ffc4..ea47e75 100644 --- a/src/examples/features/simple/example.jpf +++ b/src/examples/features/simple/example.jpf @@ -31,3 +31,5 @@ jdart.configs.zoo.constraints=\ jdart.configs.zoo.exploration.initial=true jdart.configs.zoo.exploration.suspend=*.zoo_sub(* +jdart.tree.json.print=true +jdart.tree.json.dir=. diff --git a/src/main/gov/nasa/jpf/jdart/JDart.java b/src/main/gov/nasa/jpf/jdart/JDart.java index d11f33f..2e0e117 100644 --- a/src/main/gov/nasa/jpf/jdart/JDart.java +++ b/src/main/gov/nasa/jpf/jdart/JDart.java @@ -296,10 +296,12 @@ public String format(LogRecord record) { type = "double"; } else if (vResultType.equals("java.lang.Boolean")) { type = "boolean"; + } else if (vResultType.equals("java.lang.Byte")) { + type = "byte"; } if (type != null) { - file_output += type + ":" + p.getValuation().getValue(v) + "\n"; + file_output += type + ":" + v.getName() + ":" + p.getValuation().getValue(v) + "\n"; } } logger.info(out); From 619161de5bffb3d7505a987867e5e0083c827675 Mon Sep 17 00:00:00 2001 From: Jarrige Clement Date: Sat, 13 May 2017 18:14:25 +0200 Subject: [PATCH 2/2] Remove json property in simple/example.jpf --- src/examples/features/simple/example.jpf | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/examples/features/simple/example.jpf b/src/examples/features/simple/example.jpf index ea47e75..d19ffc4 100644 --- a/src/examples/features/simple/example.jpf +++ b/src/examples/features/simple/example.jpf @@ -31,5 +31,3 @@ jdart.configs.zoo.constraints=\ jdart.configs.zoo.exploration.initial=true jdart.configs.zoo.exploration.suspend=*.zoo_sub(* -jdart.tree.json.print=true -jdart.tree.json.dir=.