Move the flex parsing function definitions to their own file so they're not duplicated in multiple places.

6 files changed, 52 insertions, 47 deletions

diff --git a/Source/GeneratePreviewForURL.m b/Source/GeneratePreviewForURL.m
index 9b66d3e7..5261b76a 100644
--- a/Source/GeneratePreviewForURL.m
+++ b/Source/GeneratePreviewForURL.m
@@ -37,6 +37,7 @@
 
 #import "SPDataAdditions.h"
 #import "SPEditorTokens.h"
+#import "SPSyntaxParser.h"
 
 OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thumbnail, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options, CGSize maxSize);
 OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options);
@@ -48,17 +49,6 @@ void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview);
   This function's job is to create preview for designated file
   ----------------------------------------------------------------------------- */
 
-#pragma mark lex init
-
-/*
-* Include all the extern variables and prototypes required for flex (used for syntax highlighting)
-*/
-extern NSUInteger yylex();
-extern NSUInteger yyuoffset, yyuleng;
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-void yy_switch_to_buffer(YY_BUFFER_STATE);
-YY_BUFFER_STATE yy_scan_string (const char *);
-
 OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options)
 {
 
@@ -528,6 +518,5 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
 
 void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview)
 {
-   // implement only if supported
+   // Implement only if supported
 }
-
diff --git a/Source/GenerateThumbnailForURL.m b/Source/GenerateThumbnailForURL.m
index 3b7d3151..84a0ceea 100644
--- a/Source/GenerateThumbnailForURL.m
+++ b/Source/GenerateThumbnailForURL.m
@@ -37,19 +37,17 @@
 void CancelThumbnailGeneration(void* thisInterface, QLThumbnailRequestRef thumbnail);
 OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thumbnail, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options, CGSize maximumSize);
 
-/* -----------------------------------------------------------------------------
-Generate a thumbnail for file
-
-This function's job is to create thumbnail for designated file as fast as possible
------------------------------------------------------------------------------ */
-
+/**
+ * Generate a thumbnail for file.
+ *
+ * This function's job is to create thumbnail for designated file as fast as possible.
+ */
 void CancelThumbnailGeneration(void* thisInterface, QLThumbnailRequestRef thumbnail)
 {
-	// implement only if supported
+	// Implement only if supported
 }
 
 OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thumbnail, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options, CGSize maximumSize)
-
 {
 	return noErr;
 
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 6f9e6341..1dc84583 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -51,21 +51,11 @@
 #import "SPBundleCommandRunner.h"
 #import "SPWindowManagement.h"
 #import "SPCopyTable.h"
+#import "SPSyntaxParser.h"
 
 #import <PSMTabBar/PSMTabBarControl.h>
 #import <Sparkle/Sparkle.h>
 
-#pragma mark Lex init
-
-/*
-* Include all the extern variables and prototypes required for flex (used for syntax highlighting)
-*/
-extern NSUInteger yylex();
-extern NSUInteger yyuoffset, yyuleng;
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-void yy_switch_to_buffer(YY_BUFFER_STATE);
-YY_BUFFER_STATE yy_scan_string (const char *);
-
 @interface SPAppController ()
 
 - (void)_copyDefaultThemes;
diff --git a/Source/SPSyntaxParser.h b/Source/SPSyntaxParser.h
new file mode 100644
index 00000000..74fbb9bc
--- /dev/null
+++ b/Source/SPSyntaxParser.h
@@ -0,0 +1,38 @@
+//
+//  $Id$
+//
+//  SPSyntaxParser.h
+//  sequel-pro
+//
+//  Created by Stuart Connolly (stuconnolly.com) on January 25, 2013.
+//  Copyright (c) 2013 Stuart Connolly. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person
+//  obtaining a copy of this software and associated documentation
+//  files (the "Software"), to deal in the Software without
+//  restriction, including without limitation the rights to use,
+//  copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following
+//  conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//  OTHER DEALINGS IN THE SOFTWARE.
+
+/**
+ * Variable and prototype definitions required for flex syntax hightlighting parsing.
+ */
+extern NSUInteger yylex();
+extern NSUInteger yyuoffset, yyuleng;
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+void yy_switch_to_buffer(YY_BUFFER_STATE);
+YY_BUFFER_STATE yy_scan_string(const char *);
diff --git a/Source/SPTextView.m b/Source/SPTextView.m
index aeef2276..39398a46 100644
--- a/Source/SPTextView.m
+++ b/Source/SPTextView.m
@@ -52,23 +52,12 @@
 #import "SPBundleCommandRunner.h"
 #import "NoodleLineNumberView.h"
 #import "SPCopyTable.h"
+#import "SPEditorTokens.h"
+#import "SPSyntaxParser.h"
 
 #import <SPMySQL/SPMySQL.h>
 
 #pragma mark -
-#pragma mark lex init
-
-/**
- * Include all the extern variables and prototypes required for flex (used for syntax highlighting)
- */
-#import "SPEditorTokens.h"
-extern NSUInteger yylex();
-extern NSUInteger yyuoffset, yyuleng;
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-void yy_switch_to_buffer(YY_BUFFER_STATE);
-YY_BUFFER_STATE yy_scan_string (const char *);
-
-#pragma mark -
 #pragma mark attribute definition 
 
 #define kAPlinked      @"Linked" // attribute for a via auto-pair inserted char
@@ -83,7 +72,7 @@ YY_BUFFER_STATE yy_scan_string (const char *);
 #define kBTQuoteValue  @"isBTQuoted"
 
 #pragma mark -
-#pragma mark constant definitions
+#pragma mark Constant definitions
 
 #define SP_CQ_SEARCH_IN_MYSQL_HELP_MENU_ITEM_TAG 1000
 #define SP_CQ_COPY_AS_RTF_MENU_ITEM_TAG          1001
@@ -102,7 +91,6 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse);
 
 @end
 
-
 // some helper functions for handling rectangles and points
 // needed in roundedBezierPathAroundRange:
 static inline CGFloat SPRectTop(NSRect rectangle) { return rectangle.origin.y; }
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index d110c276..b8d41ab2 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -663,6 +663,7 @@
 		174CE11D10AB80B5008F892B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Interfaces/English.lproj/DatabaseProcessList.xib; sourceTree = "<group>"; };
 		174CE14010AB9281008F892B /* SPProcessListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPProcessListController.h; sourceTree = "<group>"; };
 		174CE14110AB9281008F892B /* SPProcessListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPProcessListController.m; sourceTree = "<group>"; };
+		1755A25C16B33BEA00B35787 /* SPSyntaxParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPSyntaxParser.h; sourceTree = "<group>"; };
 		175EC63312733B36009A7C0F /* SPExportControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPExportControllerDelegate.h; sourceTree = "<group>"; };
 		175EC63412733B36009A7C0F /* SPExportControllerDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPExportControllerDelegate.m; sourceTree = "<group>"; };
 		175EC64C12733CDF009A7C0F /* SPCategoryAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPCategoryAdditions.h; sourceTree = "<group>"; };
@@ -2479,6 +2480,7 @@
 				179F15050F7C433C00579954 /* SPEditorTokens.l */,
 				BCD0AD4A0FBBFC480066EA5C /* SPSQLTokenizer.h */,
 				BCD0AD480FBBFC340066EA5C /* SPSQLTokenizer.l */,
+				1755A25C16B33BEA00B35787 /* SPSyntaxParser.h */,
 			);
 			name = Parsing;
 			sourceTree = "<group>";