[WIP] [DNM] Backport dart sass parser and more

Author: mgreter

.travis.yml

@@ -20,11 +20,44 @@ sudo: required
 
 matrix:
   include :
+    - os: linux
+      compiler: gcc
+      env: AUTOTOOLS=no COVERAGE=yes BUILD=static
+    - os: linux
+      compiler: g++-5
+      env: AUTOTOOLS=yes COVERAGE=no BUILD=shared
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+    - os: linux
+      compiler: g++-8
+      env: AUTOTOOLS=yes COVERAGE=no BUILD=shared
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-8
     - os: linux
       compiler: clang
       # This build runs with ASan and we set `detect_odr_violation=0`
       # to work around https://bugs.llvm.org/show_bug.cgi?id=37545.
       env: AUTOTOOLS=no COVERAGE=no BUILD=static ASAN_OPTIONS=detect_odr_violation=0
+    - os: linux
+      compiler: clang
+      env: AUTOTOOLS=yes COVERAGE=no BUILD=shared
+    - os: osx
+      compiler: clang
+      env: AUTOTOOLS=no COVERAGE=no BUILD=shared
+    - os: osx
+      compiler: clang
+      env: AUTOTOOLS=no COVERAGE=no BUILD=static
+    - os: osx
+      compiler: clang
+      env: AUTOTOOLS=yes COVERAGE=no BUILD=shared
 
 script:
   - ./script/ci-build-libsass

Makefile.conf

@@ -8,10 +8,12 @@ HPPFILES = \
 	ast.hpp \
 	ast2c.hpp \
 	ast_css.hpp \
+	ast_base.hpp \
 	ast_def_macros.hpp \
 	ast_fwd_decl.hpp \
 	ast_helpers.hpp \
 	ast_selectors.hpp \
+	ast_containers.hpp \
 	ast_supports.hpp \
 	ast_values.hpp \
 	backtrace.hpp \
@@ -176,7 +178,6 @@ SOURCES = \
 	source_state.cpp \
 	source_span.cpp \
 	error_handling.cpp \
-	MurmurHash2.cpp \
 	memory/allocator.cpp \
 	memory/shared_ptr.cpp \
 	LUrlParser/LUrlParser.cpp \

appveyor.yml

@@ -0,0 +1,89 @@
+os: Visual Studio 2015
+
+environment:
+  CTEST_OUTPUT_ON_FAILURE: 1
+  ruby_version: 24-x64
+  TargetPath: sassc/bin/sassc.exe
+  matrix:
+  - Compiler: msvc
+    Config: Release
+    Platform: Win32
+  - Compiler: msvc
+    Config: Debug
+    Platform: Win32
+  - Compiler: msvc
+    Config: Release
+    Platform: Win64
+  - Compiler: mingw
+    Build: static
+  - Compiler: mingw
+    Build: shared
+
+cache:
+  - C:\Ruby%ruby_version%\lib\ruby\gems
+  - C:\mingw64
+
+# Uncomment to debug hanging builds via RDP, password can be found/set under Environment-Variables in appveyor settings!
+#
+# init:
+#   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#
+# on_finish:
+#   - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
+install:
+  - git clone https://github.com/sass/sassc.git
+  - git clone https://github.com/mgreter/sass-spec.git --branch feature/libsass-parser-backport
+  - set PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ps: |
+      if(!(gem which minitest 2>$nul)) { gem install minitest --no-ri --no-rdoc }
+      if(!(gem which hrx 2>$nul)) { gem install hrx --no-ri --no-rdoc }
+      if ($env:Compiler -eq "mingw" -AND -Not (Test-Path "C:\mingw64")) {
+        # Install MinGW.
+        $file = "x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z"
+        wget https://bintray.com/artifact/download/drewwells/generic/$file -OutFile $file
+        &7z x -oC:\ $file > $null
+      }
+  - set PATH=C:\mingw64\bin;%PATH%
+  - set CC=gcc
+
+build_script:
+  - ps: |
+      if ($env:Compiler -eq "mingw") {
+        mingw32-make -j4 sassc
+      } else {
+        msbuild /m:4 /p:"Configuration=$env:Config;Platform=$env:Platform" sassc\win\sassc.sln
+      }
+
+      # print the branding art
+      mv script/branding script/branding.ps1
+      script/branding.ps1
+
+      # print the version info
+      &$env:TargetPath -v
+      ruby -v
+
+test_script:
+  - ps: |
+      $PRNR = $env:APPVEYOR_PULL_REQUEST_NUMBER
+      $env:TargetPath = Join-Path $pwd.Path $env:TargetPath
+      If (Test-Path "$env:TargetPath") {
+        ruby sass-spec/sass-spec.rb --probe-todo --impl libsass -c $env:TargetPath -s sass-spec/spec
+        if(-not($?)) {
+          echo "sass-spec tests failed"
+          exit 1
+        }
+      } else {
+        echo "spec runner not found (compile error?)"
+        exit 1
+      }
+      Write-Host "Explicitly testing the case when cwd has Unicode characters: " -nonewline
+      # See comments in gh-1774 for details.
+      cd test/e2e/unicode-pwd/Sáss-UŢF8/
+      &$env:TargetPath ./input.scss 2>&1>$null
+      if(-not($?)) {
+        echo "Failed!"
+        exit 1
+      } else {
+        echo "Success!"
+      }

