Merge 78cbdd0 into 09fc462

.travis.yml

@@ -6,6 +6,7 @@ compiler:
 
 os:
   - linux
+  - osx
 
 sudo: false
 cache:
@@ -29,6 +30,10 @@ branches:
     - develop
     - /^.*travis.*$/
 
+matrix:
+  allow_failures:
+    - os: osx
+
 env:
   matrix: # fix all scripts (e.g. install-dependencies.sh) if you rename LLVM_USE[On/Off]
     - USE_LLVM=Off
@@ -43,7 +48,7 @@ env:
       BUILD_TYPE=Coverage
 
 before_install:
-  - pip install --user cpp-coveralls
+  - source .travis/${TRAVIS_OS_NAME}/before_install.sh
 
 before_script:
   - mkdir -p build

.travis/linux/before_install.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+pip install --user cpp-coveralls

.travis/osx/before_install.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ "${CC}" == "gcc" ]]; then
+    export CC=gcc-4.8
+    export CXX=g++-4.8
+fi
+
+function brew_upgrade { brew outdated $1 || brew upgrade $1; }
+
+brew update
+brew install readline
+brew install llvm33

CMakeLists.txt

@@ -8,7 +8,6 @@ project(llst)
 
 find_package(Threads REQUIRED QUIET)
 find_package(READLINE)
-find_package(TINFO)
 find_package(LLVM ${LLVM_PACKAGE_VERSION} EXACT)
 find_package(POD2MAN)
 find_package(GZIP REQUIRED)
@@ -34,14 +33,11 @@ else()
 endif()
 
 if (USE_READLINE)
-    if (READLINE_FOUND AND TINFO_FOUND)
+    if (READLINE_FOUND)
         message(STATUS "Using readline library")
         set_source_files_properties(src/CompletionEngine.cpp PROPERTIES COMPILE_DEFINITIONS USE_READLINE)
-        set (READLINE_LIBS_TO_LINK ${READLINE_LIBRARIES} ${TINFO_LIBRARIES})
+        set (READLINE_LIBS_TO_LINK ${READLINE_LIBRARIES})
     else()
-        if(NOT TINFO_FOUND)
-            message(SEND_ERROR "Library readline depends on tinfo.\nYou may configure with -DUSE_READLINE=OFF.")
-        endif()
         if(NOT READLINE_FOUND)
             message(SEND_ERROR "Library readline is not found.\nYou may configure with -DUSE_READLINE=OFF.")
         endif()
@@ -88,8 +84,6 @@ add_subdirectory(include)
 include_directories(include)
 
 add_library(stapi
-    src/TSmalltalkInstruction.cpp
-    src/InstructionDecoder.cpp
     src/ParsedBytecode.cpp
     src/ParsedMethod.cpp
     src/ParsedBlock.cpp
@@ -110,23 +104,18 @@ endif()
 add_library(memory_managers ${MM_CPP_FILES})
 
 # Base set of sources needed in every build
-add_library(standart_set
+add_library(standard_set
+    src/vm.cpp
     src/args.cpp
     src/CompletionEngine.cpp
     src/Image.cpp
     src/primitives.cpp
     src/TDictionary.cpp
     src/TSymbol.cpp
-    src/vm.cpp
 
     src/TSmalltalkInstruction.cpp
     src/InstructionDecoder.cpp
-    src/ParsedMethod.cpp
-    src/ParsedBytecode.cpp
-    src/ParsedBlock.cpp
 
-    src/ControlGraph.cpp
-    src/ControlGraphVisualizer.cpp
     src/Timer.cpp
     src/GCLogger.cpp
 )
@@ -140,13 +129,13 @@ if (USE_LLVM)
     )
 endif()
 
-add_executable(llst src/main.cpp src/vm.cpp)
+add_executable(llst src/main.cpp)
 add_dependencies(llst image)
 
 if (USE_LLVM)
     target_link_libraries(llst jit ${LLVM_LIBS} ${LLVM_LD_FLAGS})
 endif()
-target_link_libraries(llst standart_set memory_managers stapi ${READLINE_LIBS_TO_LINK} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+target_link_libraries(llst standard_set memory_managers stapi ${READLINE_LIBS_TO_LINK} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
 
 set(changelog_compressed "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz")
 gzip_compress("compress_changelog" "${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog" ${changelog_compressed})

include/analysis.h

@@ -4,7 +4,7 @@
 #include <set>
 #include <vector>
 
-#include <instructions.h>
+#include <stapi.h>
 
 namespace llvm {
     class Value;