[usrcls-new strick**20120326093537 Ignore-this: 69bba3231dc85b8d65af86e4c4376e0c ] hunk ./terse-a1/res/raw/prelude.txt 120 - '|link|/HelloWeb|[HelloWeb]|'; + '|link|/DemoHt|[DemoHt]|'; hunk ./terse-a1/res/raw/prelude.txt 138 - '|link|/HelloWeb|[HelloWeb]|', 'HelloWeb '; + '|link|/DemoHt|[DemoHt]|', 'DemoHt '; hunk ./terse-a1/res/raw/prelude.txt 394 -class HelloWeb App -meth HelloWeb handle:query: +class DemoHt App +meth DemoHt handle:query: + + guts = Ht( + Tag('li', 'Test.'), + Tag('li', TAG('span'; 'style', 'color:yellow'; 'Hello')), + Tag('li', TAG('span'; 'style', 'background-color:brown'; 'World!')), + Tag('li', '[', TAG('a'; 'href', '/Home'; 'GO HOME'), ']'), + ). + guts append: Ht( + FOR(i:100)MAP( + Tag('li', i))). + page = TAG('html', + TAG('body'; + 'bgcolor', '#222222'; + 'text', '#DDDDDD'; + TAG('big', + TAG('big', + TAG('ul', guts))))). hunk ./terse-a1/res/raw/prelude.txt 415 - 'title', 'HelloWeb Title'; - 'value', ' -

