The R Project SVN – R-packages – Diff – /trunk/Mac-GUI/RScriptEditorTextView.m

 /**
  * Include all the extern variables and prototypes required for flex (used for syntax highlighting)
  */
 #import "RScriptEditorTokens.h"
+#import "RdScriptEditorTokens.h"
+// R lexer
 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 *);
+// Rd lexer
+extern NSUInteger rdlex();
+typedef struct rd_buffer_state *RD_BUFFER_STATE;
+void rd_switch_to_buffer(RD_BUFFER_STATE);
+RD_BUFFER_STATE rd_scan_string (const char *);
 #pragma mark -
 #pragma mark attribute definition
 #define kAPlinked      @"Linked" // attribute for a via auto-pair inserted char
 #define kAPval         @"linked"
 	// mainly for suppressing auto-pairing in
 	[theTextStorage removeAttribute:kLEXToken range:textRange];
 	// initialise flex
 	yyuoffset = textRange.location; yyuleng = 0;
-	yy_switch_to_buffer(yy_scan_string(NSStringUTF8String([selfstr substringWithRange:textRange])));
+	if([[self delegate] isRdDocument]) {
+			rd_switch_to_buffer(rd_scan_string(NSStringUTF8String([selfstr substringWithRange:textRange])));
-	// now loop through all the tokens
+			// now loop through all the tokens
-	while ((token = yylex())) {
+			while ((token = rdlex())) {
-// NSLog(@"t %d", token);
+		// NSLog(@"t %d", token);
-		switch (token) {
+				switch (token) {
-			case RPT_SINGLE_QUOTED_TEXT:
-			case RPT_DOUBLE_QUOTED_TEXT:
+					case RDPT_COMMENT:
-			    tokenColor = shColorString;
+					    tokenColor = shColorComment;
-			    break;
+					    break;
-			case RPT_RESERVED_WORD:
+					case RDPT_SECTION:
-			    tokenColor = shColorKeyword;
+					    tokenColor = shColorNumber;
-			    break;
+					    break;
-			case RPT_NUMERIC:
+					case RDPT_MACRO_ARG:
-				tokenColor = shColorNumber;
+					    tokenColor = shColorKeyword;
-				break;
+					    break;
-			case RPT_BACKTICK_QUOTED_TEXT:
+					case RDPT_MACRO_GEN:
-			    tokenColor = shColorString;
+					    tokenColor = shColorIdentifier;
-			    break;
+					    break;
-			case RPT_COMMENT:
+					default:
-			    tokenColor = shColorComment;
+					    tokenColor = shColorNormal;
-			    break;
+				}
-			case RPT_VARIABLE:
+				tokenRange = NSMakeRange(yyuoffset, yyuleng);
+				// make sure that tokenRange is valid (and therefore within textRange)
+				// otherwise a bug in the lex code could cause the the TextView to crash
+				// NOTE Disabled for testing purposes for speed it up
-			    tokenColor = shColorIdentifier;
+				tokenRange = NSIntersectionRange(tokenRange, textRange);
-			    break;
+				if (!tokenRange.length) continue;
+				// If the current token is marked as SQL keyword, uppercase it if required.
-			case RPT_WHITESPACE:
+				tokenEnd = NSMaxRange(tokenRange) - 1;
+				NSMutableAttributedStringAddAttributeValueRange(theTextStorage, NSForegroundColorAttributeName, tokenColor, tokenRange);
+				// Add an attribute to be used in the auto-pairing (keyDown:)
+				// to disable auto-pairing if caret is inside of any token found by lex.
+				// For discussion: maybe change it later (only for quotes not keywords?)
-			    continue;
+				if(token < 6)
+					NSMutableAttributedStringAddAttributeValueRange(theTextStorage, kLEXToken, kLEXTokenValue, tokenRange);
+				// Add an attribute to be used to distinguish quotes from keywords etc.
-			    break;
+				// used e.g. in completion suggestions
-			default:
+				else if(token < 4)
-			    tokenColor = shColorNormal;
+					NSMutableAttributedStringAddAttributeValueRange(theTextStorage, kQuote, kQuoteValue, tokenRange);
-		}
+			}
+	} else {
-		tokenRange = NSMakeRange(yyuoffset, yyuleng);
+		yy_switch_to_buffer(yy_scan_string(NSStringUTF8String([selfstr substringWithRange:textRange])));
-		// make sure that tokenRange is valid (and therefore within textRange)
+		// now loop through all the tokens
+		while ((token = yylex())) {
+	// NSLog(@"t %d", token);
+			switch (token) {
+				case RPT_SINGLE_QUOTED_TEXT:
+				case RPT_DOUBLE_QUOTED_TEXT:
+				    tokenColor = shColorString;
+				    break;
+				case RPT_RESERVED_WORD:
-		// otherwise a bug in the lex code could cause the the TextView to crash
+				    tokenColor = shColorKeyword;
+				    break;
+				case RPT_NUMERIC:
+					tokenColor = shColorNumber;
+					break;
+				case RPT_BACKTICK_QUOTED_TEXT:
+				    tokenColor = shColorString;
+				    break;
+				case RPT_COMMENT:
-		// NOTE Disabled for testing purposes for speed it up
+				    tokenColor = shColorComment;
+				    break;
+				case RPT_VARIABLE:
-		tokenRange = NSIntersectionRange(tokenRange, textRange);
+				    tokenColor = shColorIdentifier;
+				    break;
+				case RPT_WHITESPACE:
+				    continue;
+				    break;
+				default:
-		if (!tokenRange.length) continue;
+				    tokenColor = shColorNormal;
+			}
-		// If the current token is marked as SQL keyword, uppercase it if required.
-		tokenEnd = NSMaxRange(tokenRange) - 1;
+			tokenRange = NSMakeRange(yyuoffset, yyuleng);
+			// make sure that tokenRange is valid (and therefore within textRange)
+			// otherwise a bug in the lex code could cause the the TextView to crash
+			// NOTE Disabled for testing purposes for speed it up
+			tokenRange = NSIntersectionRange(tokenRange, textRange);
+			if (!tokenRange.length) continue;
+			// If the current token is marked as SQL keyword, uppercase it if required.
+			tokenEnd = NSMaxRange(tokenRange) - 1;
-		NSMutableAttributedStringAddAttributeValueRange(theTextStorage, NSForegroundColorAttributeName, tokenColor, tokenRange);
+			NSMutableAttributedStringAddAttributeValueRange(theTextStorage, NSForegroundColorAttributeName, tokenColor, tokenRange);
-		// Add an attribute to be used in the auto-pairing (keyDown:)
+			// Add an attribute to be used in the auto-pairing (keyDown:)
-		// to disable auto-pairing if caret is inside of any token found by lex.
+			// to disable auto-pairing if caret is inside of any token found by lex.
-		// For discussion: maybe change it later (only for quotes not keywords?)
+			// For discussion: maybe change it later (only for quotes not keywords?)
-		if(token < 6)
+			if(token < 6)
-			NSMutableAttributedStringAddAttributeValueRange(theTextStorage, kLEXToken, kLEXTokenValue, tokenRange);
+				NSMutableAttributedStringAddAttributeValueRange(theTextStorage, kLEXToken, kLEXTokenValue, tokenRange);
-		// Add an attribute to be used to distinguish quotes from keywords etc.
+			// Add an attribute to be used to distinguish quotes from keywords etc.
-		// used e.g. in completion suggestions
+			// used e.g. in completion suggestions
-		else if(token < 4)
+			else if(token < 4)
-			NSMutableAttributedStringAddAttributeValueRange(theTextStorage, kQuote, kQuoteValue, tokenRange);
+				NSMutableAttributedStringAddAttributeValueRange(theTextStorage, kQuote, kQuoteValue, tokenRange);
+		}
+	}
 	// set current textColor to the color of the caret's position - 1
 	// to try to suppress writing in normalColor before syntax highlighting
 	NSUInteger ix = [self selectedRange].location;

The R Project SVN R-packages

(root)/trunk/Mac-GUI/RScriptEditorTextView.m @ 5994 – Rev 5993 → 5995