furnace-xray 1.1.0.pre1 → 1.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3fbcd1c6346fa30c03fa890bd356da8440d602
-  data.tar.gz: ab2c38eee0ee6edaff32064341037e61874bb34f
+  metadata.gz: c33b7ac042d318fbb36bc37effca9374300eff92
+  data.tar.gz: 126063f60ad1f161a7d3f8b093dbdf78a6637e94
 SHA512:
-  metadata.gz: 2b18eba9f93d570ddc9f9c40a4fead4b045c46088354666248b1eb87aa1ef835e3b919a030b5f59248a7b183703284f69b0c13b27a563181eb06b0c0bacb081d
-  data.tar.gz: b9cfcca32473c06a899459259a602028b322ed9db8c30ce43aea2a8d8697c3e63fa3b832d7d64679828dd0f5ba71ed2f329037c7df7d4fb656791853a732d4ed
+  metadata.gz: 14b818259d317c73fe046ef38ed131dbc24cd32430c4afdb2413f4100f90f76c7a12c0e7d418066caba2018ad396791fc0ea548b995f2bfae4502af630c1bf7c
+  data.tar.gz: aa33c93878d6d0a011c4640526c949114d89768bc0d9a631e2a145429047722924ebcade79660fb13028628e90d133c39e8ab23c464e123a361c4113d69bd5b7

data/lib/furnace-xray/app/assets/javascripts/application.js.coffee

@@ -64,16 +64,16 @@ class Application
       @transform.removeClass('active').html('')
       @diff.html('')
 
-      input = @data[@currentFunction]
+      input = Input.functions[@currentFunction].input
 
-      Drawer.reset() if @input?.source.name != input.source.name
+      Drawer.reset() if @input?.function.name != input.function.name
       Drawer.clear()
 
       @input = input
       @input.rewind(@currentStep)
       @drawer = new Drawer(new Graph(@input))
 
-      @title.html @input.function.title()
+      @title.html @input.map[@input.function.id]?.title()
       @diff.html "~ " + @input.previousState.cursor if @input.previousState?.cursor?
 
       @renewZoomer()
@@ -87,7 +87,7 @@ class Application
 
   dehasherize: ->
     hash = window.location.hash.from(1)
-    hash = "0:#{@data[0].events.length-1}" if hash.length == 0
+    hash = "0:#{Input.functions[0].input.events.length-1}" if hash.length == 0
     [@currentFunction, @currentStep] = hash.split(":").map (x) -> x.toNumber()
 
   jumpTo: (func, step) ->
@@ -95,8 +95,8 @@ class Application
       @selector.find('option').each (x) ->
         func = $(@).attr('value').toNumber() if $(@).text() == func
 
-    @currentFunction = func; step = @data[func].events.length-1 if step == undefined
-    @currentStep     = [step, @data[func].events.length-1].min()
+    @currentFunction = func; step = Input.functions[func].input.events.length-1 if step == undefined
+    @currentStep     = [step, Input.functions[func].input.events.length-1].min()
     @currentStep     = [0, @currentStep].max()
     window.location.hash = "#{@currentFunction}:#{@currentStep || 0}"
 
@@ -162,9 +162,9 @@ class Application
   buildSelector: ->
     groups = ['Present', 'Removed'].map (x) -> $("<optgroup label='#{x}'></optgroup>")
 
-    @data.each (f, i) =>
-      group = if f.source.present then groups[0] else groups[1]
-      group.append "<option value='#{i}'>#{f.source.name}</option>"
+    Input.functions.each (f, i) ->
+      group = if f.present then groups[0] else groups[1]
+      group.append "<option value='#{i}'>#{f.name}</option>"
 
     groups.each (x) => @selector.append x
 

data/lib/furnace-xray/app/assets/javascripts/lib/graph.js.coffee

@@ -8,18 +8,19 @@ class @Graph
     @edges     = []
     blockNodes = Object.extended()
 
-    @input.blocks.each (i, b) =>
-      blockNodes[b.name] =
+    @input.activeBlocks()?.each (b) =>
+      blockNodes[b.id] =
         edges: b.references()
         label: b.name
-        data: b.title(@input.previousState?.blocks[b.name])
+        data: b.title(unless @input.previousState? then false else (@input.previousState.basicBlocks[b.id] || []))
 
     blockNodes.each (i, n) =>
       edges = []
 
       n.edges.each (x) =>
