Merge pull request trufflesuite#130 from trufflesuite/meaningful-next

Update truffle-debugger selectors
nakajo2011 · May 3, 2018 · 4a1274e · 4a1274e
2 parents 88a0d21 + c3b204e
commit 4a1274e
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/packages/truffle-core/lib/commands/debug.js b/packages/truffle-core/lib/commands/debug.js
@@ -113,7 +113,7 @@ var command = {
         function printFile() {
           var message = "";
 
-          var sourcePath = session.view(solidity.next.source).sourcePath;
+          var sourcePath = session.view(solidity.current.source).sourcePath;
 
           if (sourcePath) {
             message += path.basename(sourcePath);
@@ -126,8 +126,8 @@ var command = {
         }
 
         function printState() {
-          var source = session.view(solidity.next.source).source;
-          var range = session.view(solidity.next.sourceRange);
+          var source = session.view(solidity.current.source).source;
+          var range = session.view(solidity.current.sourceRange);
           debug("source: %o", source);
           debug("range: %o", range);
 
@@ -150,7 +150,7 @@ var command = {
         }
 
         function printInstruction() {
-          var instruction = session.view(solidity.next.instruction);
+          var instruction = session.view(solidity.current.instruction);
           var step = session.view(trace.step);
           var traceIndex = session.view(trace.index);
 
@@ -240,7 +240,7 @@ var command = {
         }
 
         function printVariables() {
-          var variables = session.view(data.identifiers.native.current);
+          var variables = session.view(data.current.identifiers.native);
 
           // Get the length of the longest name.
           var longestNameLength = Math.max.apply(null, (Object.keys(variables).map(function(name) {
@@ -266,7 +266,7 @@ var command = {
         }
 
         function evalAndPrintExpression(expr, indent, suppress) {
-          var context = session.view(data.identifiers.native.current);
+          var context = session.view(data.current.identifiers.native);
           try {
             var result = safeEval(expr, context);
             var formatted = formatValue(result, indent);
@@ -296,7 +296,7 @@ var command = {
 
         function toggleBreakpoint() {
           var currentCall = session.view(evm.current.call);
-          var currentNode = session.view(ast.next.node).id;
+          var currentNode = session.view(ast.current.node).id;
 
           // Try to find the breakpoint in the list
           var found = false;
@@ -417,7 +417,7 @@ var command = {
             case "u":
             case "n":
             case "c":
-              if(!session.view(solidity.next.source).source) {
+              if(!session.view(solidity.current.source).source) {
                 printInstruction();
               }