Merge pull request #1439 from SchiJoha/master

Fix context gas in g2html

Author: michael-schwarz

src/framework/constraints.ml

@@ -518,7 +518,7 @@ struct
   struct 
     include Lattice.Prod (Base1) (Base2)
     let printXml f (x,y) =
-      BatPrintf.fprintf f "<value>\n<map>\n<key>\n%s\n</key>\n%a<key>\nContext Gas Value\n</key>\n%a</map>\n</value>\n" (XmlUtil.escape (Base1.name ())) Base1.printXml x Base2.printXml y
+      BatPrintf.fprintf f "\n%a<analysis name=\"context gas value\">\n%a\n</analysis>" Base1.printXml x Base2.printXml y
   end
   module D = Context_Gas_Prod (S.D) (Lattice.Chain (IntConf)) (* Product of S.D and an integer, tracking the context gas value *)
   module C = Printable.Option (S.C) (NoContext)