-        edges.add {source: n, target: blockNodes[x], data: blockNodes[x].label}
-        @edges.add edges.last()
+        if blockNodes[x]?
+          edges.add {source: n, target: blockNodes[x], data: blockNodes[x].label}
+          @edges.add edges.last()
 
       n.edges = edges
 

data/lib/furnace-xray/app/assets/javascripts/lib/input.js.coffee

@@ -2,61 +2,63 @@
 # Internal representation of input JSON
 #
 class @Input
-  @normalize: (data) ->
-    data.map (x) -> new Input(x)
-
-  constructor: (@source) ->
-    @source.events.each (x) -> x.event = x.event.camelize(false)
-
-    # Scan for effective events
-    @events = []
-    reducer = []
+  @normalize: (@events) =>
+    @functions = []
+    events     = Object.extended()
     transforms = Object.extended()
 
-    @source.events.each (x, i) =>
-      switch x.event
-        when 'addInstruction'
-          reducer.add x.name
-          @events.add i
-        when 'removeInstruction'
-          reducer.exclude x.name
-          @events.add i
-        when 'updateInstruction', 'renameInstruction'
-          @events.add i if reducer.any(x.name)
-        when 'type', 'transformStart'
-        else
-          @events.add i
-
-      if x.event == 'transformStart'
-        id = @events.length-1
-        transforms[id] = {id: id, label: x.name}
-
-    @transforms = transforms.values()
+    @events.each (event, i) =>
+      if event['kind'] == 'transform'
+        f = event['function_id']
+
+        transforms[f] ||= []
+        transforms[f].push
+          id: events[f].length - 1
+          label: event['name']
+      else
+        node = Node.refresh(event)
+        
+        if node.attachedFunctions?
+          Object.each node.attachedFunctions(), (id, f) =>
+            events[id] ||= []
+            events[id].push i
+
+    Node.kinds['function'].each (f) =>
+      @functions.push
+        name: f.name
+        present: f.present
+        input: new Input(f, events[f.id], transforms[f.id])
+
+  @constantize: (kind) ->
+    result = window[kind.camelize()+'Node']
+    result
+
+  constructor: (@function, @events, @transforms) ->
     @transforms = @transforms.filter (x, i) =>
       x.length = (@transforms[i+1]?.id || @events.length) - x.id
-      x.id < @events.length-1
+      x.id < @events.length-1 && x.length > 0
 
     @reset()
 
-  reset: ->
-    @types           = Object.extended()
-    @blocks          = Object.extended()
-    @instructions    = Object.extended()
-    @blocksMap       = new Map 'blocks'
-    @instructionsMap = new Map 'instructions'
+  activeBlocks: ->
+    data = @kinds['basic_block']?.findAll (b) =>
+      b.attachedFunctions()[@function.id]?
 
-    @function = new FunctionNode(@source.name, @source.present)
-    @cursor   = 0
+    data || []
 
-    # run first step at initialization
-    i = -1; @run(i) while (i+=1) <= (@events[1] || @source.events.length-1)
+  reset: ->
+    @map    = Object.extended()
+    @kinds  = Object.extended()
+    @cursor = 0
+
+    # run upcoming steps at initialization
+    i = -1; @run(i) while (i+=1) < @events[0]
 
   rewind: (to) ->
     return if to == @cursor
 
     if to < @cursor
       delete @previousState
-      @reset()
     else
       @previousState = new InputState(@)
 
@@ -72,67 +74,4 @@ class @Input
     @cursor = stop
 
   run: (step) ->
