msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Regenerated transfer bnfc stuff with latest bnfc, happy and alex, to be able to compile on GHC CVS.

Browse Source
This commit is contained in:
bringert
2006-05-20 01:41:53 +00:00
parent 49b171a4d5
commit f757f2ea1e
10 changed files with 224 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Transfer/Core/Abs.hs
View File

@@ -196,7 +196,7 @@ johnMajorEq _ _ = False
instance Ord (Tree c) where instance Ord (Tree c) where
compare x y = compare (index x) (index y) `mappend` compareSame x y compare x y = compare (index x) (index y) `mappend` compareSame x y
where index :: Tree c -> Int
index (Module _) = 0 index (Module _) = 0
index (DataDecl _ _ _) = 1 index (DataDecl _ _ _) = 1
index (TypeDecl _ _) = 2 index (TypeDecl _ _) = 2
@@ -230,6 +230,7 @@ instance Ord (Tree c) where
index (FieldValue _ _) = 30 index (FieldValue _ _) = 30
index (TMeta _) = 31 index (TMeta _) = 31
index (CIdent _) = 32 index (CIdent _) = 32
compareSame :: Tree c -> Tree c -> Ordering
compareSame (Module decls) (Module decls_) = compare decls decls_ compareSame (Module decls) (Module decls_) = compare decls decls_
compareSame (DataDecl cident exp consdecls) (DataDecl cident_ exp_ consdecls_) = mappend (compare cident cident_) (mappend (compare exp exp_) (compare consdecls consdecls_)) compareSame (DataDecl cident exp consdecls) (DataDecl cident_ exp_ consdecls_) = mappend (compare cident cident_) (mappend (compare exp exp_) (compare consdecls consdecls_))
compareSame (TypeDecl cident exp) (TypeDecl cident_ exp_) = mappend (compare cident cident_) (compare exp exp_) compareSame (TypeDecl cident exp) (TypeDecl cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)

13
src/Transfer/Core/Lex.hs
View File

