Merge pull request #4040 from supercollider/3.10

Merge 3.10 into develop
supercollider · Aug 31, 2018 · b284f98 · b284f98
2 parents 7f81e55 + 0107fc1
commit b284f98
Show file tree

Hide file tree

Showing 12 changed files with 361 additions and 242 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -9,7 +9,7 @@ version: '{build}' # incremented with each build
 clone_depth: 10
 
 # https://www.appveyor.com/docs/build-environment/#build-worker-images
-image: Visual Studio 2017
+image: Previous Visual Studio 2017
 
 # disable automatic tests
 test: off

diff --git a/.travis/before-install-osx.sh b/.travis/before-install-osx.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
 
-brew update
-brew tap homebrew/versions
-brew outdated cmake || brew upgrade cmake
+export BREW_NO_AUTO_UPDATE=1
+export BREW_NO_ANALYTICS=1
 
 # according to https://docs.travis-ci.com/user/caching#ccache-cache
 brew install ccache
 export PATH="/usr/local/opt/ccache/libexec:$PATH"
 
 brew install libsndfile || true
+brew install portaudio || true
 brew install qt5 || true
 brew link qt5 --force
 
 # To get less noise in xcode output
-gem install xcpretty
+gem install xcpretty
diff --git a/.travis/before-script-osx.sh b/.travis/before-script-osx.sh
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-cmake -G"Xcode" -DRULE_LAUNCH_COMPILE=ccache -DCMAKE_PREFIX_PATH=`brew --prefix qt5` -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 $TRAVIS_BUILD_DIR --debug-output
+cmake -G"Xcode" \
+    -DRULE_LAUNCH_COMPILE=ccache \
+    -DCMAKE_PREFIX_PATH=`brew --prefix qt5` \
+    -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 \
+    -DSUPERNOVA=ON \
+    $TRAVIS_BUILD_DIR --debug-output
diff --git a/HelpSource/editor.js b/HelpSource/editor.js
@@ -6,6 +6,7 @@ const init = () => {
             { regex: /^(?:arg|classvar|const|super|this|var)\b/, token: 'keyword' },
             { regex: /^(?:false|inf|nil|true|thisFunction|thisFunctionDef|thisMethod|thisProcess|thisThread|currentEnvironment|topEnvironment)\b/, token: 'built-in' },
             { regex: /^\b\d+r[0-9a-zA-Z]*(\.[0-9A-Z]*)?/, token: 'number radix-float' },
+            { regex: /^\b\d+(s+|b+|[sb]\d+)\b/, token: 'number scale-degree' },
             { regex: /^\b((\d+(\.\d+)?([eE][-+]?\d+)?(pi)?)|pi)\b/, token: 'number float' },
             { regex: /^\b0(x|X)(\d|[a-f]|[A-F])+/, token: 'number hex-int' },
             { regex: /^\b[A-Za-z_]\w*\:/, token: 'symbol symbol-arg' },
@@ -36,7 +37,7 @@ const init = () => {
             value: code,
             lineWrapping: true,
             viewportMargin: Infinity,
-            extraKeys: { 
+            extraKeys: {
                 'Shift-Enter': evalLine
             }
         })
@@ -118,7 +119,7 @@ const selectRegion = (options = { flash: true }) => {
     /* no parens found */
     if (parenPairs.length === 0)
         return selectLine(options)
-    
+
     let pair = parenPairs.pop()
     leftCursor = pair[0]
     rightCursor = pair[1]

diff --git a/SCClassLibrary/Common/Streams/Pspawner.sc b/SCClassLibrary/Common/Streams/Pspawner.sc
@@ -100,29 +100,30 @@ Pspawn : FilterPattern {
 
 	embedInStream { |inevent|
 		^Spawner({ |sp|
-			var	event, stream = pattern.asStream, child;
+			var	event, stream = pattern.asStream, child, method;
 			while { (event = stream.next(spawnProtoEvent.copy.put(\spawner, sp))).notNil } {
+				method = event[\method];
 				case
-				{ event.method == \wait } {
-					event.spawner.wait(event.delta)
+				{ method == \wait } {
+					event[\spawner].wait(event.delta)
 				}
-				{ #[seq, par].includes(event.method) } {
+				{ #[seq, par].includes(method) } {
 					child = event[\pattern];
 					if(child.isKindOf(Symbol)) {
 						child = (event[\dict] ? Pdef).at(child);
 					};
-					event.spawner.perform(event.method, child.value(event));
+					event[\spawner].perform(event.method, child.value(event));
 					if(event.delta > 0) {
-						event.spawner.wait(event.delta)
+						event[\spawner].wait(event.delta)
 					}
 				}
 				// suspend requires access to the specific stream
 				// don't know how to get it... maybe implement later
-				{ event.method == \suspendAll } {
-					event.spawner.suspendAll
+				{ method == \suspendAll } {
+					event[\spawner].suspendAll
 				}
 				{ "Unrecognized method % in spawner event."
-					.format(event.method.asCompileString).warn;
+					.format(method.asCompileString).warn;
 				}
 			};
 		}).embedInStream(inevent)

diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
@@ -133,6 +133,7 @@ set ( ide_src
     core/settings/serialization.cpp
     core/settings/manager.cpp
     core/settings/theme.cpp
+    core/settings/default_themes.cpp
     core/session_manager.cpp
     core/util/color.cpp
     core/util/standard_dirs.cpp

diff --git a/editors/sc-ide/core/sc_lexer.cpp b/editors/sc-ide/core/sc_lexer.cpp
@@ -45,6 +45,9 @@ void ScLexer::initLexicalRules()
 
     mLexicalRules << LexicalRule( Token::RadixFloat, "^\\b\\d+r[0-9a-zA-Z]*(\\.[0-9A-Z]*)?" );
 
+    // Never heard of this one? Check the "Literals" help file :)
+    mLexicalRules << LexicalRule( Token::ScaleDegreeFloat, "^\\b\\d+(s+|b+|[sb]\\d+)\\b" );
+
     // do not include leading "-" in Float, as left-to-right algorithm does
     // not know whether it is not rather a binary operator
     mLexicalRules << LexicalRule( Token::Float, "^\\b((\\d+(\\.\\d+)?([eE][-+]?\\d+)?(pi)?)|pi)\\b" );