Skip to content

Commit

Permalink
Upgrade assembler to newer Crystal version
Browse files Browse the repository at this point in the history
  • Loading branch information
denis-soundcloud committed Aug 12, 2016
1 parent 0a82f47 commit 10fa7e2
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
3 changes: 1 addition & 2 deletions shard.yml
Expand Up @@ -3,7 +3,6 @@ version: 0.1.0

dependencies:
sdl2:
github: ddfreyne/crystal-sdl2
branch: crystal-0-15-compat
github: weskinner/crystal-sdl2

license: MIT
20 changes: 10 additions & 10 deletions src/assemble/main.cr
Expand Up @@ -34,7 +34,7 @@ class RegArg < Arg

getter :name

def initialize(name)
def initialize(name : String)
@name = name
end

Expand All @@ -58,7 +58,7 @@ end
class ImmArg < Arg
getter :value

def initialize(value)
def initialize(value : Int32)
@value = value
end

Expand Down Expand Up @@ -88,7 +88,7 @@ end
class LabelArg < Arg
getter :name

def initialize(name)
def initialize(name : String)
@name = name
end

Expand Down Expand Up @@ -125,7 +125,7 @@ class Instruction
getter :opcode_mnemonic
getter :args

def initialize(opcode_mnemonic, args)
def initialize(opcode_mnemonic : String, args : Array(Arg))
@opcode_mnemonic = opcode_mnemonic
@args = args
end
Expand All @@ -150,7 +150,7 @@ end
class Label
getter :name

def initialize(name)
def initialize(name : String)
@name = name
end

Expand All @@ -175,7 +175,7 @@ class DataDirective
getter :length
getter :arg

def initialize(length, arg)
def initialize(length : Int32, arg : Arg)
@length = length
@arg = arg
end
Expand Down Expand Up @@ -236,7 +236,7 @@ end
class Lexer
getter tokens

def initialize(@input)
def initialize(@input : String)
@index = 0
@tokens = [] of Token
@current_token = Token.new
Expand Down Expand Up @@ -404,7 +404,7 @@ end
class Parser
getter statements

def initialize(@input)
def initialize(@input : Array(Token))
@index = 0
@statements = [] of Instruction | Label | DataDirective
end
Expand Down Expand Up @@ -599,7 +599,7 @@ end
################################################################################

class Assembler
def initialize(@input)
def initialize(@input : String)
end

def assemble
Expand Down Expand Up @@ -647,7 +647,7 @@ class Assembler
getter :opcode
getter :args

def initialize(opcode : UInt8, args)
def initialize(opcode : UInt8, args : Array(Symbol))
@opcode = opcode
@args = args
end
Expand Down
2 changes: 1 addition & 1 deletion src/emulate/cpu.cr
Expand Up @@ -65,7 +65,7 @@ class CPU
class InvalidOpcodeException < Exception
end

def initialize(mem)
def initialize(mem : Mem)
@reg = Reg.new
@mem = mem
@running = true
Expand Down
4 changes: 2 additions & 2 deletions src/emulate/video.cr
Expand Up @@ -10,7 +10,7 @@ end
class Graphics
property render

def initialize(title, width, height)
def initialize(title : String, width : Int32, height : Int32)
@render_changed = false

# Create window
Expand Down Expand Up @@ -96,7 +96,7 @@ RED = 0xFF4B59F2_u32
class Video
PADDING = 16

def initialize(mem)
def initialize(mem : Mem)
@mem = mem
end

Expand Down

0 comments on commit 10fa7e2

Please sign in to comment.