-    event = @source.events[step]
-
-    if event.event == 'type'
-      @types[event.id] = new TypeNode(event.kind, event.name, event.parameters)
-    else
-      @[event.event]?(event)
-      console.log "UNKNOWN EVENT: #{event.event}" unless @[event.event]?
-
-  type: (id) ->
-    return undefined unless id?
-
-    if type = @types[id]
-      return type
-    else
-      @reset()
-      throw "Type #{id} not found in #{@types.keys().join(',')}"
-
-  setReturnType: (event) ->
-    @function.setReturnType @type(event.return_type)
-
-  setArguments: (event) ->
-    @function.setArguments(event.arguments.map (x) =>
-      new ArgumentNode(x.name, @type(x.type)))
-
-  addBasicBlock: (event) ->
-    @blocksMap.add event.name, (id) =>
-      @blocks[id] = new BlockNode(event.name)
-
-  removeBasicBlock: (event) ->
-    @blocksMap.remove event.name, (id) =>
-      delete @blocks[id]
-
-  renameBasicBlock: (event) ->
-    @blocksMap.rename event.name, event.new_name, (id) =>
-      @blocks[id].setName(event.new_name)
-
-  updateInstruction: (event) ->
-    id = @instructionsMap.add event.name, (id) =>
-      @instructions[id] = new InstructionNode
-
-    if Object.isArray(event.operands)
-      operands = event.operands.map (x) =>
-        new OperandNode x.kind, @type(x.type), x.name, x.value
-    else
-      operands = []
-      Object.each event.operands, (key, x) =>
-        operands.push [key, new OperandNode(x.kind, @type(x.type), x.name, x.value)]
-
-    @instructions[id].update event.opcode, event.name, event.parameters, operands, @type(event.type)
-
-  addInstruction: (event) ->
-    @instructionsMap.locateOrAdd event.name, (i) =>
-      @blocksMap.locate event.basic_block, (b) =>
-        @instructions[i].link @blocks[b], event.index
-
-  removeInstruction: (event) ->
-    @instructionsMap.locate event.name, (i) =>
-      @instructions[i].unlink()
-
-  renameInstruction: (event) ->
-    @instructionsMap.rename event.name, event.new_name, (i) =>
-      @instructions[i].name = event.new_name
-
-  transformStart: (event) ->
+    node = Node.refresh(Input.events[step], @map, @kinds)

data/lib/furnace-xray/app/assets/javascripts/lib/input_state.js.coffee

@@ -1,8 +1,10 @@
 class @InputState
   constructor: (input) ->
-    @blocks = Object.extended()
+    @basicBlocks = Object.extended()
     @cursor = input.cursor
 
-    input.blocksMap.each (bname, id) =>
-      @blocks[bname] = input.blocks[id].instructions.map (x) ->
-        {title: x.title(), name: x.name}
+    input.kinds['basic_block']?.each (b) =>
+      @basicBlocks[b.id] = b.instructions.map (i) =>
+        id: i.id
+        name: i.name
+        title: i.title()

data/lib/furnace-xray/app/assets/javascripts/lib/node.js.coffee

@@ -0,0 +1,39 @@
+class @Node
+  @refresh: (data, map=false, kinds=false) ->
+    Node.map   ||= Object.extended()
+    Node.kinds ||= Object.extended()
+
+    map   ||= Node.map
+    kinds ||= Node.kinds
+
+    if map[data.id]
+      map[data.id].update(data, map)
+    else
+      klass = window[data.kind.camelize()+'Node']
+
+      return false if !klass?
+
+      kinds[data.kind] ||= []
+      kinds[data.kind].push map[data.id] = new klass(data, map)
+
+    map[data.id]
+
+  @reset: ->
+    Node.map = Object.extended()
+    Node.kinds = {}
+
+  constructor: (data, map) ->
+    @id = data.id
+    @update(data, map)
+
+  update: (data, map) ->
+
+  locate: (id, map) ->
+    map[id] || throw("Element #{id} not found in map")
+
+  reassign: (before, after, callback) ->
+    if !before? || before.length == 0
+      callback([], after)
+    else
+      intersection = before.intersect(after)
+      callback before.subtract(intersection), after.subtract(intersection)

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/argument.js.coffee

@@ -1,7 +1,14 @@
-class @ArgumentNode
-  constructor: (@name, @type) ->
+class @ArgumentNode extends Node
+  update: (data, map) ->
+    @name = data['name']
+    @type = @locate(data['type'], map)
 
   title: ->
     JST['nodes/argument']
+      type: @type.title()
+      name: @name
+
+  operandTitle: ->
+    JST['nodes/operands/argument']
       type: @type.title()
       name: @name

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/basic_block.js.coffee

