furnace-xray 1.1.0.pre1 → 1.1.0.pre2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: furnace-xray
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre1
+  version: 1.1.0.pre2
 platform: ruby
 authors:
 - Boris Staal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -191,13 +191,17 @@ files:
 - lib/furnace-xray/app/assets/javascripts/lib/graph.js.coffee
 - lib/furnace-xray/app/assets/javascripts/lib/input.js.coffee
 - lib/furnace-xray/app/assets/javascripts/lib/input_state.js.coffee
-- lib/furnace-xray/app/assets/javascripts/lib/map.js.coffee
+- lib/furnace-xray/app/assets/javascripts/lib/node.js.coffee
 - lib/furnace-xray/app/assets/javascripts/lib/nodes/argument.js.coffee
-- lib/furnace-xray/app/assets/javascripts/lib/nodes/block.js.coffee
+- lib/furnace-xray/app/assets/javascripts/lib/nodes/basic_block.js.coffee
+- lib/furnace-xray/app/assets/javascripts/lib/nodes/constant.js.coffee
 - lib/furnace-xray/app/assets/javascripts/lib/nodes/function.js.coffee
 - lib/furnace-xray/app/assets/javascripts/lib/nodes/instruction.js.coffee
-- lib/furnace-xray/app/assets/javascripts/lib/nodes/operand.js.coffee
+- lib/furnace-xray/app/assets/javascripts/lib/nodes/module.js.coffee
+- lib/furnace-xray/app/assets/javascripts/lib/nodes/phi.js.coffee
 - lib/furnace-xray/app/assets/javascripts/lib/nodes/type.js.coffee
+- lib/furnace-xray/app/assets/javascripts/lib/nodes/type_bottom.js.coffee
+- lib/furnace-xray/app/assets/javascripts/lib/nodes/type_variable.js.coffee
 - lib/furnace-xray/app/assets/javascripts/vendor/chosen.jquery.js
 - lib/furnace-xray/app/assets/javascripts/vendor/d3.v3.js
 - lib/furnace-xray/app/assets/javascripts/vendor/dagre.js
@@ -228,15 +232,13 @@ files:
 - lib/furnace-xray/app/views/nodes/diff/unchanged_line.jst.mustache
 - lib/furnace-xray/app/views/nodes/function.jst.mustache
 - lib/furnace-xray/app/views/nodes/function_removed.jst.mustache
-- lib/furnace-xray/app/views/nodes/instruction_typed.jst.mustache
+- lib/furnace-xray/app/views/nodes/instruction.jst.mustache
 - lib/furnace-xray/app/views/nodes/instruction_void.jst.mustache
-- lib/furnace-xray/app/views/nodes/operand_argument.jst.mustache
-- lib/furnace-xray/app/views/nodes/operand_basic_block.jst.mustache
-- lib/furnace-xray/app/views/nodes/operand_constant.jst.mustache
-- lib/furnace-xray/app/views/nodes/operand_constant_function.jst.mustache
-- lib/furnace-xray/app/views/nodes/operand_instruction.jst.mustache
-- lib/furnace-xray/app/views/nodes/type_constant.jst.mustache
-- lib/furnace-xray/app/views/nodes/type_parametric.jst.mustache
+- lib/furnace-xray/app/views/nodes/operands/argument.jst.mustache
+- lib/furnace-xray/app/views/nodes/operands/basic_block.jst.mustache
+- lib/furnace-xray/app/views/nodes/operands/constant.jst.mustache
+- lib/furnace-xray/app/views/nodes/operands/instruction.jst.mustache
+- lib/furnace-xray/app/views/nodes/type.jst.mustache
 - lib/furnace-xray/lib/jst_pages.rb
 - lib/furnace-xray/version.rb
 - sample.json

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

@@ -1,48 +0,0 @@
-#
-# Failsafe Map container
-#
-class @Map
-  constructor: (@title) ->
-    @data = []
-    @map  = Object.extended()
-
-  each: (block) -> @map.each block
-
-  add: (name, block) ->
-    id = @map[name]
-
-    unless id?
-      @data.add name
-      id = @data.length-1
-      block(id) if block
-      @map[name] = id
-    
-    id
-
-  find: (name) ->
-    id = @map[name]
-
-    unless id?
-      error = "Map '#{@title}': '#{name}' element not found"
-      throw error
-
-    id
-
-  remove: (name, block) ->
-    id = @find(name)
-    @data.splice id, 1
-    block(id) if block
-    delete @map[name]
-
-  rename: (name, newName, block) ->
-    id = @find(name)
-    @data[id] = newName
-    block(id) if block
-    delete @map[name]
-    @map[newName] = id
-
-  locate: (name, block) ->
-    block(@find(name))
-
-  locateOrAdd: (name, block) ->
-    block(@add(name))

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

@@ -1,76 +0,0 @@
-class @BlockNode
-  constructor: (@name, @instructions) ->
-    @instructions ||= []
-
-  title: (previousState) ->
-    JST['nodes/block']
-      name: @name
-      instructions: @titleizeInstructions(previousState)
-
-  titleizeInstructions: (previousState) ->
-    unless previousState
-      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 = previousState.find (ps) -> ps.name == cs.name
-        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 previousState
-        if !ps.newPosition?
-          position = 0
-
-          while --i >= 0
-            if previousState[i].newPosition?
-              position = previousState[i].newPosition+1
-              break
-
-          removed[position] ||= []
-          removed[position].push ps.title
-
-      [@instructions.length, previousState.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
-
-  previous: ->
-    try
-      previous = @input.previous.blocks[@input.previous.blocksMap.find(@name)]
-    catch error
-      console.log error
-
-    previous
-
-  setName: (name) ->
-    @name = name
-
-  addInstruction: (instruction, index) ->
-    @instructions.splice index, 0, instruction
-
-  removeInstruction: (instruction) ->
-    index = @instructions.findIndex(instruction)
-    @instructions.splice index, 1 unless index < 0
-
-  references: ->
-    @instructions.last()?.operands.findAll((x) -> x.kind == "basic_block").map((x) -> x.name) || []

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

@@ -1,21 +0,0 @@
-class @OperandNode
-
-  constructor: (@kind, @type, @name, @value) ->
-
-  title: ->
-    switch @kind
-      when 'argument'    then JST['nodes/operand_argument'] name: @name
-      when 'instruction' then JST['nodes/operand_instruction'] name: @name
-      when 'basic_block' then JST['nodes/operand_basic_block'] name: @name
-      when 'constant'
-        data =
-          type: @type.title()
-          value: @value
-
-        if @type.name == 'function'
-          template = 'operand_constant_function'
-          data.parsedValue = JSON.parse(@value)
-        else
-          template = 'operand_constant'
-
-        JST["nodes/#{template}"] data

data/lib/furnace-xray/app/views/nodes/operand_constant_function.jst.mustache

@@ -1 +0,0 @@
-<a href="javascript:app.jumpTo('{{parsedValue}}')">{{{type}}} {{value}}</a>

data/lib/furnace-xray/app/views/nodes/type_parametric.jst.mustache

@@ -1,3 +0,0 @@
-<i class='type'>
-  {{type}}&lt;<i class='parameters'>{{{parameters}}}</i>&gt;
-</i>