wip

ext/pty/pty.c

@@ -258,7 +258,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
 
 #if (defined(HAVE_POSIX_OPENPT) || defined(HAVE_PTSNAME)) && !defined(HAVE_PTSNAME_R)
 /* glibc only, not obsolete interface on Tru64 or HP-UX */
-static int
+int
 ptsname_r(int fd, char *buf, size_t buflen)
 {
     extern char *ptsname(int);

ext/ripper/tools/preproc.rb

@@ -3,6 +3,8 @@
 
 require 'optparse'
 
+RIPPER_CODE_PATTERN = %r</\*% *ripper(?:\[(.*?)\])?: *(.*?) *%\*/>
+
 def main
   output = nil
   template = nil
@@ -51,13 +53,18 @@ def process(f, out, path, template)
   usercode f, out, path, template
 end
 
+require_relative "dsl"
+
 def prelude(f, out)
   @exprs = {}
   while line = f.gets
     case line
     when /\A%%/
       out << "%%\n"
       return
+    when RIPPER_CODE_PATTERN # %rule may contain /*% ripper: ... %*/ DSL
+      out << DSL.new($2, ($1 || "").split(",")).generate << "\n"
+      next
     else
       if (/^enum lex_state_(?:bits|e) \{/ =~ line)..(/^\}/ =~ line)
         case line
@@ -74,12 +81,10 @@ def prelude(f, out)
   end
 end
 
-require_relative "dsl"
-
 def grammar(f, out)
   while line = f.gets
     case line
-    when %r</\*% *ripper(?:\[(.*?)\])?: *(.*?) *%\*/>
+    when RIPPER_CODE_PATTERN
       out << DSL.new($2, ($1 || "").split(",")).generate << "\n"
     when %r</\*%%%\*/>
       out << "#if 0\n"