Test. -
hello -
world -
Go Home - ' ap: - FOR(i:100)MAP( - VEC('
', i) jam - ) implode - ) + 'title', 'DemoHt Title'; + 'value', page). hunk ./terse-a1/src/terse/a1/TerseActivity.java 331 - double x = Static.floatAt(d, "ticks", -1); + double ticks = Static.floatAt(d, "ticks", -1); + double secs = Static.floatAt(d, "secs", -1); hunk ./terse-a1/src/terse/a1/TerseActivity.java 334 - Static.fmt("%d ticks", (long)x), + Static.fmt("%d ticks, %.3f secs", (long)ticks, secs), hunk ./terse-a1/src/terse/a1/TerseActivity.java 494 - } else if (type.str.equals("text") && value instanceof Str) { + } else if (type.str.equals("text")) { hunk ./terse-a1/src/terse/a1/TerseActivity.java 497 - } else if (type.str.equals("html") && value instanceof Str) { + } else if (type.str.equals("html")) { hunk ./terse-a1/src/terse/a1/TerseActivity.java 511 - } else if (type.str.equals("live") && value instanceof Blk) { - WebView webview = new WebView(this); - webview.loadData(value.toString(), "text/html", null); - ScrollView scrollv = new ScrollView(this); - scrollv.addView(webview); - setContentView(scrollv); - return; + } else if (type.str.equals("live")) { + explain = "type
not imp."; + // return; hunk ./terse-vm/prelude.txt 120 - '|link|/HelloWeb|[HelloWeb]|'; + '|link|/DemoHt|[DemoHt]|'; hunk ./terse-vm/prelude.txt 138 - '|link|/HelloWeb|[HelloWeb]|', 'HelloWeb '; + '|link|/DemoHt|[DemoHt]|', 'DemoHt '; hunk ./terse-vm/prelude.txt 394 -class HelloWeb App -meth HelloWeb handle:query: +class DemoHt App +meth DemoHt handle:query: + + guts = Ht( + Tag('li', 'Test.'), + Tag('li', TAG('span'; 'style', 'color:yellow'; 'Hello')), + Tag('li', TAG('span'; 'style', 'background-color:brown'; 'World!')), + Tag('li', '[', TAG('a'; 'href', '/Home'; 'GO HOME'), ']'), + ). + guts append: Ht( + FOR(i:100)MAP( + Tag('li', i))). + page = TAG('html', + TAG('body'; + 'bgcolor', '#222222'; + 'text', '#DDDDDD'; + TAG('big', + TAG('big', + TAG('ul', guts))))). hunk ./terse-vm/prelude.txt 415 - 'title', 'HelloWeb Title'; - 'value', '
-
- Test. -
- hello -
- world -
- Go Home - ' ap: - FOR(i:100)MAP( - VEC('
- ', i) jam - ) implode - ) + 'title', 'DemoHt Title'; + 'value', page). hunk ./terse-vm/src/terse/vm/Makefile 2 -all : Wrap.java +all : Wrap.java ../../../../terse-web/prelude.txt ../../../../terse-a1/res/raw/prelude.txt hunk ./terse-vm/src/terse/vm/Makefile 4 -J = Ur.java Terp.java Expr.java Cls.java Parser.java +J = Ur.java Terp.java Expr.java Cls.java Parser.java Usr.java hunk ./terse-vm/src/terse/vm/Makefile 8 + +../../../../terse-web/prelude.txt : ../../../prelude.txt + cp ../../../prelude.txt ../../../../terse-web/prelude.txt +../../../../terse-a1/res/raw/prelude.txt : ../../../prelude.txt + cp ../../../prelude.txt ../../../../terse-a1/res/raw/prelude.txt hunk ./terse-vm/src/terse/vm/Parser.java 46 - p.parseExpr(); // Once to learn names of variables. + try { + p.parseExpr(); // Once to learn names of variables. + } catch (Exception ex) { + terp.toss("ERROR DURING PARSING: <%s>\nWHILE PARSING THIS SOURCE:\n%s\nUNPARSED REMAINDER:\n%s\n", ex, p.lex.front, p.lex.rest); + } hunk ./terse-vm/src/terse/vm/Static.java 3 - hunk ./terse-vm/src/terse/vm/Static.java 7 +import terse.vm.Ur.Ht; +import terse.vm.Ur.Html; hunk ./terse-vm/src/terse/vm/Static.java 220 + + public static Html htmlAt(Ur p, String i) { + if (!(p instanceof Dict)) { + p.terp().toss("In Static.htmlAt, not a dict: <%s#%s>", p.cls, p); + } + Dict d = (Dict) p; + Ur x = d.dict.get(d.terp().newStr(i)); + if (!(x instanceof Ht)) { + p.terp().toss("In Static.htmlAt, did not find Ht: <%s#%s>", x.cls, x); + } + return ((Ht) x).html; + } + hunk ./terse-vm/src/terse/vm/Static.java 242 + hunk ./terse-vm/src/terse/vm/Static.java 253 + hunk ./terse-vm/src/terse/vm/Static.java 279 - hunk ./terse-vm/src/terse/vm/Terp.java 359 + float secsBefore = System.currentTimeMillis(); hunk ./terse-vm/src/terse/vm/Terp.java 386 + float secsAfter = System.currentTimeMillis(); hunk ./terse-vm/src/terse/vm/Terp.java 388 - say(" used %d ticks.", before - after); + result.dict.put(newStr("secs"), newNum(secsBefore - secsAfter)); + say(" used %d ticks and %f secs.", before - after, secsBefore - secsAfter); hunk ./terse-vm/src/terse/vm/Ur.java 501 + // =meth Obj "macro" macro:ht: + // "concat Str and Ht and (recursively) Vec, as Ht" + public Ht macroHt(Frame _, Blk b) { + return new Ht(terp(), macroHtOnVec(evalMacroBlockMakingVec(b))); + } + + private Html macroHtOnVec(Vec v) { + int n = v.vec.size(); + Html html = new Html(); + for (int i = 0; i < n; i++) { + Ur x = v.vec.get(i); + if (x instanceof Ht) { + html.append(((Ht) x).html); + } else if (x instanceof Vec) { + html.append(macroHtOnVec(((Vec) x))); + } else { + html.append(x.toString()); + } + } + return html; + } + + // =meth Obj "macro" macro:tag: + // "first element; rest are Ht, Str, or (key, value) params" + public Ht macroTag(Frame _, Blk b) { + Vec v = evalMacroBlockMakingVec(b); + int n = v.vec.size(); + Html body = new Html(); + String[] params = emptyStrs; + // 0th is the tag name. + String tag = v.vec.get(0).mustStr().str; + // So start iterating at 1. + for (int i = 1; i < n; i++) { + Ur x = v.vec.get(i); + if (x instanceof Ht) { + body.append(((Ht) x).html); + } else if (x instanceof Vec) { + Vec kv = (Vec) x; + if (kv.vec.size() != 2) { + terp().toss( + "Subvec not size 2, in params to tag: <%s>", kv); + } + params = append(params, kv.vec.get(0).toString()); + params = append(params, kv.vec.get(1).toString()); + } else { + body.append(x.toString()); + } + } + return new Ht(terp(), Html.tag(null, tag, params, body)); + } + hunk ./terse-vm/src/terse/vm/Ur.java 555 - + hunk ./terse-vm/src/terse/vm/Ur.java 558 - + hunk ./terse-vm/src/terse/vm/Ur.java 863 - + hunk ./terse-vm/src/terse/vm/Ur.java 1665 + hunk ./terse-vm/src/terse/vm/Ur.java 2042 - public static class Ht extends Static { // For XSS Safety. + public static class Html extends Static { // For XSS Safety. hunk ./terse-vm/src/terse/vm/Ur.java 2045 - public Ht() { + public Html() { hunk ./terse-vm/src/terse/vm/Ur.java 2049 - public Ht(Ht that) { + public Html(Html that) { hunk ./terse-vm/src/terse/vm/Ur.java 2053 - public Ht(String s) { + public Html(String s) { hunk ./terse-vm/src/terse/vm/Ur.java 2061 - public Ht append(String s) { + public Html append(String s) { hunk ./terse-vm/src/terse/vm/Ur.java 2066 - public Ht append(Ht that) { + public Html append(Html that) { hunk ./terse-vm/src/terse/vm/Ur.java 2071 - public Ht appendLink(String link, String label) { - Ht.tag(this, "a", strs("href", link), label); + public Html appendLink(String link, String label) { + Html.tag(this, "a", strs("href", link), label); hunk ./terse-vm/src/terse/vm/Ur.java 2076 - public Ht append(Ur that) { + public Html append(Ur that) { hunk ./terse-vm/src/terse/vm/Ur.java 2081 - static public Ht entity(String name) { - Ht ht = new Ht(); + static public Html entity(String name) { + Html ht = new Html(); hunk ./terse-vm/src/terse/vm/Ur.java 2087 - static public Ht tag(Ht appendMe, String type, String[] args, + static public Html tag(Html appendMe, String type, String[] args, hunk ./terse-vm/src/terse/vm/Ur.java 2089 - return tag(appendMe, type, args, new Ht(body)); + return tag(appendMe, type, args, new Html(body)); hunk ./terse-vm/src/terse/vm/Ur.java 2092 - static public Ht tag(Ht appendMe, String type, String[] args, Ht body) { - Ht z = appendMe == null ? new Ht() : appendMe; + static public Html tag(Html appendMe, String type, String[] args, + Html body) { + Html z = appendMe == null ? new Html() : appendMe; hunk ./terse-vm/src/terse/vm/Ur.java 2108 - static public Ht tag(Ht appendMe, String type, String[] args) { - Ht z = appendMe == null ? new Ht() : appendMe; + static public Html tag(Html appendMe, String type, String[] args) { + Html z = appendMe == null ? new Html() : appendMe; hunk ./terse-vm/src/terse/vm/Ur.java 2124 + public static class Ht extends Obj { + Html html; + + // =cls "html" Ht Obj + public Ht(Terp terp) { + super(terp.wrap.clsHt); + html = new Html(); + } + + public Ht(Terp terp, Html x) { + super(terp.wrap.clsHt); + html = new Html(x); + } + + @Override + public String toString() { + return html.toString(); + } + + // =meth Ht "html" append:,ap: "take an Ht or a Str" + public void append(Ur x) { + if (x instanceof Ht) { + html.append(((Ht) x).html); + } else { + html.append(x.toString()); + } + } + + // =meth HtCls "html" new: "take an Ht or a Str" + public static Ht new_(Terp t, Ur a) { + Ht z = new Ht(t); + z.append(a); + return z; + } + + // =meth HtCls "html" entity: + public static Ht entity(Terp t, String name) { + return new Ht(t, Html.entity(name)); + } + + // =meth HtCls "html" tag:params:body: + public static Ht tag(Terp t, String name, Ur params, Ur body) { + String[] args = emptyStrs; + if (params == t.instNil) { + // empty args + } else { + Vec v = params.mustVec(); + int n = v.vec.size(); + for (int i = 0; i < n; i++) { + Vec kv = v.vec.get(i).mustVec(); + if (kv.vec.size() != 2) { + t.toss("Subvec not size 2, in params to tag: <%s>", kv); + } + args = append(args, kv.vec.get(0).toString()); + args = append(args, kv.vec.get(1).toString()); + } + } + Html bodyHt; + if (body == t.instNil) { + bodyHt = new Html(); + } else if (body instanceof Ht) { + bodyHt = new Html(((Ht) body).html); + } else { + bodyHt = new Html(body.toString()); + } + return new Ht(t, Html.tag(null, name, args, bodyHt)); + } + } + hunk ./terse-vm/src/terse/vm/Usr.java 12 + // static hunk ./terse-vm/src/terse/vm/Usr.java 15 + + // inst hunk ./terse-vm/src/terse/vm/Usr.java 20 + // =cls "usr" Usr Obj hunk ./terse-vm/src/terse/vm/Usr.java 58 + // =meth UsrCls "new" new + public static Usr new_(Cls cls) { + Usr z = new Usr(cls); + z.cls.insts.put(z.usrId(), z); // Hack -- save all + // insts. + return z; + } + hunk ./terse-vm/src/terse/vm/Wrap.java 204 + // CMD meth Obj "macro" macro:ht: "concat Str and Ht and (recursively) Vec, as Ht" TYPE Ht NAME macroHt PARAMS {Frame _} { Blk b} + // CLS Obj GROUP "macro" METH macro:ht: REMARK "concat Str and Ht and (recursively) Vec, as Ht" + + new JavaMeth(terp.wrap.clsObj, "macro:ht:", "") { + public Ur apply(Frame frame, Ur r, Ur[] args) { + Obj self = (Obj) r; + Frame a = (Frame) args[0]; + Blk b = (Blk) args[1]; + return self.macroHt (a, b); + } + }; + + // CMD meth Obj "macro" macro:tag: "first element; rest are Ht, Str, or (key, value) params" TYPE Ht NAME macroTag PARAMS {Frame _} { Blk b} + // CLS Obj GROUP "macro" METH macro:tag: REMARK "first element; rest are Ht, Str, or (key, value) params" + + new JavaMeth(terp.wrap.clsObj, "macro:tag:", "") { + public Ur apply(Frame frame, Ur r, Ur[] args) { + Obj self = (Obj) r; + Frame a = (Frame) args[0]; + Blk b = (Blk) args[1]; + return self.macroTag (a, b); + } + }; + hunk ./terse-vm/src/terse/vm/Wrap.java 720 + // CMD meth Ht "html" append:,ap: "take an Ht or a Str" TYPE void NAME append PARAMS {Ur x} + // CLS Ht GROUP "html" METH append:,ap: REMARK "take an Ht or a Str" + + new JavaMeth(terp.wrap.clsHt, "append:", "ap:") { + public Ur apply(Frame frame, Ur r, Ur[] args) { + Ht self = (Ht) r; + Ur a = (Ur) args[0]; + self.append (a); + return self; + } + }; + + // CMD meth HtCls "html" new: "take an Ht or a Str" TYPE Ht NAME new_ PARAMS {Terp t} { Ur a} + // CLS HtCls GROUP "html" METH new: REMARK "take an Ht or a Str" + + new JavaMeth(terp.wrap.clsHtCls, "new:", "") { + public Ur apply(Frame frame, Ur r, Ur[] args) { + Cls self = terp.wrap.clsHtCls; + Ur a = (Ur) args[0]; + return Ht.new_ (terp,a); + } + }; + + // CMD meth HtCls "html" entity: TYPE Ht NAME entity PARAMS {Terp t} { String name} + // CLS HtCls GROUP "html" METH entity: REMARK "" + + new JavaMeth(terp.wrap.clsHtCls, "entity:", "") { + public Ur apply(Frame frame, Ur r, Ur[] args) { + Cls self = terp.wrap.clsHtCls; + Str a = (Str) args[0]; + return Ht.entity (terp,a.str); + } + }; + + // CMD meth HtCls "html" tag:params:body: TYPE Ht NAME tag PARAMS {Terp t} { String name} { Ur params} { Ur body} + // CLS HtCls GROUP "html" METH tag:params:body: REMARK "" + + new JavaMeth(terp.wrap.clsHtCls, "tag:params:body:", "") { + public Ur apply(Frame frame, Ur r, Ur[] args) { + Cls self = terp.wrap.clsHtCls; + Str a = (Str) args[0]; + Ur b = (Ur) args[1]; + Ur c = (Ur) args[2]; + return Ht.tag (terp,a.str, b, c); + } + }; + hunk ./terse-vm/src/terse/vm/Wrap.java 985 + // CMD meth UsrCls "new" new TYPE Usr NAME new_ PARAMS {Cls cls} + // CLS UsrCls GROUP "new" METH new REMARK "" + + new JavaMeth(terp.wrap.clsUsrCls, "new", "") { + public Ur apply(Frame frame, Ur r, Ur[] args) { + Cls self = (Cls) r; + return Usr.new_ (self); + } + }; + hunk ./terse-vm/src/terse/vm/Wrap.java 1105 + this.clsHtCls = terp.clss.get("htcls"); + if (this.clsHtCls == null) { + this.clsHtCls = new Cls(terp.tMetaclsCls, terp, "HtCls", this.clsObjCls); + } + this.clsHt = terp.clss.get("ht"); + if (this.clsHt == null) { + this.clsHt = new Cls(this.clsHtCls, terp, "Ht", this.clsObj); + } + hunk ./terse-vm/src/terse/vm/Wrap.java 1375 + this.clsUsrCls = terp.clss.get("usrcls"); + if (this.clsUsrCls == null) { + this.clsUsrCls = new Cls(terp.tMetaclsCls, terp, "UsrCls", this.clsObjCls); + } + this.clsUsr = terp.clss.get("usr"); + if (this.clsUsr == null) { + this.clsUsr = new Cls(this.clsUsrCls, terp, "Usr", this.clsObj); + } + hunk ./terse-vm/src/terse/vm/Wrap.java 1422 + public Cls clsHtCls; + public Cls clsHt; + hunk ./terse-vm/src/terse/vm/Wrap.java 1512 + public Cls clsUsrCls; + public Cls clsUsr; + hunk ./terse-vm/src/terse/vm/wrap.tcl 46 - puts " Cls self = terp.wrap.cls$cls;" - set call "[string range $cls 0 end-3].$name (terp" ;# Drop the trailing Cls. - set pp [lrange $pp 1 end] ;# Pop off Terp. + if {[string match {Terp *} [lindex $pp 0]]} { + # Most Cls methods. + puts " Cls self = terp.wrap.cls$cls;" + set call "[string range $cls 0 end-3].$name (terp" ;# Drop the trailing Cls. + set pp [lrange $pp 1 end] ;# Pop off Terp. + } elseif {[string match {Cls *} [lindex $pp 0]]} { + # Special UsrCls methods. + set p [lindex $pp 0] + set atype [lindex $p 0] + set aname [lindex $p 1] + puts " Cls self = (Cls) r;" + set call "[string range $cls 0 end-3].$name (self" ;# Drop the trailing Cls. + set pp [lrange $pp 1 end] ;# Pop off Cls. + } else { + error "Expected Terp or Cls as first arg for static methods on Cls cls." + } hunk ./terse-web/prelude.txt 120 - '|link|/HelloWeb|[HelloWeb]|'; + '|link|/DemoHt|[DemoHt]|'; hunk ./terse-web/prelude.txt 138 - '|link|/HelloWeb|[HelloWeb]|', 'HelloWeb '; + '|link|/DemoHt|[DemoHt]|', 'DemoHt '; hunk ./terse-web/prelude.txt 394 -class HelloWeb App -meth HelloWeb handle:query: +class DemoHt App +meth DemoHt handle:query: + + guts = Ht( + Tag('li', 'Test.'), + Tag('li', TAG('span'; 'style', 'color:yellow'; 'Hello')), + Tag('li', TAG('span'; 'style', 'background-color:brown'; 'World!')), + Tag('li', '[', TAG('a'; 'href', '/Home'; 'GO HOME'), ']'), + ). + guts append: Ht( + FOR(i:100)MAP( + Tag('li', i))). + page = TAG('html', + TAG('body'; + 'bgcolor', '#222222'; + 'text', '#DDDDDD'; + TAG('big', + TAG('big', + TAG('ul', guts))))). hunk ./terse-web/prelude.txt 415 - 'title', 'HelloWeb Title'; - 'value', ' -
  -
  Test. -
  hello -
  world -
  Go Home - ' ap: - FOR(i:100)MAP( - VEC('
  ', i) jam - ) implode - ) + 'title', 'DemoHt Title'; + 'value', page). hunk ./terse-web/src/terse/web/WebServer.java 20 -import terse.vm.Ur.Ht; +import terse.vm.Ur.Html; hunk ./terse-web/src/terse/web/WebServer.java 63 - Ht ht; + Html ht; hunk ./terse-web/src/terse/web/WebServer.java 67 - ht = new Ht(); + ht = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 79 - Ht.tag(ht, "span", strs("style", "color=#555555"), "" + Html.tag(ht, "span", strs("style", "color=#555555"), "" hunk ./terse-web/src/terse/web/WebServer.java 84 - Ht.tag(ht, "span", strs("style", + Html.tag(ht, "span", strs("style", hunk ./terse-web/src/terse/web/WebServer.java 94 - Ht defs = new Ht(); + Html defs = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 99 - Ht.tag(defs, "li", null, valueVisitor.ht.append(" );")); + Html.tag(defs, "li", null, valueVisitor.ht.append(" );")); hunk ./terse-web/src/terse/web/WebServer.java 101 - Ht.tag(ht, "ol", null, defs); + Html.tag(ht, "ol", null, defs); hunk ./terse-web/src/terse/web/WebServer.java 107 - Ht defs = new Ht(); + Html defs = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 114 - Ht.tag(defs, "dt", null, keyVisitor.ht.append(";")); - Ht.tag(defs, "dd", null, valueVisitor.ht.append(";")); + Html.tag(defs, "dt", null, keyVisitor.ht.append(";")); + Html.tag(defs, "dd", null, valueVisitor.ht.append(";")); hunk ./terse-web/src/terse/web/WebServer.java 117 - Ht.tag(ht, "dl", null, defs); + Html.tag(ht, "dl", null, defs); hunk ./terse-web/src/terse/web/WebServer.java 141 - Ht maybeLink(String s, HashMap query) { + Html maybeLink(String s, HashMap query) { hunk ./terse-web/src/terse/web/WebServer.java 148 - Ht z = Ht.tag(null, "a", params, label); + Html z = Html.tag(null, "a", params, label); hunk ./terse-web/src/terse/web/WebServer.java 153 - return new Ht(s); + return new Html(s); hunk ./terse-web/src/terse/web/WebServer.java 157 - Ht maybeLink(Ur x, HashMap query) { + Html maybeLink(Ur x, HashMap query) { hunk ./terse-web/src/terse/web/WebServer.java 182 - public Ht innerHt() { + public Html innerHt() { hunk ./terse-web/src/terse/web/WebServer.java 187 - Ht page = new Ht(); + Html page = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 190 - Ht form = new Ht(); + Html form = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 197 - Ht.tag(form, "b", null, fname); - form.append(Ht.entity("nbsp")); - Ht.tag(form, "input", strs( "name", fname, "value", + Html.tag(form, "b", null, fname); + form.append(Html.entity("nbsp")); + Html.tag(form, "input", strs( "name", fname, "value", hunk ./terse-web/src/terse/web/WebServer.java 201 - Ht.tag(form, "p", null, ""); + Html.tag(form, "p", null, ""); hunk ./terse-web/src/terse/web/WebServer.java 206 - Ht.tag(form, "b", null, fname); - form.append(Ht.entity("nbsp")); - Ht.tag(form, "input", strs( "name", fname, "value", + Html.tag(form, "b", null, fname); + form.append(Html.entity("nbsp")); + Html.tag(form, "input", strs( "name", fname, "value", hunk ./terse-web/src/terse/web/WebServer.java 210 - Ht.tag(form, "p", null, ""); + Html.tag(form, "p", null, ""); hunk ./terse-web/src/terse/web/WebServer.java 212 - Ht.tag(form, "textarea", textareaParams, text); - Ht.tag(form, "p", null, ""); - Ht.tag(form, "input", strs( "type", "submit", "value", + Html.tag(form, "textarea", textareaParams, text); + Html.tag(form, "p", null, ""); + Html.tag(form, "input", strs( "type", "submit", "value", hunk ./terse-web/src/terse/web/WebServer.java 216 - Ht.tag(form, "input", strs( "type", "reset"), ""); + Html.tag(form, "input", strs( "type", "reset"), ""); hunk ./terse-web/src/terse/web/WebServer.java 218 - Ht.tag(page, "form", strs( "method", "POST", "action", + Html.tag(page, "form", strs( "method", "POST", "action", hunk ./terse-web/src/terse/web/WebServer.java 229 - public Ht innerHt() { + public Html innerHt() { hunk ./terse-web/src/terse/web/WebServer.java 231 - Ht svg = new Ht(); + Html svg = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 248 - Ht.tag(svg, "line", how); + Html.tag(svg, "line", how); hunk ./terse-web/src/terse/web/WebServer.java 263 - Ht.tag(svg, "rect", how); + Html.tag(svg, "rect", how); hunk ./terse-web/src/terse/web/WebServer.java 279 - return Ht.tag(null, "svg", params, svg); + return Html.tag(null, "svg", params, svg); hunk ./terse-web/src/terse/web/WebServer.java 288 - public Ht innerHt() { + public Html innerHt() { hunk ./terse-web/src/terse/web/WebServer.java 291 - Ht page = new Ht(); - Ht.tag(page, "pre", null, text); + Html page = new Html(); + Html.tag(page, "pre", null, text); hunk ./terse-web/src/terse/web/WebServer.java 297 + public class HtmlRenderer extends BaseRenderer { + public HtmlRenderer(Dict dict, HashMap query) { + super(dict, query); + } + + public Html innerHt() { + return htmlAt(dict, "value"); + } + } + hunk ./terse-web/src/terse/web/WebServer.java 312 - public Ht innerHt() { - Ht rows = new Ht(); + public Html innerHt() { + Html rows = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 318 - Ht cols = new Ht(); + Html cols = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 321 - Ht.tag(cols, "td", null, maybeLink(x, query)); + Html.tag(cols, "td", null, maybeLink(x, query)); hunk ./terse-web/src/terse/web/WebServer.java 323 - Ht.tag(rows, "tr", null, cols); + Html.tag(rows, "tr", null, cols); hunk ./terse-web/src/terse/web/WebServer.java 325 - Ht page = new Ht(); - Ht.tag(page, "table", TABLE_PARAMS, rows); + Html page = new Html(); + Html.tag(page, "table", TABLE_PARAMS, rows); hunk ./terse-web/src/terse/web/WebServer.java 340 - public Ht toHt() { + public Html toHt() { hunk ./terse-web/src/terse/web/WebServer.java 342 - Ht head = new Ht(); - Ht.tag(head, "title", null, + Html head = new Html(); + Html.tag(head, "title", null, hunk ./terse-web/src/terse/web/WebServer.java 346 - Ht body = new Ht(); - Ht.tag(body, "b", null, + Html body = new Html(); + Html.tag(body, "b", null, hunk ./terse-web/src/terse/web/WebServer.java 349 - Ht.tag(body, "hr", null, ""); + Html.tag(body, "hr", null, ""); hunk ./terse-web/src/terse/web/WebServer.java 351 - Ht.tag(body, "hr", null, ""); + Html.tag(body, "hr", null, ""); hunk ./terse-web/src/terse/web/WebServer.java 355 - Ht footer = new Ht(); + Html footer = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 362 - footer.append(Ht.entity("nbsp")); + footer.append(Html.entity("nbsp")); hunk ./terse-web/src/terse/web/WebServer.java 364 - footer.append(Ht.entity("nbsp")); + footer.append(Html.entity("nbsp")); hunk ./terse-web/src/terse/web/WebServer.java 366 - Ht.tag(body, "tt", null, footer); - Ht.tag(body, "p", null, ""); - Ht.tag(body, "small", null, "\"DEBUG:\"" + dict.toString()); + Html.tag(body, "tt", null, footer); + Html.tag(body, "p", null, ""); + Html.tag(body, "small", null, "\"DEBUG:\"" + dict.toString()); hunk ./terse-web/src/terse/web/WebServer.java 370 - return Ht.tag(null, "html", null, head.append(body)); + return Html.tag(null, "html", null, head.append(body)); hunk ./terse-web/src/terse/web/WebServer.java 375 - Ht pre = new Ht(); + Html pre = new Html(); hunk ./terse-web/src/terse/web/WebServer.java 381 - Ht z = new Ht(); - Ht.tag(z, "pre", null, pre); - Ht.tag(z, "hr", null, ""); - Ht.tag(z, "small", null, dict.toString()); + Html z = new Html(); + Html.tag(z, "pre", null, pre); + Html.tag(z, "hr", null, ""); + Html.tag(z, "small", null, dict.toString()); hunk ./terse-web/src/terse/web/WebServer.java 389 - Ht innerHt() { + Html innerHt() { hunk ./terse-web/src/terse/web/WebServer.java 456 + } else if (type.equals("html")) { + r = new HtmlRenderer(dict, query);