update npm packages and rebuild

Author: cs01

CHANGELOG.md

@@ -1,5 +1,10 @@
 # gdbgui release history
 
+## dev
+* ensure expressions with hex values are parsed and updated appropriately (#182)
+* improve command line arguments
+* use python logging module
+
 ## 0.11.2.0
 * add option to remove fflush command (#179)
 * remove react-treebeard and render filesystem w/ new component

gdbgui/src/js/GdbVariable.jsx

@@ -266,7 +266,6 @@ class GdbVariable extends React.Component {
         ''
       ),
       toggle_classes = has_children ? 'pointer' : '',
-      val = GdbVariable._get_value_jsx(mi_obj),
       plot_content = '',
       plot_button = '',
       plusminus_click_callback = has_children ? () => GdbVariable.click_toggle_children_visibility(mi_obj.name) : () => {}
@@ -300,7 +299,7 @@ class GdbVariable extends React.Component {
             {plus_or_minus} {expression} 
           </span>
 
-          {val}
+          {GdbVariable._get_value_jsx(mi_obj)}
 
           <span className="var_type">{_.trim(mi_obj.type) || ''}</span>
 
@@ -472,10 +471,14 @@ class GdbVariable extends React.Component {
     return new_obj
   }
   static _update_numeric_properties(obj) {
-    obj._float_value = parseFloat(obj.value)
+    let value = obj.value
+    if(obj.value.startsWith('0x')){
+      value = parseInt(obj.value, 16)
+    }
+    obj._float_value = parseFloat(value)
     obj.is_numeric = !window.isNaN(obj._float_value)
     obj.can_plot = obj.is_numeric && obj.expr_type === 'expr'
-    obj.is_int = obj.is_numeric ? parseFloat(obj.value) % 1 === 0 : false
+    obj.is_int = obj.is_numeric ? obj._float_value % 1 === 0 : false
   }
   static _update_radix_values(obj) {
     if (obj.is_int) {

gdbgui/src/js/Memory.jsx

@@ -8,8 +8,8 @@
 import {store} from 'statorgfc'
 import GdbApi from './GdbApi.jsx'
 import constants from './constants.js'
-import MemoryLink from './MemoryLink.jsx'
 import ReactTable from './ReactTable.jsx'
+import MemoryLink from './MemoryLink.jsx'
 import Actions from './Actions'
 import React from 'react'
 
@@ -219,11 +219,6 @@ class Memory extends React.Component {
     Memory.fetch_memory_from_state()
   }
 
-  static _make_addr_into_link_react(addr) {
-    void React
-    return <MemoryLink addr={addr} />
-  }
-
   /**
    * @param text: string to convert address-like text into clickable components
    * return react component
@@ -233,22 +228,21 @@ class Memory extends React.Component {
     if (text && matches && matches.length) {
       let addr = matches[0]
       let leading_text = text.slice(0, text.indexOf(addr))
-      let component = Memory._make_addr_into_link_react(addr)
       let trailing_text = text.slice(text.indexOf(addr) + addr.length, text.length)
       let suffix_component = trailing_text
       if (trailing_text) {
         // recursive call to turn additional addressed after the first
         suffix_component = Memory.make_addrs_into_links_react(trailing_text)
       }
       return (
-        <span>
+        <React.Fragment>
           {leading_text}
-          {component}
+          <MemoryLink addr={addr}/>
           {suffix_component}
-        </span>
+        </React.Fragment>
       )
     } else {
-      return <span>{text}</span>
+      return text
     }
   }
 

gdbgui/src/js/MemoryLink.jsx

@@ -2,21 +2,18 @@ import React from 'react'
 import Memory from './Memory.jsx'
 
 class MemoryLink extends React.Component {
-  constructor(props) {
-    super()
-    this.parsed_addr = `0x${parseInt(props.addr, 16).toString(16)}` // remove leading zeros
-  }
   render() {
+    // turn 0x00000000000000 into 0x0
+    const address_no_leading_zeros = '0x' + parseInt(this.props.addr, 16).toString(16)
     return (
-      <React.Fragment>
-        <span
+      <span
           className="pointer memadr_react"
-          onClick={() => Memory.set_inputs_from_address(this.parsed_addr)}
-          title={`click to explore memory at ${this.parsed_addr}`}
-          style={this.props.style}>
-          {this.parsed_addr}
-        </span>
-      </React.Fragment>
+          onClick={() => Memory.set_inputs_from_address(address_no_leading_zeros)}
+          title={`click to explore memory at ${address_no_leading_zeros}`}
+          style={this.props.style}
+      >
+        {address_no_leading_zeros}
+      </span>
     )
   }
   static defaultProps = {style: {fontFamily: 'monospace'}}

gdbgui/src/js/Settings.jsx

@@ -79,7 +79,7 @@ class Settings extends React.Component {
             'show_all_sent_commands_in_console',
             'Print all sent commands in console, including those sent automatically by gdbgui'
           )}
-          {Settings.get_checkbox_row('highlight_source_code', 'Add syntax highlighting to source files (turn off for better performance)')}
+          {Settings.get_checkbox_row('highlight_source_code', 'Add syntax highlighting to source files')}
 
           <tr>
             <td>

gdbgui/static/js/build.js

@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "license": "GPL-3.0",
   "scripts": {
-    "build": "webpack -p",
-    "watch": "webpack --watch",
+    "build": "webpack --mode production --config webpack.config.js",
+    "watch": "webpack --mode development --watch --config webpack.config.js",
     "test": "jest",
     "prettier": "prettier ./gdbgui/src/js/** --write"
   },
@@ -16,23 +16,22 @@
     ]
   },
   "dependencies": {
-    "babel-eslint": "^8.0.0",
-    "babel-preset-stage-0": "^6.24.1",
-    "eslint-loader": "^1.9.0",
-    "react": "^16.2.0",
-    "react-dom": "^16.2.0",
-    "statorgfc": "^0.1.6",
-    "webpack": "^3.5.5"
-  },
-  "devDependencies": {
     "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
+    "babel-eslint": "^8.2.3",
+    "babel-loader": "^7.1.4",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
-    "eslint": "^4.7.0",
+    "babel-preset-stage-0": "^6.24.1",
+    "eslint": "^4.19.1",
+    "eslint-loader": "^2.0.0",
     "eslint-plugin-prettier": "^2.6.0",
-    "eslint-plugin-react": "^7.3.0",
+    "eslint-plugin-react": "^7.7.0",
     "jest": "^21.2.1",
-    "prettier": "^1.10.2"
+    "prettier": "^1.12.0",
+    "react": "^16.3.1",
+    "react-dom": "^16.3.1",
+    "statorgfc": "^0.1.6",
+    "webpack": "^4.5.0",
+    "webpack-cli": "^2.0.14"
   }
 }

package.json

@@ -1,7 +1,14 @@
+const path = require('path');
+
 module.exports = {
   entry: './gdbgui/src/js/gdbgui.jsx',
+  devtool: 'source-map',
+  performance: {
+    hints: false
+  },
   output: {
-    filename: './gdbgui/static/js/build.js'
+    path: path.resolve(__dirname, 'gdbgui/static/js/'),
+    filename: 'build.js'
   },
   module: {
     rules: [
@@ -20,6 +27,5 @@ module.exports = {
         exclude: /node_modules/
       }
     ]
-  },
-  devtool: 'source-map'
+  }
 }