summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
authorelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-12-29 17:51:16 +0000
committerelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-12-29 17:51:16 +0000
commit6ad785aadfe6013f6e2bc9b684ded2f739735b39 (patch)
tree27641511382b9532ebf222673a0b49cfd778f369 /TAO/orbsvcs
parentdaafeb6235207e35d8b2f1e02719de4299914ddc (diff)
downloadATCD-6ad785aadfe6013f6e2bc9b684ded2f739735b39.tar.gz
ChangeLogTag: Fri Dec 29 17:50:16 UTC 2006 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff15
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/constraint.l1
3 files changed, 22 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index e7854e35be3..c3f0c5d4e28 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -283,12 +283,12 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
*yy_cp = '\0'; \
yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 31
-#define YY_END_OF_BUFFER 32
+#define YY_NUM_RULES 32
+#define YY_END_OF_BUFFER 33
static yyconst short int yy_accept[81] =
{ 0,
- 0, 0, 32, 30, 31, 30, 30, 22, 23, 14,
- 12, 13, 30, 15, 26, 16, 30, 18, 29, 29,
+ 0, 0, 33, 31, 30, 31, 31, 22, 23, 14,
+ 12, 13, 31, 15, 26, 16, 31, 18, 29, 29,
29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
11, 21, 0, 28, 0, 0, 26, 27, 17, 20,
19, 29, 29, 29, 29, 29, 29, 10, 29, 29,
@@ -837,11 +837,15 @@ YY_RULE_SETUP
YY_BREAK
case 30:
YY_RULE_SETUP
+{}
+ break;
+case 31:
+YY_RULE_SETUP
{
TAO_YY_LEX_DEBUG; return TAO_UNKNOWN;
}
YY_BREAK
-case 31:
+case 32:
YY_RULE_SETUP
TAO_TRADER_ECHO;
break;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff
index d7ae0c457cd..0067720a575 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff
@@ -1,5 +1,5 @@
---- Constraint_l.cpp.orig 2006-12-11 08:23:38.000000000 -0600
-+++ Constraint_l.cpp 2006-12-11 08:23:19.000000000 -0600
+--- Constraint_l.cpp.orig 2006-12-29 11:48:44.000000000 -0600
++++ Constraint_l.cpp 2006-12-29 11:48:44.000000000 -0600
@@ -11,6 +11,7 @@
#include "ace/os_include/os_stdio.h"
@@ -35,9 +35,18 @@
YY_DECL
{
register yy_state_type yy_current_state;
-@@ -837,7 +844,7 @@
+@@ -831,7 +838,7 @@
+ case 30:
+ YY_RULE_SETUP
+ {}
+- YY_BREAK
++ break;
case 31:
YY_RULE_SETUP
+ {
+@@ -841,7 +848,7 @@
+ case 32:
+ YY_RULE_SETUP
TAO_TRADER_ECHO;
- YY_BREAK
+ break;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.l b/TAO/orbsvcs/orbsvcs/Trader/constraint.l
index e61d936732b..d8e67d5ad50 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/constraint.l
+++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.l
@@ -109,6 +109,7 @@ FALSE {
new TAO_Property_Constraint(yytext);
TAO_YY_LEX_DEBUG; return TAO_IDENT;
}
+{white_space} {}
{unknown} {
TAO_YY_LEX_DEBUG; return TAO_UNKNOWN;
}