@@ -0,0 +1,82 @@
+class @BasicBlockNode extends Node
+  constructor: (data, map) ->
+    super
+    @functions = Object.extended()
+
+  update: (data, map) ->
+    @name = data['name']
+
+    @reassign @instructionIds, data['instruction_ids'], (removed, added) =>
+      removed.each (id) => @locate(id, map).unlinkBlock(@)
+      added.each   (id) => @locate(id, map).linkBlock(@)
+
+    @instructionIds = data['instruction_ids']
+    @instructions   = @instructionIds.map (id) => @locate(id, map)
+
+  linkFunction: (f) ->
+    @functions[f.id] = f
+
+  unlinkFunction: (f) ->
+    delete @functions[f.id]
+
+  attachedFunctions: -> @functions
+
+  title: (previousInstructions) ->
+    JST['nodes/block']
+      name: @name
+      instructions: @titleizeInstructions(previousInstructions)
+
+  operandTitle: ->
+    JST['nodes/operands/basic_block']
+      name: @name
+
+  titleizeInstructions: (previousInstructions) ->
+    unless previousInstructions
+      result = ""
+      result += JST['nodes/diff/unchanged_line'] line: x.title() for x in @instructions 
+      result
+    else
+      result    = ""
+      removed   = Object.extended()
+      added     = Object.extended()
+      changed   = Object.extended()
+      unchanged = Object.extended()
+
+      for cs, i in @instructions
+        previous = previousInstructions.find (ps) -> ps.id == cs.id
+        currentTitle = cs.title()
+
+        if previous && previous.title == currentTitle
+          unchanged[i] = previous.title
+          previous.newPosition = i
+        else if previous
+          changed[i] = [previous.title, currentTitle]
+          previous.newPosition = i
+        else
+          added[i] = currentTitle
+
+      for ps, i in previousInstructions
+        if !ps.newPosition?
+          position = 0
+
+          while --i >= 0
+            if previousInstructions[i].newPosition?
+              position = previousInstructions[i].newPosition+1
+              break
+
+          removed[position] ||= []
+          removed[position].push ps.title
+
+      [@instructions.length, previousInstructions.length].max().times (i) ->
+        if removed[i]
+          result += JST['nodes/diff/removed_line'](line: l) for l in removed[i]
+
+        result += JST['nodes/diff/added_line'](line: added[i]) if added[i]
+        result += JST['nodes/diff/changed_line'](before: changed[i][0], after:changed[i][1]) if changed[i]
+        result += JST['nodes/diff/unchanged_line'](line: unchanged[i]) if unchanged[i]
+
+      result
+
+  references: ->
+    ids = @instructions.last()?.operands.findAll((x) -> x instanceof BasicBlockNode).map((x) -> x.id)
+    (ids || []).exclude((x) => x == @id)

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/constant.js.coffee

@@ -0,0 +1,9 @@
+class @ConstantNode extends Node
+  update: (data, map) ->
+    @value = data['value']
+    @type  = @locate(data['type'], map)
+
+  operandTitle: ->
+    JST['nodes/operands/constant']
+      type: @type.title()
+      value: @value

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/function.js.coffee

@@ -1,10 +1,25 @@
-class @FunctionNode
-  constructor: (@name, @present) ->
-    @arguments = []
+class @FunctionNode extends Node
+  update: (data, map) ->
+    @name    = data['name']
+    @type    = @locate(data['return_type'], map)
+    @present = false
 
-  setArguments: (@arguments) ->
+    @arguments = data['argument_ids'].map (id) => @locate(id, map)
 
-  setReturnType: (@type) ->
+    @reassign @blockIds, data['basic_block_ids'], (removed, added) =>
+      removed.each (id) => @locate(id, map).unlinkFunction(@)
+      added.each   (id) => @locate(id, map).linkFunction(@)
+
+    @blockIds = data['basic_block_ids']
+    @blocks = @blockIds.map (id) => @locate(id, map)
+
+  linkModule:   -> @present = true
+  unlinkModule: -> @present = false
+
+  attachedFunctions: ->
+    result = {}
+    result[@id] = @
+    result
 
   title: ->
     template = if @present then 'nodes/function' else 'nodes/function_removed'

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/instruction.js.coffee

@@ -1,33 +1,53 @@
-class @InstructionNode
-  constructor: ->
-    @blocks = []
+class @InstructionNode extends Node
+  constructor: (data, map) ->
+    super
+    @blocks = Object.extended()
 
