Fix builds for Win32

5 files changed, 12 insertions, 12 deletions

diff --git a/JSImpl/src/ByteCodeGenerator.cpp b/JSImpl/src/ByteCodeGenerator.cpp
index 39f3bff..49e734b 100644
--- a/JSImpl/src/ByteCodeGenerator.cpp
+++ b/JSImpl/src/ByteCodeGenerator.cpp
@@ -646,8 +646,8 @@ IPLString ByteCodeGenerator::GetCode()
 			break;

 		case ByteCodeGenerator::Instruction::DEBUG:

 			{

-			auto line = i.Values.Int[0];

-			auto column = i.Values.Int[1];

+			auto line = int(i.Values.Int[0]);

+			auto column = int(i.Values.Int[1]);

 			result += "D: " + m_Source[line].substr(0, column) + "@@=>" + m_Source[line].substr(column, m_Source[line].size()) + '\n';

 			}

 			break;

diff --git a/appveyor.yml b/appveyor.yml
index d96e49e..b657fe2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ configuration:
   - Release
 
 platform:
-  - x86
+  - Win32
   - x64
 
 build:
@@ -28,7 +28,7 @@ for:
     only:
       - image: Ubuntu
   build_script:
-    - make -C $APPVEYOR_BUILD_FOLDER/JSImpl/solution -j config=`echo ${CONFIGURATION} | sed -e 'y/DR/dr/'``echo ${PLATFORM} | sed -e 's/x86//' | sed -e 's/x64/64/'`
+    - make -C $APPVEYOR_BUILD_FOLDER/JSImpl/solution -j config=`echo ${CONFIGURATION} | sed -e 'y/DR/dr/'``echo ${PLATFORM} | sed -e 's/Win32//' | sed -e 's/x64/64/'`
   test_script:
     - '$APPVEYOR_BUILD_FOLDER/JSImpl/build/bin/$CONFIGURATION/Test'
   after_test:
diff --git a/spasm/src/asm/lexer.cpp b/spasm/src/asm/lexer.cpp
index 996762c..fd522ee 100644
--- a/spasm/src/asm/lexer.cpp
+++ b/spasm/src/asm/lexer.cpp
@@ -3082,7 +3082,7 @@ void Lexer::read(size_t nbytes)
     file->read(old_limit, limit - old_limit);
     if (file->eof())
     {
-        size_t bytes = file->gcount();
+        auto bytes = file->gcount();
         std::fill(old_limit + bytes, limit, '\0');
     }
 }
@@ -3092,7 +3092,7 @@ void Lexer::buffer_init()
     file->read(buffer, buffer_size);
     if (file->eof())
     {
-        size_t bytes = file->gcount();
+        auto bytes = file->gcount();
         std::fill(buffer + bytes, buffer + buffer_size, '\0');
     }
 
diff --git a/spasm/src/asm/lexer.re b/spasm/src/asm/lexer.re
index bdf792d..7de620d 100644
--- a/spasm/src/asm/lexer.re
+++ b/spasm/src/asm/lexer.re
@@ -339,7 +339,7 @@ void Lexer::read (size_t nbytes)
 
         file->read (old_limit, limit - old_limit);
         if (file->eof ()) {
-                size_t bytes = file->gcount ();
+                auto bytes = file->gcount ();
                 std::fill (old_limit + bytes, limit, '\0');
         }
 }
@@ -348,7 +348,7 @@ void Lexer::buffer_init ()
 {
         file->read (buffer, buffer_size);
         if (file->eof ()) {
-                size_t bytes = file->gcount ();
+                auto bytes = file->gcount ();
                 std::fill (buffer + bytes, buffer + buffer_size, '\0');
         }
 
diff --git a/spasm/src/spasm.cpp b/spasm/src/spasm.cpp
index 6a62c90..94086a6 100644
--- a/spasm/src/spasm.cpp
+++ b/spasm/src/spasm.cpp
@@ -331,7 +331,7 @@ void Spasm::gotrue(reg_t a0, reg_t a1)
 {
     if (get_local(a0))
     {
-        m_PC = a1;
+        go(a1);
     }
 }
 
@@ -344,7 +344,7 @@ void Spasm::gofalse(reg_t a0, reg_t a1)
 {
     if (!get_local(a0))
     {
-        m_PC = a1;
+        go(a1);
     }
 }
 
@@ -354,7 +354,7 @@ void Spasm::gofalse(reg_t a0, reg_t a1)
 */
 void Spasm::go(reg_t a0)
 {
-    m_PC = a0;
+    m_PC = PC_t(a0);
 }
 
 /*!
@@ -507,7 +507,7 @@ int64_t Spasm::read_integer(size_t size)
 
 data_t Spasm::read_string(size_t size)
 {
-    const auto length = read_integer(size);
+    const auto length = size_t(read_integer(size));
     const auto s = reinterpret_cast<const char*>(&m_ByteCode[m_PC]);
     m_PC += length;
     const auto value = m_Strings.Get(s, length);