Changeset 10603 for lang/actionscript

Timestamp:

04/27/08 23:38:22 (5 years ago)

Author:

gyuque

Message:

grammar auto converter(now in progress...)

Location:

lang/actionscript/ascss/src/css

Files:

• convert-y.rb (modified) (7 diffs)
• parse-y.rb (modified) (10 diffs)

lang/actionscript/ascss/src/css/convert-y.rb

@@ -2 +2 @@
 
 class LexPattern
-        def initialize(c, rx, name)
+        def initialize(c, rx, name, back)
+                @back = back
                 @chkey = c
                 @rx = rx
@@ -8 +9 @@
         end
 
+        attr_reader :back
         attr_reader :chkey
         attr_reader :rx
@@ -53 +55 @@
                 LX('p', "preprocessor",  /\A\##{nm_start}#{nm_chars}/)
                 LX('d', "decimal",       /\A#{digits}+/)
-                LX('t', "static_cast",   /\Astatic_cast/)
-                LX('D', "delete",        /\Adelete/)
+                LX('P', "primitive_type",/\A(int|short)[^a-zA-Z0-9_]/, 1)
+                LX('t', "static_cast",   /\Astatic_cast[^a-zA-Z0-9_]/, 1)
+                LX('D', "delete",        /\Adelete[^a-zA-Z0-9_]/, 1)
                 LX('i', "ident",         /\A#{nm_start}#{nm_chars}/)
                 LX('v', "y_variable",    /\A\$[1-9$]/)
@@ -64 +67 @@
         end
 
-        def LX(c, name, rx)
+        def LX(c, name, rx, back = 0)
                 if c != nil
                         raise "duplicated char key '#{c}'" if @chmap.key?(c)
@@ -71 +74 @@
                 end
 
-                @patterns << LexPattern.new(c, rx, name)
+                @patterns << LexPattern.new(c, rx, name, back)
         end
 
@@ -77 +80 @@
                 @patterns.each{|ptn|
                         if @current =~ ptn.rx
-                                tokbody = $&
+                                tokbody = $&[0, $&.length - ptn.back]
                                 @current = @current[tokbody.length, @current.length]
 
@@ -92 +95 @@
                         @patterns.each{|ptn|
                                 if s =~ ptn.rx
-                                        tokbody = $&
+                                        tokbody = $&[0, $&.length - ptn.back]
                                         s = s[tokbody.length, s.length]
 

lang/actionscript/ascss/src/css/parse-y.rb

@@ -30 +30 @@
         end
 
+        def inject_toks(tks)
+                tks.each{|t| @consumed_toks << t}
+        end
+
         def stop_save
                 @dont_save = true
@@ -53 +57 @@
                 return false if empty?
 
-                if @keystr =~ /^(S) *\{[ Li;*n<>]*\}/
+                if @keystr =~ /^(S) *\{[ Li;*n<>P]*\}/
                 # %union { ... }
                         consume($&.length)
@@ -68 +72 @@
                         consume($&.length)
                 else
+                        10.times do |i|
+                        STDERR.print @toks[i].body
+                        end
+
                         raise "bad token"
                 end
@@ -90 +98 @@
 
 TYPE_MAP = {
-        "PseudoType" => "int"
+        "PseudoType" => "int",
+        "Function"   => "ParseFunction",
+        "CSSParser"  => "ASCSSParser"
 }
 
@@ -141 +151 @@
                                 stop_save
                                 consume(1)
-                                process_program_block
+                                inject_toks( process_program_block )
                                 start_save
                         elsif @keystr =~ /^[;|]/
@@ -169 +179 @@
 
         def convert_code(toks)
-                toks = filt_code(toks, /^D i(ai)? ?;/, "commentout_deleteop")
-                toks = change_variable_declaration_nstype(toks)
-                toks = change_variable_declaration(toks)
-                toks = change_arrow_to_dot(toks)
-                toks = change_namespace_to_class(toks)
-                puts toks.map{|t| t.body}.join('')
+                toks = filt_code(toks, /^(v ?= ?)d/,       "change_zeronull")
+                toks = filt_code(toks, /^t<(i\*?)>\(i(\.i)?\)/,"change_static_cast")
+                toks = filt_code(toks, /^D i(ai)? ?;/,   "commentout_deleteop")
+                toks = filt_code(toks, /^(ini ?)i ?=/,   "change_variable_declaration_nstype")
+                toks = filt_code(toks, /^(i ?\* ?)i ?=/, "change_variable_declaration")
+                toks = filt_code(toks, /^P i ?=/,        "change_p_variable_declaration")
+                toks = filt_arrow_to_dot(toks)
+                toks = filt_code(toks, /^ini/,           "change_namespace_to_class")
+
+                toks
         end
 
@@ -182 +196 @@
                 loop do
                         if keys =~ ptn
-                                keys = self.__send__(handler_name, ret, toks, keys, Regexp.last_match)
-                        else
-                                ret << toks.shift
-                                keys = keys[1,keys.length]
-                        end
+                                nextkey = self.__send__(handler_name, ret, toks, keys, Regexp.last_match)
+                                if nextkey != nil
+                                        keys = nextkey
+                                        next
+                                end
+                        end
+                        
+                        ret << toks.shift
+                        keys = keys[1,keys.length]
+
                         break if keys.length < 1
                 end
@@ -193 +212 @@
         end
 
+        def change_zeronull(outtoks, intoks, keys, match)
+                
+
+                tokcount = match[0].length
+                pvarname = intoks[0].body
+                val      = intoks[match[1].length].body
+
+                return nil if pvarname != '$$' || val != '0'
+
+                new_toks = generate_token("#{pvarname} = null /* 0 */")
+
+                keys = keys[tokcount,keys.length]
+                tokcount.times do
+                        intoks.shift
+                end
+
+                new_toks.each{|t| outtoks << t}
+
+                return keys
+        end
+
+        def change_static_cast(outtoks, intoks, keys, match)
+                tokcount = match[0].length
+
+                casttype = intoks[2].body
+                varname  = intoks[match[1].length+4].body
+
+                cmt = ""
+                if TYPE_MAP.key?(casttype)
+                        cmt = " /* original: #{casttype} */"
+                        casttype = TYPE_MAP[casttype]
+                end
+
+                new_toks = generate_token("(#{varname} as #{casttype}#{cmt})")
+
+                keys = keys[tokcount,keys.length]
+                tokcount.times do
+                        intoks.shift
+                end
+
+                new_toks.each{|t| outtoks << t}
+
+                return keys
+        end
+
         def commentout_deleteop(outtoks, intoks, keys, match)
                 tokcount = match[0].length
@@ -208 +272 @@
         end
 
-        def change_variable_declaration_nstype(toks)
-                ret = []
-                keys = make_tokkey_string(toks)
-
-                loop do
-                        if keys =~ /^(ini ?)i ?=/
-                                tokcount = $&.length
-
-                                vartype = toks[2].body
-                                varname = toks[$1.length].body
-
-                                cmt = ""
-                                if TYPE_MAP.key?(vartype)
-                                        cmt = "/* typedefed #{vartype} */ "
-                                        vartype = TYPE_MAP[vartype]
-                                end
-
-                                new_toks = generate_token("var #{varname}:#{vartype} #{cmt}=")
-
-                                keys = keys[tokcount,keys.length]
-                                tokcount.times do
-                                        toks.shift
-                                end
-
-                                new_toks.each{|t| ret << t}
-                        else
-                                ret << toks.shift
-                                keys = keys[1,keys.length]
-                        end
-                        break if keys.length < 1
-                end
-
-                ret
-        end
-
-        def change_variable_declaration(toks)
-                ret = []
-                keys = make_tokkey_string(toks)
-
-                loop do
-                        if keys =~ /^(i ?\* ?)i ?=/
-                                tokcount = $&.length
-
-                                vartype = toks[0].body
-                                varname = toks[$1.length].body
-                                new_toks = generate_token("var #{varname}:#{vartype} =")
-
-                                keys = keys[tokcount,keys.length]
-                                tokcount.times do
-                                        toks.shift
-                                end
-
-                                new_toks.each{|t| ret << t}
-                        else
-                                ret << toks.shift
-                                keys = keys[1,keys.length]
-                        end
-                        break if keys.length < 1
-                end
-
-                ret
-        end
-
-        def change_arrow_to_dot(toks)
+        def change_variable_declaration_nstype(outtoks, intoks, keys, match)
+                tokcount = match[0].length
+
+                vartype = intoks[2].body
+                varname = intoks[match[1].length].body
+
+                cmt = ""
+                if TYPE_MAP.key?(vartype)
+                        cmt = "/* original: #{vartype} */ "
+                        vartype = TYPE_MAP[vartype]
+                end
+
+                new_toks = generate_token("var #{varname}:#{vartype} #{cmt}=")
+
+                keys = keys[tokcount,keys.length]
+                tokcount.times do
+                        intoks.shift
+                end
+
+                new_toks.each{|t| outtoks << t}
+
+                return keys
+        end
+
+        def change_variable_declaration(outtoks, intoks, keys, match)
+                tokcount = match[0].length
+
+                vartype = intoks[0].body
+                varname = intoks[match[1].length].body
+
+                cmt = ""
+                if TYPE_MAP.key?(vartype)
+                        cmt = "/* original: #{vartype} */ "
+                        vartype = TYPE_MAP[vartype]
+                end
+
+                new_toks = generate_token("var #{varname}:#{vartype} #{cmt}=")
+
+                keys = keys[tokcount,keys.length]
+                tokcount.times do
+                        intoks.shift
+                end
+
+                new_toks.each{|t| outtoks << t}
+
+                return keys
+        end
+
+        def change_p_variable_declaration(outtoks, intoks, keys, match)
+                tokcount = match[0].length
+
+                vartype = intoks[0].body
+                varname = intoks[2].body
+
+                new_toks = generate_token("var #{varname}:#{vartype} =")
+
+                keys = keys[tokcount,keys.length]
+                tokcount.times do
+                        intoks.shift
+                end
+
+                new_toks.each{|t| outtoks << t}
+
+                return keys
+        end
+
+        def filt_arrow_to_dot(toks)
                 toks.map{|t| (t.name == "arrow") ? Token.new(nil, '.', "single_char") : t }
         end
 
-        def change_namespace_to_class(toks)
-                ret = []
-
-                keys = make_tokkey_string(toks)
-                loop do
-                        if keys =~ /^ini/
-                                ret << toks.shift
-
-                                ret << Token.new(nil, '.', "single_char")
-                                toks.shift # ignore '::'
-
-                                ret << toks.shift
-                                keys = keys[3,keys.length]
-                        else
-                                ret << toks.shift
-                                keys = keys[1,keys.length]
-                        end
-
-                        break if keys.length < 1
-                end
-
-                ret
+        def change_namespace_to_class(outtoks, intoks, keys, match)
+                outtoks << intoks.shift
+
+                outtoks << Token.new(nil, '.', "single_char")
+                intoks.shift # ignore '::'
+
+                outtoks << intoks.shift
+
+                return keys[3,keys.length]
         end
 end
@@ -317 +371 @@
         end
 
-        # puts psr.processed_src
-end
-
-
+        puts psr.processed_src
+end
+
+