Revision: 65378
http://sourceforge.net/p/brlcad/code/65378
Author: starseeker
Date: 2015-06-18 11:59:20 +0000 (Thu, 18 Jun 2015)
Log Message:
-----------
Applied wrong version of #375 patch - back up and apply the correct one. This
applies cleanly.
Modified Paths:
--------------
brlcad/trunk/src/conv/csg/csg_parser.lemon
brlcad/trunk/src/conv/csg/csg_scanner.perplex
Modified: brlcad/trunk/src/conv/csg/csg_parser.lemon
===================================================================
--- brlcad/trunk/src/conv/csg/csg_parser.lemon 2015-06-18 11:52:18 UTC (rev
65377)
+++ brlcad/trunk/src/conv/csg/csg_parser.lemon 2015-06-18 11:59:20 UTC (rev
65378)
@@ -41,21 +41,17 @@
/* priorities , not sure if this is how is intended to be used */
%left GROUP_BEGIN.
-/*
%left GROUP_CONTENT.
%left GROUP_END.
-*/
+
/* I believe here I get the compiling error */
-start_symbol ::= code.
+start_symbol ::= code.
-//source ::= /* empty */.
-
/* Initial, simple grammar, just for testing */
-
code ::= groupb.
-groupb::= GROUP_BEGIN.
+groupb::= GROUP_BEGIN.
{
fprintf(appData->outfile, "we found group() {\n");
}
Modified: brlcad/trunk/src/conv/csg/csg_scanner.perplex
===================================================================
--- brlcad/trunk/src/conv/csg/csg_scanner.perplex 2015-06-18 11:52:18 UTC
(rev 65377)
+++ brlcad/trunk/src/conv/csg/csg_scanner.perplex 2015-06-18 11:59:20 UTC
(rev 65378)
@@ -48,23 +48,26 @@
<code> {
(group_begin) {
- YYSETCONDITION(code);
+ YYSETCONDITION(code);
return GROUP_BEGIN;
- }
+ }
[^] { continue; }
}
+
/*
<group> {
-(group_end) {
+(group_content) {
YYSETCONDITION(code);
return GROUP_CONTENT;
}
+[^] { continue; }
}
+
<group_in> {
- (optional_ws)(group_end) {
+(group_end) {
YYSETCONDITION(group);
return GROUP_END;
-}
+ }
[^] { continue; }
}
*/
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
