update salaam

This commit is contained in:
Torsten Ruger 2015-10-27 12:46:39 +02:00
parent b6bfddf536
commit 76a698f028
3 changed files with 4 additions and 6 deletions

View File

@ -16,7 +16,7 @@ GIT
GIT GIT
remote: git://github.com/salama/salama-arm.git remote: git://github.com/salama/salama-arm.git
revision: 4fd8d6fa93f5abcee5d960da9e2b2ec968ba3ea0 revision: 9b011ee365ea0312568ba858662023747154c59f
specs: specs:
salama-arm (0.3.0) salama-arm (0.3.0)
@ -36,7 +36,7 @@ GIT
GIT GIT
remote: git://github.com/salama/salama.git remote: git://github.com/salama/salama.git
revision: c68577c3f4b77be495a9d4e161171356a611730f revision: fdc7f8b39ce560506cd039805ccdb499cc4b31fa
specs: specs:
salama (0.3.0) salama (0.3.0)
salama-object-file (~> 0.3) salama-object-file (~> 0.3)

View File

@ -24,7 +24,7 @@ $susy: (
.source_view { @include span(8); } .source_view { @include span(8); }
.block_view { .label_view {
@include span(3); @include span(3);
margin-right: span(1); margin-right: span(1);
height: 200px; height: 200px;

View File

@ -2,15 +2,13 @@ require 'bundler'
Bundler.require Bundler.require
require 'tilt/erb' require 'tilt/erb'
require_relative "lib/parse_task"
require "opal" require "opal"
require 'opal-browser' require 'opal-browser'
Opal.use_gem("salama") Opal.use_gem("salama")
Opal.use_gem("ast") Opal.use_gem("ast")
Opal.use_gem("salama-arm") Opal.use_gem("salama-arm")
Virtual.machine.boot Register.machine.boot
class DebugServer < Opal::Server class DebugServer < Opal::Server
def call(env) def call(env)