do not show parenthesis in error message for syntax error when there …

…is nothing to put inside them. fixes for css in demo. refs #2
codeschool · Jul 2, 2015 · dee97f3 · dee97f3
1 parent 152d831
commit dee97f3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/demo/css/demo.css b/demo/css/demo.css
@@ -76,8 +76,8 @@ body {
 }
 
 footer, header {
-  padding: 8px;
   color: #dbdbdb;
+  padding: 0;
 }
 
 footer h3, header h2 {
@@ -87,16 +87,18 @@ footer h3, header h2 {
 footer h3 {
   margin: 0 auto;
   text-align: center;
+  line-height: 24px;
+  font-size: 16px;
 }
 
-footer a, footer a:visited {
-  color: #2f6a9e;
+a, a:visited {
+  color: #e6db74;
   text-decoration: none;
 }
 
-footer a:hover, footer a:active {
-  color: #329e2f;
-  text-decoration: underline;
+a:hover, a:active {
+  color: #77A025;
+  text-decoration: none;
 
 }
 

diff --git a/demo/index.html b/demo/index.html
@@ -13,7 +13,7 @@
 
   <body>
     <header>
-       <h2>sqlite-parser demo</h2>
+       <h2><a title="sqlite-parser on GitHub" href="https://github.com/codeschool/sqlite-parser/">sqlite-parser</a> demo</h2>
     </header>
 
     <div class="container">
@@ -50,7 +50,7 @@ <h3 id="ast-header">Syntax Tree</h3>
 
     <footer>
        <h3>
-         <a title="sqlite-parser" href="https://github.com/codeschool/sqlite-parser/">sqlite-parser</a>
+         <a title="sqlite-parser on GitHub" href="https://github.com/codeschool/sqlite-parser/">sqlite-parser</a>
          &lt; <a title="Nick Wronski" href="mailto:[email protected]">[email protected]</a> &gt;
        </h3>
        <h3>

diff --git a/demo/sqlite-parser-demo.js b/demo/sqlite-parser-demo.js
@@ -28814,7 +28814,7 @@ module.exports = (function (_) {
       // Don't accidentally repeat the first description in the output
       chainDetail = _(chain).rest().takeRight(2).value();
       message = 'Syntax error found near ' + _.first(chain) +
-                ' (' + chainDetail.join(', ') + ')' + '';
+                (chainDetail.length > 0 ? ' (' + chainDetail.join(', ') + ')' : '');
       location = _.findLast(this.events, {description: _.last(chain)}).location;
       throw {
         'name': 'SyntaxError',

diff --git a/dist/sqlite-parser.js b/dist/sqlite-parser.js
@@ -28744,7 +28744,7 @@ module.exports = (function (_) {
       // Don't accidentally repeat the first description in the output
       chainDetail = _(chain).rest().takeRight(2).value();
       message = 'Syntax error found near ' + _.first(chain) +
-                ' (' + chainDetail.join(', ') + ')' + '';
+                (chainDetail.length > 0 ? ' (' + chainDetail.join(', ') + ')' : '');
       location = _.findLast(this.events, {description: _.last(chain)}).location;
       throw {
         'name': 'SyntaxError',

diff --git a/lib/tracer.js b/lib/tracer.js
@@ -66,7 +66,7 @@ module.exports = (function (_) {
       // Don't accidentally repeat the first description in the output
       chainDetail = _(chain).rest().takeRight(2).value();
       message = 'Syntax error found near ' + _.first(chain) +
-                ' (' + chainDetail.join(', ') + ')' + '';
+                (chainDetail.length > 0 ? ' (' + chainDetail.join(', ') + ')' : '');
       location = _.findLast(this.events, {description: _.last(chain)}).location;
       throw {
         'name': 'SyntaxError',

diff --git a/src/tracer.js b/src/tracer.js
@@ -66,7 +66,7 @@ module.exports = (function (_) {
       // Don't accidentally repeat the first description in the output
       chainDetail = _(chain).rest().takeRight(2).value();
       message = 'Syntax error found near ' + _.first(chain) +
-                ' (' + chainDetail.join(', ') + ')' + '';
+                (chainDetail.length > 0 ? ' (' + chainDetail.join(', ') + ')' : '');
       location = _.findLast(this.events, {description: _.last(chain)}).location;
       throw {
         'name': 'SyntaxError',