Regarding: Some litle problem inside xftgram.y, gram.y, xkbparse.y and cfgparse.y files
Email: [EMAIL PROTECTED]
------------------------------------------------------------
XFree86 Version: 4.2.1 with latest patch level
OS: OpenNA Linux
Area: Compile fail with latest version of bison
Server: Other, specify below
Description:
I've found some litle problem when compiling X version 4.2.1 with Bison 1.875. Here is
my patch to make it work and compile without error. Hope this help.
diff -ur xc.orig/lib/Xft/xftgram.y xc/lib/Xft/xftgram.y
--- xc.orig/lib/Xft/xftgram.y 2001-05-16 06:32:54.000000000 -0400
+++ xc/lib/Xft/xftgram.y 2002-11-28 18:51:02.000000000 -0500
@@ -165,6 +165,7 @@
matrix.yx = $4;
matrix.__REALLY_YY__ = $5;
}
+ ;
number : INTEGER
{ $$ = (double) $1; }
| DOUBLE
diff -ur xc.orig/programs/twm/gram.y xc/programs/twm/gram.y
--- xc.orig/programs/twm/gram.y 2001-12-14 15:01:07.000000000 -0500
+++ xc/programs/twm/gram.y 2002-11-28 18:51:02.000000000 -0500
@@ -654,6 +654,7 @@
RemoveDQuote(ptr);
$$ = ptr;
}
+ ;
number : NUMBER { $$ = $1; }
;
diff -ur xc.orig/programs/xkbcomp/xkbparse.y xc/programs/xkbcomp/xkbparse.y
--- xc.orig/programs/xkbcomp/xkbparse.y 2001-01-17 18:45:45.000000000 -0500
+++ xc/programs/xkbcomp/xkbparse.y 2002-11-28 18:51:02.000000000 -0500
@@ -448,7 +448,6 @@
ShapeDecl : SHAPE String OBRACE OutlineList CBRACE SEMI
{ $$= ShapeDeclCreate($2,(OutlineDef *)&$4->common); }
- ;
| SHAPE String OBRACE CoordList CBRACE SEMI
{
OutlineDef *outlines;
@@ -511,7 +510,7 @@
{
$$= (OverlayKeyDef *)
AppendStmt(&$1->common,&$3->common);
- };
+ }
| OverlayKey
{ $$= $1; }
;
diff -ur xc.orig/programs/xkbevd/cfgparse.y xc/programs/xkbevd/cfgparse.y
--- xc.orig/programs/xkbevd/cfgparse.y 2001-01-17 18:46:07.000000000 -0500
+++ xc/programs/xkbevd/cfgparse.y 2002-11-28 18:52:41.000000000 -0500
@@ -173,6 +173,7 @@
| SHELL { $$ = ShellAction; }
| SOUND { $$ = SoundAction; }
| { $$ = UnknownAction; }
+ ;
OptNameSpec : NameSpec { $$= $1; }
| { $$= NULL; }
Repeat By:
I've found some litle problem when compiling X version 4.2.1 with Bison 1.875. Here is
my patch to make it work and compile without error. Hope this help.
diff -ur xc.orig/lib/Xft/xftgram.y xc/lib/Xft/xftgram.y
--- xc.orig/lib/Xft/xftgram.y 2001-05-16 06:32:54.000000000 -0400
+++ xc/lib/Xft/xftgram.y 2002-11-28 18:51:02.000000000 -0500
@@ -165,6 +165,7 @@
matrix.yx = $4;
matrix.__REALLY_YY__ = $5;
}
+ ;
number : INTEGER
{ $$ = (double) $1; }
| DOUBLE
diff -ur xc.orig/programs/twm/gram.y xc/programs/twm/gram.y
--- xc.orig/programs/twm/gram.y 2001-12-14 15:01:07.000000000 -0500
+++ xc/programs/twm/gram.y 2002-11-28 18:51:02.000000000 -0500
@@ -654,6 +654,7 @@
RemoveDQuote(ptr);
$$ = ptr;
}
+ ;
number : NUMBER { $$ = $1; }
;
diff -ur xc.orig/programs/xkbcomp/xkbparse.y xc/programs/xkbcomp/xkbparse.y
--- xc.orig/programs/xkbcomp/xkbparse.y 2001-01-17 18:45:45.000000000 -0500
+++ xc/programs/xkbcomp/xkbparse.y 2002-11-28 18:51:02.000000000 -0500
@@ -448,7 +448,6 @@
ShapeDecl : SHAPE String OBRACE OutlineList CBRACE SEMI
{ $$= ShapeDeclCreate($2,(OutlineDef *)&$4->common); }
- ;
| SHAPE String OBRACE CoordList CBRACE SEMI
{
OutlineDef *outlines;
@@ -511,7 +510,7 @@
{
$$= (OverlayKeyDef *)
AppendStmt(&$1->common,&$3->common);
- };
+ }
| OverlayKey
{ $$= $1; }
;
diff -ur xc.orig/programs/xkbevd/cfgparse.y xc/programs/xkbevd/cfgparse.y
--- xc.orig/programs/xkbevd/cfgparse.y 2001-01-17 18:46:07.000000000 -0500
+++ xc/programs/xkbevd/cfgparse.y 2002-11-28 18:52:41.000000000 -0500
@@ -173,6 +173,7 @@
| SHELL { $$ = ShellAction; }
| SOUND { $$ = SoundAction; }
| { $$ = UnknownAction; }
+ ;
OptNameSpec : NameSpec { $$= $1; }
| { $$= NULL; }
_______________________________________________
XFree86 mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/xfree86