-  update: (@opcode, @name, @parameters, @operands, @type) ->
+  linkBlock: (block) ->
+    @blocks[block.id] = block
+    @operands?.each (x) => x.linkBlock(block) if x['linkBlock']?
 
-  link: (block, index) ->
-    block.addInstruction(@, index)
-    @blocks.add block
+  unlinkBlock: (block) ->
+    delete @blocks[block.id]
+    @operands?.each (x) => x.unlinkBlock(block) if x['unlinkBlock']?
 
-  unlink: ->
-    @blocks.each (x) => x.removeInstruction(@)
-    @blocks = []
+  attachedFunctions: ->
+    result = {}
+    @blocks.values().each (x) -> Object.merge result, x.attachedFunctions()
+    result
 
-  title: ->
-    operands = @operands.map (x) ->
-      if x instanceof OperandNode
-        x.title()
-      else
-        "%#{x[0]} => #{x[1].title()}"
+  update: (data, map) ->
+    @type       = @locate(data['type'], map)
+    @name       = data['name']
+    @opcode     = data['opcode']
+    @parameters = data['parameters']
 
-    if @type.kind == 'void'
-      JST['nodes/instruction_void']
-        opcode: @opcode
-        parameters: @parameters
-        operands: operands.join(', ')
+    if data['operand_ids']
+      @updateOperands(data['operand_ids'], map)
     else
-      JST['nodes/instruction_typed']
+      @operands = null
+
+  updateOperands: (data, map) ->
+    @operands = data.map (x) => @locate(x, map)
+
+  title: ->
+    if @type && !@type.void()
+      JST['nodes/instruction']
         type: @type.title()
         name: @name
         opcode: @opcode
         parameters: @parameters
-        operands: operands.join(', ')
+        operands: @titleizeOperands()
+    else
+      JST['nodes/instruction_void']
+        opcode: @opcode
+        parameters: @parameters
+        operands: @titleizeOperands()
+
+  titleizeOperands: ->
+    return "<DETACHED>" unless @operands
+    @operands.map((x) -> x.operandTitle()).join(', ')
+
+  operandTitle: ->
+    JST['nodes/operands/instruction']
+      name: @name

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/module.js.coffee

@@ -0,0 +1,8 @@
+class @ModuleNode extends Node
+  update: (data, map) ->
+    @reassign @functionIds, data['function_ids'], (removed, added) =>
+      removed.each (id) => @locate(id, map).unlinkModule(@)
+      added.each   (id) => @locate(id, map).linkModule(@)
+
+    @functionIds = data['function_ids']
+    @functions  = @functionIds.map (id) => @locate(id, map)

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/phi.js.coffee

@@ -0,0 +1,10 @@
+class @PhiNode extends InstructionNode
+
+  updateOperands: (data, map) ->
+    @operands = data.map (pair) =>
+      pair.map (x) =>
+        @locate(x, map)
+
+  titleizeOperands: (data) ->
+    return "<DETACHED>" unless @operands
+    @operands.map (pair) => "#{pair[0].operandTitle()} => #{pair[1].operandTitle()}"

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/type.js.coffee

@@ -1,12 +1,9 @@
-class @TypeNode
+class @TypeNode extends Node
 
-  constructor: (@kind, @name, @parameters) ->
+  update: (data, map) ->
+    @name = data['name']
+
+  void: () -> false
 
   title: ->
-    switch @kind
-      when 'void' then JST['nodes/type_constant'](type: 'void')
-      when 'monotype' then JST['nodes/type_constant'](type: @name)
-      when 'parametric'
-        JST['nodes/type_parametric']
-          type: @name
-          parameters: @parameters.map((x) -> x.title()).join(', ')
+    JST['nodes/type'](type: @name)

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/type_bottom.js.coffee

@@ -0,0 +1,3 @@
+class @TypeBottomNode extends TypeNode
+
+  void: () -> true

data/lib/furnace-xray/app/assets/javascripts/lib/nodes/type_variable.js.coffee

@@ -0,0 +1 @@
+class @TypeVariableNode extends @TypeNode

data/lib/furnace-xray/version.rb

@@ -1,5 +1,5 @@
 module Furnace
   module Xray
-    VERSION = '1.1.0.pre1'
+    VERSION = '1.1.0.pre2'
   end
 end