tester uses same layout as nimbuild

2026-07-19 23:41:29 +00:00 · 2011-11-12 12:17:44 +01:00
parent 40fa4bb52d
commit 395b05f911
5 changed files with 281 additions and 11 deletions
--- a/lib/pure/lexbase.nim
+++ b/lib/pure/lexbase.nim
@@ -64,7 +64,7 @@ const

 proc close(L: var TBaseLexer) =
  dealloc(L.buf)
-  L.input.close(L.input)
+  close(L.input)

 proc FillBuffer(L: var TBaseLexer) =
  var
@@ -80,8 +80,8 @@ proc FillBuffer(L: var TBaseLexer) =
  if toCopy > 0:
    MoveMem(L.buf, addr(L.buf[L.sentinel + 1]), toCopy * chrSize) 
    # "moveMem" handles overlapping regions
-  charsRead = L.input.readData(L.input, addr(L.buf[toCopy]),
-                               (L.sentinel + 1) * chrSize) div chrSize
+  charsRead = readData(L.input, addr(L.buf[toCopy]),
+                       (L.sentinel + 1) * chrSize) div chrSize
  s = toCopy + charsRead
  if charsRead < L.sentinel + 1:
    L.buf[s] = EndOfFile      # set end marker
@@ -103,8 +103,8 @@ proc FillBuffer(L: var TBaseLexer) =
        L.bufLen = L.BufLen * 2
        L.buf = cast[cstring](realloc(L.buf, L.bufLen * chrSize))
        assert(L.bufLen - oldBuflen == oldBufLen)
