added 'reg' type

wavedrom · Nov 7, 2017 · 1a5d45a · 1a5d45a
1 parent 5b69672
commit 1a5d45a
Show file tree

Hide file tree

Showing 7 changed files with 308 additions and 19 deletions.
diff --git a/lib/eva.js b/lib/eva.js
@@ -28,6 +28,8 @@ function eva (id) {
         if (Object.prototype.toString.call(source.assign) !== '[object Array]') {
             return erra({ message: '[Semantic]: "assign" object hasto be an Array "assign:[]"'});
         }
+    } else if (source.reg) {
+        // test register
     } else {
         return erra({ message: '[Semantic]: "signal:[...]" or "assign:[...]" property is missing inside the root Object'});
     }

diff --git a/lib/render-reg.js b/lib/render-reg.js
@@ -0,0 +1,16 @@
+'use strict';
+
+var jsonmlParse = require('./create-element'),
+    render = require('bit-field/lib/render');
+
+function renderReg (index, source, parent) {
+    // cleanup
+    while (parent.childNodes.length) {
+        parent.removeChild(parent.childNodes[0]);
+    }
+    var e = render(source.reg);
+    var node = jsonmlParse(e);
+    parent.insertBefore(node, null);
+}
+
+module.exports = renderReg;
diff --git a/lib/render-wave-form.js b/lib/render-wave-form.js
@@ -10,6 +10,7 @@ var rec = require('./rec'),
     renderGroups = require('./render-groups'),
     renderWaveLane = require('./render-wave-lane'),
     renderAssign = require('./render-assign'),
+    renderReg = require('./render-reg'),
     renderArcs = require('./render-arcs'),
     insertSVGTemplate = require('./insert-svg-template'),
     insertSVGTemplateAssign = require('./insert-svg-template-assign');
@@ -48,6 +49,8 @@ function renderWaveForm (index, source, output) {
     } else if (source.assign) {
         insertSVGTemplateAssign(index, document.getElementById(output + index), source);
         renderAssign(index, source);
+    } else if (source.reg) {
+        renderReg(index, source, document.getElementById(output + index));
     }
 }
 

diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
     "yargs": "^10.0.3"
   },
   "dependencies": {
+    "bit-field": "^0.2.3",
     "onml": "^0.4.1",
     "tspan": "^0.2.1"
   }

diff --git a/test/test-reg.html b/test/test-reg.html
@@ -0,0 +1,38 @@
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title>testsuit</title>
+  <script type="text/javascript" src="../skins/default.js"></script>
+  <script type="text/javascript" src="../skins/narrow.js"></script>
+  <script type="text/javascript" src="../wavedrom.min.js"></script>
+  <link href='http://fonts.googleapis.com/css?family=Roboto|Droid+Sans+Mono|Varela+Round' rel='stylesheet' type='text/css'>
+</head>
+
+<body>
+
+<div class="content">
+
+<script type="WaveDrom">
+{ signal: [{ name: "Alfa", wave: "01.zx=ud.23.45" }] }
+</script>
+
+<script type="WaveDrom">
+{reg: [
+  {name: 'r', bits: 8}
+]}
+</script>
+
+<script type="WaveDrom">
+{reg: [
+  {name: 'a', bits: 8},
+  {name: 'b', bits: 8},
+  {name: 'c', bits: 8}
+]}
+</script>
+
+</div>
+
+<script>(function(){ window.addEventListener("load", WaveDrom.ProcessAll, false); })();</script>
+
+</body>
+</html>