Changeset 4114

Show
Ignore:
Timestamp:
05/29/05 19:30:00 (4 years ago)
Author:
autrijus
svk:copy_cache_prev:
5706
Message:

* global named rules should use <*foo in the global pad,

not <foo.

Location:
src/Pugs
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • src/Pugs/Parser.hs

    r4065 r4114  
    244244    ch      <- char '{' 
    245245    expr    <- rxLiteralAny adverbs $ balancedDelim ch 
    246     let exp = Syn ":=" [Var ('<':name), Syn "rx" [expr, adverbs]] 
    247     unsafeEvalExp (Sym SGlobal ('<':name) exp) 
     246    let exp = Syn ":=" [Var ('<':'*':name), Syn "rx" [expr, adverbs]] 
     247    unsafeEvalExp (Sym SGlobal ('<':'*':name) exp) 
    248248    return emptyExp 
    249249 
  • src/Pugs/Prim/Match.hs

    r4072 r4114  
    2222    let pwd = if hasSrc then pwd2 else pwd1 
    2323    glob    <- askGlobal 
    24     let syms = [ (name, tvar) | (('<':name), [(_, tvar)]) <- padToList glob ] 
     24    let syms = [ (name, tvar) | (('<':'*':name), [(_, tvar)]) <- padToList glob ] 
    2525    subrules <- forM syms $ \(name, tvar) -> do 
    2626        ref  <- liftSTM $ readTVar tvar