@@ -1,8 +1,8 @@
{-# OPTIONS -fglasgow-exts -cpp #-} {-# OPTIONS -fglasgow-exts -cpp #-}
{-# LINE 3 "Transfer/Core/Lex.x" #-} {-# LINE 3 "Transfer/Core/Lex.x" #-}
{-# OPTIONS -fno-warn-incomplete-patterns #-}
module Transfer.Core.Lex where module Transfer.Core.Lex where
import Transfer.ErrM
#if __GLASGOW_HASKELL__ >= 603 #if __GLASGOW_HASKELL__ >= 603
@@ -161,18 +161,9 @@ alex_action_9 = tok (\p s -> PT p (TD $ share s))
-- ----------------------------------------------------------------------------- -- -----------------------------------------------------------------------------
-- INTERNALS and main scanner engine -- INTERNALS and main scanner engine
{-# LINE 35 "GenericTemplate.hs" #-} {-# LINE 35 "GenericTemplate.hs" #-}
{-# LINE 45 "GenericTemplate.hs" #-}
data AlexAddr = AlexA# Addr# data AlexAddr = AlexA# Addr#

2
src/Transfer/Core/Lex.x
View File

@@ -1,9 +1,9 @@
-- -*- haskell -*- -- -*- haskell -*-
-- This Alex file was machine-generated by the BNF converter -- This Alex file was machine-generated by the BNF converter
{ {
{-# OPTIONS -fno-warn-incomplete-patterns #-}
module Transfer.Core.Lex where module Transfer.Core.Lex where
import Transfer.ErrM
} }

22
src/Transfer/Core/Par.hs
View File

@@ -1,4 +1,5 @@
{-# OPTIONS -fglasgow-exts -cpp #-} {-# OPTIONS -fglasgow-exts -cpp #-}
{-# OPTIONS -fno-warn-incomplete-patterns -fno-warn-overlapping-patterns #-}
module Transfer.Core.Par where module Transfer.Core.Par where
import Transfer.Core.Abs import Transfer.Core.Abs
import Transfer.Core.Lex import Transfer.Core.Lex
@@ -903,7 +904,6 @@ myLexer = tokens
{-# LINE 1 "GenericTemplate.hs" #-} {-# LINE 1 "GenericTemplate.hs" #-}
-- $Id$ -- $Id$
{-# LINE 28 "GenericTemplate.hs" #-} {-# LINE 28 "GenericTemplate.hs" #-}
@@ -913,20 +913,11 @@ data Happy_IntList = HappyCons Int# Happy_IntList
{-# LINE 49 "GenericTemplate.hs" #-} {-# LINE 49 "GenericTemplate.hs" #-}
{-# LINE 59 "GenericTemplate.hs" #-} {-# LINE 59 "GenericTemplate.hs" #-}
{-# LINE 68 "GenericTemplate.hs" #-}
infixr 9 `HappyStk` infixr 9 `HappyStk`
data HappyStk a = HappyStk a (HappyStk a) data HappyStk a = HappyStk a (HappyStk a)
@@ -978,14 +969,7 @@ happyDoAction i tk st
action | check = indexShortOffAddr happyTable off_i action | check = indexShortOffAddr happyTable off_i
| otherwise = indexShortOffAddr happyDefActions st | otherwise = indexShortOffAddr happyDefActions st
{-# LINE 127 "GenericTemplate.hs" #-}
indexShortOffAddr (HappyA# arr) off = indexShortOffAddr (HappyA# arr) off =

1
src/Transfer/Core/Par.y
View File

@@ -1,5 +1,6 @@
-- This Happy file was machine-generated by the BNF converter -- This Happy file was machine-generated by the BNF converter
{ {
{-# OPTIONS -fno-warn-incomplete-patterns -fno-warn-overlapping-patterns #-}
module Transfer.Core.Par where module Transfer.Core.Par where
import Transfer.Core.Abs import Transfer.Core.Abs
import Transfer.Core.Lex import Transfer.Core.Lex

3
src/Transfer/Syntax/Abs.hs
View File

@@ -342,7 +342,7 @@ johnMajorEq _ _ = False
instance Ord (Tree c) where instance Ord (Tree c) where
compare x y = compare (index x) (index y) `mappend` compareSame x y compare x y = compare (index x) (index y) `mappend` compareSame x y
where index :: Tree c -> Int
index (Module _ _) = 0 index (Module _ _) = 0
index (Import _) = 1 index (Import _) = 1
index (DataDecl _ _ _) = 2 index (DataDecl _ _ _) = 2
@@ -412,6 +412,7 @@ instance Ord (Tree c) where
index (FieldType _ _) = 66 index (FieldType _ _) = 66
index (FieldValue _ _) = 67 index (FieldValue _ _) = 67
index (Ident _) = 68 index (Ident _) = 68
compareSame :: Tree c -> Tree c -> Ordering
compareSame (Module imports decls) (Module imports_ decls_) = mappend (compare imports imports_) (compare decls decls_) compareSame (Module imports decls) (Module imports_ decls_) = mappend (compare imports imports_) (compare decls decls_)
compareSame (Import i) (Import i_) = compare i i_ compareSame (Import i) (Import i_) = compare i i_
compareSame (DataDecl i exp consdecls) (DataDecl i_ exp_ consdecls_) = mappend (compare i i_) (mappend (compare exp exp_) (compare consdecls consdecls_)) compareSame (DataDecl i exp consdecls) (DataDecl i_ exp_ consdecls_) = mappend (compare i i_) (mappend (compare exp exp_) (compare consdecls consdecls_))

13
src/Transfer/Syntax/Lex.hs
View File

@@ -1,8 +1,8 @@
{-# OPTIONS -fglasgow-exts -cpp #-} {-# OPTIONS -fglasgow-exts -cpp #-}
{-# LINE 3 "Transfer/Syntax/Lex.x" #-} {-# LINE 3 "Transfer/Syntax/Lex.x" #-}
{-# OPTIONS -fno-warn-incomplete-patterns #-}
module Transfer.Syntax.Lex where module Transfer.Syntax.Lex where
import Transfer.ErrM
#if __GLASGOW_HASKELL__ >= 603 #if __GLASGOW_HASKELL__ >= 603
@@ -155,18 +155,9 @@ alex_action_7 = tok (\p s -> PT p (TD $ share s))
-- ----------------------------------------------------------------------------- -- -----------------------------------------------------------------------------
-- INTERNALS and main scanner engine -- INTERNALS and main scanner engine
{-# LINE 35 "GenericTemplate.hs" #-} {-# LINE 35 "GenericTemplate.hs" #-}
{-# LINE 45 "GenericTemplate.hs" #-}
data AlexAddr = AlexA# Addr# data AlexAddr = AlexA# Addr#

2
src/Transfer/Syntax/Lex.x
View File

@@ -1,9 +1,9 @@
-- -*- haskell -*- -- -*- haskell -*-
-- This Alex file was machine-generated by the BNF converter -- This Alex file was machine-generated by the BNF converter
{ {
{-# OPTIONS -fno-warn-incomplete-patterns #-}
module Transfer.Syntax.Lex where module Transfer.Syntax.Lex where
import Transfer.ErrM
} }

22
src/Transfer/Syntax/Par.hs
View File

@@ -1,4 +1,5 @@
{-# OPTIONS -fglasgow-exts -cpp #-} {-# OPTIONS -fglasgow-exts -cpp #-}
{-# OPTIONS -fno-warn-incomplete-patterns -fno-warn-overlapping-patterns #-}
module Transfer.Syntax.Par where module Transfer.Syntax.Par where
import Transfer.Syntax.Abs import Transfer.Syntax.Abs
import Transfer.Syntax.Lex import Transfer.Syntax.Lex
@@ -1576,7 +1577,6 @@ myLexer = tokens
{-# LINE 1 "GenericTemplate.hs" #-} {-# LINE 1 "GenericTemplate.hs" #-}
-- $Id$ -- $Id$
{-# LINE 28 "GenericTemplate.hs" #-} {-# LINE 28 "GenericTemplate.hs" #-}
@@ -1586,20 +1586,11 @@ data Happy_IntList = HappyCons Int# Happy_IntList
{-# LINE 49 "GenericTemplate.hs" #-} {-# LINE 49 "GenericTemplate.hs" #-}
{-# LINE 59 "GenericTemplate.hs" #-} {-# LINE 59 "GenericTemplate.hs" #-}
{-# LINE 68 "GenericTemplate.hs" #-}
infixr 9 `HappyStk` infixr 9 `HappyStk`
data HappyStk a = HappyStk a (HappyStk a) data HappyStk a = HappyStk a (HappyStk a)
@@ -1651,14 +1642,7 @@ happyDoAction i tk st
action | check = indexShortOffAddr happyTable off_i action | check = indexShortOffAddr happyTable off_i
| otherwise = indexShortOffAddr happyDefActions st | otherwise = indexShortOffAddr happyDefActions st
{-# LINE 127 "GenericTemplate.hs" #-}
indexShortOffAddr (HappyA# arr) off = indexShortOffAddr (HappyA# arr) off =

1
src/Transfer/Syntax/Par.y
View File

@@ -1,5 +1,6 @@
-- This Happy file was machine-generated by the BNF converter -- This Happy file was machine-generated by the BNF converter
{ {
{-# OPTIONS -fno-warn-incomplete-patterns -fno-warn-overlapping-patterns #-}
module Transfer.Syntax.Par where module Transfer.Syntax.Par where
import Transfer.Syntax.Abs import Transfer.Syntax.Abs
import Transfer.Syntax.Lex import Transfer.Syntax.Lex