[Gtk2hs-commit] (main branch): add mstring type to the callbackgen syntax

[Andy S. <And...@co...>]

diffing dir...
Fri Sep  3 20:32:40 EDT 2010  Daniel Ehlers <dan...@mi...>
  * add mstring type to the callbackgen syntax
  Ignore-this: 941e7298bc573653b113ac1164021f66
  
  With the maybePeekUTFString function we have the ability to marshal strings
  which could be Null, know we are also able to use this new functionality
  in the callback generation lists. 
    {
    hunk ./tools/callbackGen/HookGenerator.hs 29
    +       | Tmstring      [_$_]
    hunk ./tools/callbackGen/HookGenerator.hs 102
    +scan ('M':'S':'T':'R':'I':'N':'G':xs) = TokType Tmstring:scan xs
    hunk ./tools/callbackGen/HookGenerator.hs 143
    +identifier Tmstring = ss "MSTRING"
    hunk ./tools/callbackGen/HookGenerator.hs 168
    +rawtype Tmstring  = ss "CString"
    hunk ./tools/callbackGen/HookGenerator.hs 194
    +rawtype Tmstring  = ss "CString"
    hunk ./tools/callbackGen/HookGenerator.hs 219
    +usertype Tmstring  (c:cs) = (ss "Maybe String",cs)
    hunk ./tools/callbackGen/HookGenerator.hs 280
    +nameArg Tmstring c = ss "str".shows c
    hunk ./tools/callbackGen/HookGenerator.hs 308
    +marshExec Tmstring arg _ body = indent 5. ss "maybePeekUTFString ". arg. ss " >>= \\". arg. ss "\' ->".
    +                               body. sc ' '. arg. sc '\''
    hunk ./tools/callbackGen/HookGenerator.hs 364
    +marshExec Tmstring n = indent 4.ss "str".shows n.
    +		      ss "' <- maybePeekCString str".shows n
    hunk ./tools/callbackGen/Signal.chs.template 49
    -import System.Glib.UTFString   (peekUTFString)
    +import System.Glib.UTFString   (peekUTFString,maybePeekUTFString)
    }