-        charsRead = L.input.ReadData(L.input, addr(L.buf[oldBufLen]),
-                                     oldBufLen * chrSize) div chrSize
+        charsRead = ReadData(L.input, addr(L.buf[oldBufLen]),
+                             oldBufLen * chrSize) div chrSize
        if charsRead < oldBufLen:
          L.buf[oldBufLen + charsRead] = EndOfFile
          L.sentinel = oldBufLen + charsRead
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -962,7 +962,9 @@ proc substr*(s: string, first, last: int): string {.
  ## copies a slice of `s` into a new string and returns this new
  ## string. The bounds `first` and `last` denote the indices of
  ## the first and last characters that shall be copied. If ``last``
-  ## is omitted, it is treated as ``high(s)``.
+  ## is omitted, it is treated as ``high(s)``. If ``last >= s.len``, ``s.len``
+  ## is used instead: This means ``substr`` can also be used to `cut`:idx:
+  ## or `limit`:idx: a string's length.

 proc zeroMem*(p: Pointer, size: int) {.importc, noDecl.}
  ## overwrites the contents of the memory at ``p`` with the value 0.
--- a/tests/css/boilerplate.css
+++ b/tests/css/boilerplate.css
@@ -0,0 +1,138 @@
+/* ==== Scroll down to find where to put your styles :) ==== */
+
+/*  HTML5 âœ° Boilerplate  */
+
+html, body, div, span, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp,
+small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block;
+}
+
+blockquote, q { quotes: none; }
+blockquote:before, blockquote:after,
+q:before, q:after { content: ''; content: none; }
+ins { background-color: #ff9; color: #000; text-decoration: none; }
+mark { background-color: #ff9; color: #000; font-style: italic; font-weight: bold; }
+del { text-decoration: line-through; }
+abbr[title], dfn[title] { border-bottom: 1px dotted; cursor: help; }
+table { border-collapse: collapse; border-spacing: 0; }
+hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
+input, select { vertical-align: middle; }
+
+body { font:13px/1.231 sans-serif; *font-size:small; } 
+select, input, textarea, button { font:99% sans-serif; }
+pre, code, kbd, samp { font-family: monospace, sans-serif; }
+
+html { overflow-y: scroll; }
+a:hover, a:active { outline: none; }
+ul, ol { margin-left: 2em; }
+ol { list-style-type: decimal; }
+nav ul, nav li { margin: 0; list-style:none; list-style-image: none; }
+small { font-size: 85%; }
+strong, th { font-weight: bold; }
+td { vertical-align: top; }
+
+sub, sup { font-size: 75%; line-height: 0; position: relative; }
+sup { top: -0.5em; }
+sub { bottom: -0.25em; }
+
+pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; padding: 15px; }
+textarea { overflow: auto; }
+.ie6 legend, .ie7 legend { margin-left: -7px; } 
+input[type="radio"] { vertical-align: text-bottom; }
+input[type="checkbox"] { vertical-align: bottom; }
+.ie7 input[type="checkbox"] { vertical-align: baseline; }
+.ie6 input { vertical-align: text-bottom; }
+label, input[type="button"], input[type="submit"], input[type="image"], button { cursor: pointer; }
+button, input, select, textarea { margin: 0; }
+input:valid, textarea:valid   {  }
+input:invalid, textarea:invalid { border-radius: 1px; -moz-box-shadow: 0px 0px 5px red; -webkit-box-shadow: 0px 0px 5px red; box-shadow: 0px 0px 5px red; }
+.no-boxshadow input:invalid, .no-boxshadow textarea:invalid { background-color: #f0dddd; }
+
+a:link { -webkit-tap-highlight-color: #FF5E99; }
+
+button {  width: auto; overflow: visible; }
+.ie7 img { -ms-interpolation-mode: bicubic; }
+
+body, select, input, textarea {  color: #444; }
+h1, h2, h3, h4, h5, h6 { font-weight: bold; }
+a, a:active, a:visited { color: #607890; }
+a:hover { color: #036; }
+
+/*
+    // ========================================== \\
+   ||                                              ||
+   ||               Your styles !                  ||
+   ||                                              ||
+    \\ ========================================== //
+*/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.ir { display: block; text-indent: -999em; overflow: hidden; background-repeat: no-repeat; text-align: left; direction: ltr; }
+.hidden { display: none; visibility: hidden; }
+.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
+.visuallyhidden.focusable:active,
+.visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; }
+.invisible { visibility: hidden; }
+.clearfix:before, .clearfix:after { content: "\0020"; display: block; height: 0; overflow: hidden; }
+.clearfix:after { clear: both; }
+.clearfix { zoom: 1; }
+
+
+@media all and (orientation:portrait) {
+
+}
+
+@media all and (orientation:landscape) {
+
+}
+
+@media screen and (max-device-width: 480px) {
+
+  /* html { -webkit-text-size-adjust:none; -ms-text-size-adjust:none; } */
+}
+
+
+@media print {
+  * { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important;
+  -ms-filter: none !important; } 
+  a, a:visited { color: #444 !important; text-decoration: underline; }
+  a[href]:after { content: " (" attr(href) ")"; }
+  abbr[title]:after { content: " (" attr(title) ")"; }
+  .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; }  
+  pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
+  thead { display: table-header-group; }
+  tr, img { page-break-inside: avoid; }
+  @page { margin: 0.5cm; }
+  p, h2, h3 { orphans: 3; widows: 3; }
+  h2, h3{ page-break-after: avoid; }
+}
--- a/tests/css/style.css
+++ b/tests/css/style.css
@@ -0,0 +1,114 @@
+body {
+  font-size: medium;
+}
+
+div#header {
+  font-size: 2em;
+  background-color: #3d3d3d;
+  border-bottom: solid 2px #000000;
+  padding: 0.25em;
+  color: #ffffff;
+}
+
+div#content {
+  margin: 0.5em;
+}
+
+table {
+  text-align: left;
+  margin-bottom: 0.5em;
+}
+
+table td, table th {
+  padding: 0.15em 0.5em;
+}
+
+tr:nth-child(even) {
+  background-color: #eee;
+}
+
+/* Awesome buttons :P */
+
+a.button {
+  border-radius: 2px 2px 2px 2px;
+  background: -moz-linear-gradient(top, #f7f7f7, #ebebeb);
+  background: -webkit-linear-gradient(top, #f7f7f7, #ebebeb);
+  background: -o-linear-gradient(top, #f7f7f7, #ebebeb);
+  text-decoration: none;
+  color: #3d3d3d;
+  padding: 5px;
+  border: solid 1px #9d9d9d;
+  display: inline-block;
+  position: relative;
+  text-align: center;
+  font-size: small;
+}
+
+a.button.active {
+  background: -moz-linear-gradient(top, #00B40C, #03A90E);
+  background: -webkit-linear-gradient(top, #00B40C, #03A90E);
+  background: -o-linear-gradient(top, #00B40C, #03A90E);
+  border: solid 1px #148420;
+  color: #ffffff;
+}
+
+a.button.left {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+a.button.middle {
+  border-radius: 0;
+  border-left: 0;
+}
+
+a.button.right {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-left: 0;
+}
+
+a.button:hover {
+  background: -moz-linear-gradient(top, #0099c7, #0294C1);
+  background: -webkit-linear-gradient(top, #0099c7, #0294C1);
+  background: -o-linear-gradient(top, #0099c7, #0294C1);
+  border: solid 1px #077A9C;
+  color: #ffffff;
+}
+
+a.button.middle:hover, a.button.right:hover {
+  border-left: 0;
+}
+
+a.button span.download {
+  background-image: url("../images/icons.png");
+  background-repeat: no-repeat;
+  display: inline-block;
+  margin: auto 3px auto auto;
+  height: 15px;
+  width: 14px;
+  position: relative;
+  background-position: 0 -30px;
+  top: 3px;
+}
+
+a.button span.book {
+  background-image: url("../images/icons.png");
+  background-repeat: no-repeat;
+  display: inline-block;
+  margin: auto 3px auto auto;
+  height: 15px;
+  width: 14px;
+  position: relative;
+  background-position: 0 0;
+  top: 3px;
+}
+
+a.button.active span.download, a.button:hover span.download {
+  background-position: 0 -45px;
+}
+
+a.button.active span.book, a.button:hover span.book {
+  background-position: 0 -15px;
+}
+
--- a/tests/tester.nim
+++ b/tests/tester.nim
@@ -115,7 +115,7 @@ proc callCompiler(cmdTemplate, filename, options: string): TSpec =
                       options={poStdErrToStdOut, poUseShell})
  var outp = p.outputStream
  var s = ""
-  while running(p) or not outp.atEnd(outp):
+  while running(p) or not atEnd(outp):
    var x = outp.readLine().string
    if x =~ pegOfInterest:
      # `s` should contain the last error message
@@ -164,19 +164,35 @@ const
  TableHeader3 = "<table border=\"1\"><tr><td>Test</td>" &
                 "<td>Given</td><td>Success</td></tr>\n"
  TableFooter = "</table>\n"
+  HtmlBegin = """<html>
+    <head> 
+      <title>Test results</title>
+      <style type="text/css">
+      <!--""" & slurp("css/boilerplate.css") & "\n" &
+                slurp("css/style.css") &
+      """-->
+    </style>
+
+    </head>
+    <body>"""
+  
+  HtmlEnd = "</body></html>"
+
+proc td(s: string): string =
+  result = s.substr(0, 200).XMLEncode

 proc addResult(r: var TResults, test, expected, given: string,
               success: TResultEnum) =
  r.data.addf("<tr><td>$#</td><td>$#</td><td>$#</td><td>$#</td></tr>\n", [
-    XMLEncode(test), XMLEncode(expected), XMLEncode(given), success.colorResult])
+    XMLEncode(test), td(expected), td(given), success.colorResult])

 proc addResult(r: var TResults, test, given: string,
               success: TResultEnum) =
  r.data.addf("<tr><td>$#</td><td>$#</td><td>$#</td></tr>\n", [
-    XMLEncode(test), XMLEncode(given), success.colorResult])
+    XMLEncode(test), td(given), success.colorResult])

 proc listResults(reject, compile, run: TResults) =
-  var s = "<html>"
+  var s = HtmlBegin
  s.add("<h1>Tests to Reject</h1>\n")
  s.add($reject)
  s.add(TableHeader4 & reject.data & TableFooter)
@@ -186,7 +202,7 @@ proc listResults(reject, compile, run: TResults) =
  s.add("<br /><br /><br /><h1>Tests to Run</h1>\n")
  s.add($run)
  s.add(TableHeader4 & run.data & TableFooter)
-  s.add("</html>")
+  s.add(HtmlEnd)
  writeFile(resultsFile, s)

 proc cmpMsgs(r: var TResults, expected, given: TSpec, test: string) =