ADDED: Added the latest updates from the main repo, added for activat…

…ing the token pool, added line tokens from parser.h to the Swift TokenType struct

.astylerc

@@ -28,17 +28,22 @@
 --lineend=linux
 
 
-# Add brackets to one-liners
---add-brackets
+# Add braces to one-liners
+--add-braces
 
 
 # Pad with blank lines
 --break-blocks
 
 
 # Pad with spaces
+--pad-comma
 --pad-oper
 --pad-header
+--pad-method-prefix
+--pad-method-colon=none
+--pad-return-type
+--unpad-param-type
 
 
 # Pointers/References
@@ -51,16 +56,6 @@
 
 
 # Excludes
---exclude="Sources/libMultiMarkdown/scanners.c"
---exclude="Sources/libMultiMarkdown/parser.c"
---exclude="Sources/libMultiMarkdown/lexer.c"
-
---exclude="Sources/libMultiMarkdown/i18n.h"
---exclude="Sources/libMultiMarkdown/miniz.c"
---exclude="Sources/libMultiMarkdown/miniz.h"
---exclude="Sources/libMultiMarkdown/uthash.h"
-
---exclude="Sources/multimarkdown/argtable3.c"
---exclude="Sources/multimarkdown/argtable3.h"
 
 --ignore-exclude-errors
+

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+*.DS_Store
 CHANGELOG-UNRELEASED
 documentation
 gh-pages

CMakeLists.txt

@@ -6,7 +6,7 @@
 #	See the LICENSE file for copyright and licensing information.
 #
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.9)
 
 
 # ===================
@@ -165,6 +165,19 @@ endif (POLICY CMP0048)
 
 project (${My_Project_Title} VERSION "${My_Project_Version}")
 
+# from http://stackoverflow.com/questions/25199677/how-to-detect-if-current-scope-has-a-parent-in-cmake
+get_directory_property(hasParent PARENT_DIRECTORY)
+
+if (hasParent)
+else()
+	# If building the framework independently, we canset a deployment target
+	# set (CMAKE_OSX_DEPLOYMENT_TARGET "10.12")
+
+	if (CMAKE_GENERATOR MATCHES "Xcode")
+		set (CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
+	endif()
+endif()
+
 
 # Search source directory
 include_directories(${PROJECT_SOURCE_DIR}/src)
@@ -200,9 +213,22 @@ set_target_properties("${My_Project_Title}"
 	ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
 )
 
+if (hasParent)
+else()
+	set_target_properties("${My_Project_Title}"
+		PROPERTIES
+		XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Debug] YES
+		XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=MinSizeRel] NO
+		XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=RelWithDebInfo] NO
+		XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Release] NO
+		XCODE_LINK_BUILD_PHASE_MODE "KNOWN_LOCATION"
+	)
+endif()
+
 # Link to other libraries
 target_link_libraries("${My_Project_Title}"
 	${libraries_to_link}
+	m
 )
 
 # Link to Apple Cocoa Framework?
@@ -272,10 +298,6 @@ configure_file (
 # Build Test Suite with CuTest (unit testing)
 # ===========================================
 
-# from http://stackoverflow.com/questions/25199677/how-to-detect-if-current-scope-has-a-parent-in-cmake
-get_directory_property(hasParent PARENT_DIRECTORY)
-
-
 set(test_files
 	test/CuTest.c
 	test/CuTest.h