From fd279723663879e742e53d7b3503248f6af91791 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@src.gnome.org>
Date: Tue, 23 Jan 2001 19:20:44 +0000
Subject: This commit was generated by cvs2svn to compensate for changes in
 r7747, which included commits to RCS files with non-trunk default branches.

svn path=/trunk/; revision=7748
---
 libical/src/libicalss/icalsslexer.l | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'libical/src/libicalss/icalsslexer.l')

diff --git a/libical/src/libicalss/icalsslexer.l b/libical/src/libicalss/icalsslexer.l
index 0054984c6d..848a9bc74f 100644
--- a/libical/src/libicalss/icalsslexer.l
+++ b/libical/src/libicalss/icalsslexer.l
@@ -6,7 +6,7 @@
   
   DESCRIPTION:
   
-  $Id: icalsslexer.l,v 1.1 2000/12/11 22:06:17 federico Exp $
+  $Id: icalsslexer.l,v 1.1.1.2 2001/01/23 19:20:41 jpr Exp $
   $Locker:  $
 
 (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -84,12 +84,10 @@ WHERE			{ return WHERE; }
 ">=" 			{ return GREATEREQUALS; }
 AND 			{ return AND; }
 OR			{ return OR; }
+\'                      { return QUOTE; }
 [ \t\n\r]+ ;			
 ;			{ return EOL; }
-[\*A-Za-z0-9\-\.]+		{ sslval.v_string= icalmemory_tmp_copy(sstext);
-			  return STRING; }
-
-'[^'\n]*' {
+\'[\*A-Za-z0-9\-\.]+\' {
 	int c = input();
 	unput(c);
 	if(c!='\''){
@@ -100,6 +98,10 @@ OR			{ return OR; }
 	}
 }
 
+[\*A-Za-z0-9\-\.]+		{ sslval.v_string= icalmemory_tmp_copy(sstext);
+			  return STRING; }
+
+
 .			{ return yytext[0]; }
 
 %% 
-- 
cgit v1.2.3