include/sass/base.h

@@ -68,7 +68,6 @@ enum Sass_Output_Style {
   SASS_STYLE_COMPRESSED,
   // only used internaly
   SASS_STYLE_INSPECT,
-  SASS_STYLE_TO_SASS,
   SASS_STYLE_TO_CSS
 };
 

script/ci-build-libsass

@@ -107,28 +107,42 @@ if [ "$CONTINUOUS_INTEGRATION" == "true" ] && [ "$TRAVIS_PULL_REQUEST" != "false
    ([ "$TRAVIS_OS_NAME" == "linux" ] || [ "$TRAVIS_OS_NAME" == "osx" ] || [ "$TRAVIS_OS_NAME" == "cygwin" ]);
 then
 
-  echo "Fetching PR $TRAVIS_PULL_REQUEST"
+  if [ "x$TRAVIS_PULL_REQUEST" != "2918" ]; then
 
-  JSON=$(curl -L -sS https://api.github.com/repos/sass/libsass/pulls/$TRAVIS_PULL_REQUEST)
+    echo "Checking out refactoring branch"
+    cd sass-spec
+    if ! git config remote.mgreter.url > /dev/null; then
+      git remote add mgreter https://github.com/mgreter/sass-spec.git -f
+      git checkout -b refactoring mgreter/feature/libsass-parser-backport
+    fi
+    cd ..
+    make $MAKE_OPTS test_probe
 
-  if [[ $JSON =~ "API rate limit exceeded" ]];
-  then
-    echo "Travis rate limit on github exceeded"
-    echo "Retrying via 'special purpose proxy'"
-    JSON=$(curl -L -sS https://github-api-reverse-proxy.herokuapp.com/repos/sass/libsass/pulls/$TRAVIS_PULL_REQUEST)
-  fi
+  else
 
-  RE_SPEC_PR="sass\/sass-spec(#|\/pull\/)([0-9]+)"
+    echo "Fetching PR $TRAVIS_PULL_REQUEST"
 
-  if [[ $JSON =~ $RE_SPEC_PR ]];
-  then
-    SPEC_PR="${BASH_REMATCH[2]}"
-    echo "Fetching Sass Spec PR $SPEC_PR"
-    git -C sass-spec fetch -u origin pull/$SPEC_PR/head:ci-spec-pr-$SPEC_PR
-    git -C sass-spec checkout --force ci-spec-pr-$SPEC_PR
-    make $MAKE_OPTS test_probe
-  else
-    make $MAKE_OPTS test_probe
+    JSON=$(curl -L -sS https://api.github.com/repos/sass/libsass/pulls/$TRAVIS_PULL_REQUEST)
+
+    if [[ $JSON =~ "API rate limit exceeded" ]];
+    then
+      echo "Travis rate limit on github exceeded"
+      echo "Retrying via 'special purpose proxy'"
+      JSON=$(curl -L -sS https://github-api-reverse-proxy.herokuapp.com/repos/sass/libsass/pulls/$TRAVIS_PULL_REQUEST)
+    fi
+
+    RE_SPEC_PR="sass\/sass-spec(#|\/pull\/)([0-9]+)"
+
+    if [[ $JSON =~ $RE_SPEC_PR ]];
+    then
+      SPEC_PR="${BASH_REMATCH[2]}"
+      echo "Fetching Sass Spec PR $SPEC_PR"
+      git -C sass-spec fetch -u origin pull/$SPEC_PR/head:ci-spec-pr-$SPEC_PR
+      git -C sass-spec checkout --force ci-spec-pr-$SPEC_PR
+      make $MAKE_OPTS test_probe
+    else
+      make $MAKE_OPTS test_probe
+    fi
   fi
 else
   make $MAKE_OPTS test_probe