From 17a12f6336e27438e80a91f7bf035189a481dc0b Mon Sep 17 00:00:00 2001
From: otya128 <otya128@users.noreply.github.com>
Date: Sun, 4 Dec 2016 15:09:22 +0900
Subject: [PATCH] Remove static ctor

---
 .travis.yml         | 2 +-
 SMILEBASIC/parser.d | 7 ++++---
 SMILEBASIC/sprite.d | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d7ad2b..d8eedc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,6 @@ d:
   - dmd
   - gdc
   - ldc
-script: dub test --compiler=${DC} -- --DRT-oncycle=print -h
+script: dub test --compiler=${DC} -- -h
 
 
diff --git a/SMILEBASIC/parser.d b/SMILEBASIC/parser.d
index 72e85c0..69c9332 100644
--- a/SMILEBASIC/parser.d
+++ b/SMILEBASIC/parser.d
@@ -9,12 +9,12 @@ import std.conv;
 import std.range;
 class Lexical
 {
-    static TokenType[] table;
-    static TokenType[wstring] reserved;
+    TokenType[] table;
+    TokenType[wstring] reserved;
     wstring code;
     int index;
     int line;
-    static this()
+    void initReservedWordsTable()
     {
         table = new TokenType[256];
         for(int i = 0;i<256;i++)
@@ -86,6 +86,7 @@ class Lexical
     }
     this(wstring input)
     {
+        initReservedWordsTable();
         this.code = input;
         line = 1;
     }
diff --git a/SMILEBASIC/sprite.d b/SMILEBASIC/sprite.d
index 2c4d14f..e0b63af 100644
--- a/SMILEBASIC/sprite.d
+++ b/SMILEBASIC/sprite.d
@@ -347,6 +347,7 @@ class Sprite
     }
     this(PetitComputer petitcom)
     {
+        initSpriteAnimationTable();
         sprites = new SpriteData[512];
         zsortedSprites = new SpriteData*[512];
         for(int i = 0; i < sprites.length; i++)
@@ -875,8 +876,8 @@ class Sprite
         spanim(id, tgete | (relative ? SpriteAnimTarget.relative : cast(SpriteAnimTarget)0), data);
         
     }
-    static SpriteAnimTarget[wstring] spriteAnimTarget;
-    static this()
+    SpriteAnimTarget[wstring] spriteAnimTarget;
+    void initSpriteAnimationTable()
     {
         spriteAnimTarget = [
             "XY": SpriteAnimTarget.XY,