From 1a3ff0c9b5e71cef071e91d4f0f288633a9c45c5 Mon Sep 17 00:00:00 2001
From: Borys_Levytskyi <blevitsky@yandex.ru>
Date: Sun, 27 Nov 2016 16:06:01 +0200
Subject: [PATCH] Fix error when not showing shift expression results

---
 ds.bat                                              |  1 +
 src/app/components/AppRoot.jsx                      |  3 ---
 .../results/BitwiseOperationExpressionView.jsx      | 13 +++++++++----
 src/app/expression.js                               |  1 -
 src/app/index.jsx                                   |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 ds.bat

diff --git a/ds.bat b/ds.bat
new file mode 100644
index 0000000..12f5cce
--- /dev/null
+++ b/ds.bat
@@ -0,0 +1 @@
+npm run serv
\ No newline at end of file
diff --git a/src/app/components/AppRoot.jsx b/src/app/components/AppRoot.jsx
index ce768de..9a9f82f 100644
--- a/src/app/components/AppRoot.jsx
+++ b/src/app/components/AppRoot.jsx
@@ -8,12 +8,9 @@ export default class AppRoot extends React.Component {
         this.props.appState.onChange(() => this.refresh());
     }
     refresh() {
-        console.log(this.props.appState.commandResults);
         this.setState(this.props.appState);
     }
     render() {
-        console.log('[AppRoot] render():this.state.commandResults', this.state.commandResults)
-
         var results = this.state.commandResults.map((r, i) => <DisplayResultView key={i} content={r} input={r.input} inputHash={r.inputHash} />);
         return <div>
             <div className="header">
diff --git a/src/app/components/results/BitwiseOperationExpressionView.jsx b/src/app/components/results/BitwiseOperationExpressionView.jsx
index 5ec3d50..26dee9a 100644
--- a/src/app/components/results/BitwiseOperationExpressionView.jsx
+++ b/src/app/components/results/BitwiseOperationExpressionView.jsx
@@ -10,7 +10,9 @@ export default class BitwiseOperationEpxressionView extends React.Component {
         }
 
         return <table className="expression">
-                    <tbody>{rows}</tbody>
+                    <tbody>
+                            {rows}
+                    </tbody>
                 </table>
     }
 
@@ -24,6 +26,7 @@ export default class BitwiseOperationEpxressionView extends React.Component {
 
         if(expr instanceof expression.MultipleOperandsExpression) {
             const m = BitwiseExpressionViewModel.buildMultiple(expr);
+            console.log('Render model', m);
             return m.items.map((itm, i) => <ExpressionRow key={i} {...itm} maxNumberOfBits={m.maxNumberOfBits} />);
         }
 
@@ -35,12 +38,14 @@ class ExpressionRow extends React.Component {
     render() {
         const { sign, label, bin, other, css, maxNumberOfBits } = this.props;
         
-        return <tr className={css}>
+        var tr = <tr className={css}>
                     <td className="sign">{sign}</td>
                     <td className="label">{label}</td>
                     <td className="bin">{formatter.padLeft(bin, maxNumberOfBits, '0')}</td>
                     <td className="other">{other}</td>
                 </tr>;
+
+        return tr;
     }
 }
 
@@ -89,14 +94,14 @@ class BitwiseExpressionViewModel {
 
     addExpression(expression) {
         this.maxNumberOfBits = Math.max(expression.operand1.getLengthInBits(), this.maxNumberOfBits);
-        this.items.push({ sign: expression.sign, label: expression.operand1.input, bin: expression.operand1.bin, other: expression.operand1.other, css: ''});
+        this.items.push({ sign: expression.sign, label: expression.operand1.toString(), bin: expression.operand1.bin, other: expression.operand1.other, css: ''});
     };
 
     addShiftExpressionResult(expression, resultOperand) {
         this.maxNumberOfBits = Math.max(resultOperand.getLengthInBits(), this.maxNumberOfBits);
         this.items.push({
             sign: expression.sign + expression.operand1.input,
-            label: resultOperand,
+            label: resultOperand.toString(),
             bin: resultOperand.bin,
             other: resultOperand.other,
             css: 'expression-result'});
diff --git a/src/app/expression.js b/src/app/expression.js
index 95ac769..b784608 100644
--- a/src/app/expression.js
+++ b/src/app/expression.js
@@ -36,7 +36,6 @@ var expression = {
           this.factories.push(factory);
         },
         Operand:Operand,
-        TwoOperandExpression: TwoOperandExpression,
         SingleOperandExpression: SingleOperandExpression,
         ListOfNumbersExpression: ListOfNumbersExpression,
         MultipleOperandsExpression: MultipleOperandsExpression
diff --git a/src/app/index.jsx b/src/app/index.jsx
index 15213b5..f5ba796 100644
--- a/src/app/index.jsx
+++ b/src/app/index.jsx
@@ -10,7 +10,7 @@ commands.initialize(cmd);
 
 // cmd.execute('1');
 // cmd.execute('2');
-cmd.execute('~3');
+cmd.execute('1|2<<2');
 
 var root = <AppRoot appState={appState} />;
 ReactDOM.render(root, document.getElementById('root'));
\ No newline at end of file