[Pingus-CVS] r3956 - trunk/sexpr

[grumbel at BerliOS]

Author: grumbel
Date: 2009-02-06 16:10:16 +0100 (Fri, 06 Feb 2009)
New Revision: 3956

Modified:
   trunk/sexpr/input-syntax.scm
   trunk/sexpr/parser.rb
Log:
Minor cleanup

Modified: trunk/sexpr/input-syntax.scm
===================================================================
--- trunk/sexpr/input-syntax.scm        2009-01-23 14:37:01 UTC (rev 3955)
+++ trunk/sexpr/input-syntax.scm        2009-02-06 15:10:16 UTC (rev 3956)
@@ -4,27 +4,27 @@
   (use  "required")
   (type (mapping
          (children
-          (element (name "standard-keyboard")  (type (any)))
-          (element (name "standard-pointer")   (type (any)))
-          (element (name "standard-scroller")  (type (any)))
-          (element (name "primary-button")     (type (any)))
-          (element (name "secondary-button")   (type (any)))
-          (element (name "pause-button")       (type (any)))
+          (element (name "standard-keyboard")   (type (any)))
+          (element (name "standard-pointer")    (type (any)))
+          (element (name "standard-scroller")   (type (any)))
+          (element (name "primary-button")      (type (any)))
+          (element (name "secondary-button")    (type (any)))
+          (element (name "pause-button")        (type (any)))
           (element (name "fast-forward-button") (type (any)))
-          (element (name "armageddon-button") (type (any)))
-          (element (name "escape-button") (type (any)))
-          (element (name "action-up-button")   (type (any)))
-          (element (name "action-down-button") (type (any)))
-          (element (name "action-1-button")    (type (any)))
-          (element (name "action-2-button")    (type (any)))
-          (element (name "action-3-button")    (type (any)))
-          (element (name "action-4-button")    (type (any)))
-          (element (name "action-5-button")    (type (any)))
-          (element (name "action-6-button")    (type (any)))
-          (element (name "action-7-button")    (type (any)))
-          (element (name "action-8-button")    (type (any)))
-          (element (name "action-9-button")    (type (any)))
-          (element (name "action-10-button")   (type (any)))
+          (element (name "armageddon-button")   (type (any)))
+          (element (name "escape-button")       (type (any)))
+          (element (name "action-up-button")    (type (any)))
+          (element (name "action-down-button")  (type (any)))
+          (element (name "action-1-button")     (type (any)))
+          (element (name "action-2-button")     (type (any)))
+          (element (name "action-3-button")     (type (any)))
+          (element (name "action-4-button")     (type (any)))
+          (element (name "action-5-button")     (type (any)))
+          (element (name "action-6-button")     (type (any)))
+          (element (name "action-7-button")     (type (any)))
+          (element (name "action-8-button")     (type (any)))
+          (element (name "action-9-button")     (type (any)))
+          (element (name "action-10-button")    (type (any)))
           ))))
 
 ;; EOF ;;

Modified: trunk/sexpr/parser.rb
===================================================================
--- trunk/sexpr/parser.rb       2009-01-23 14:37:01 UTC (rev 3955)
+++ trunk/sexpr/parser.rb       2009-02-06 15:10:16 UTC (rev 3956)
@@ -25,7 +25,7 @@
     end
 
     def is_letter(c)
-      return((?a..?z).member?(c) or (?A..?Z).member?(c))
+      return (?a..?z).member?(c) or (?A..?Z).member?(c)
     end
 
     def is_whitespace(c)
@@ -33,32 +33,15 @@
     end
 
     def is_special_initial(c)
-      return(c == ?! or
-             c == ?$ or 
-             c == ?% or 
-             c == ?& or 
-             c == ?* or 
-             c == ?/ or 
-             c == ?: or 
-             c == ?< or 
-             c == ?= or 
-             c == ?> or 
-             c == ?? or 
-             c == ?^ or 
-             c == ?_ or 
-             c == ?~)
+      return [?!, ?$, ?%, ?&, ?*, ?/, ?:, ?<, ?=, ?>, ??, ?^, ?_, 
?~].member?(c)
     end
 
     def is_special_subsequent(c)
-      return(c == ?+ or
-             c == ?- or
-             c == ?. or
-             c == ?@)
+      return [?+, ?-, ?., address@hidden(c)
     end
 
     def is_sign(c)
-      return(c == ?+ or
-             c == ?-)
+      return [?+, ?-].member?(c)
     end
     
     def initialize(str, parse_comments = false, parse_whitespace = false)
@@ -68,7 +51,6 @@
     end
 
     def parse()
-      @state = :look_for_token
       tokenize()
 
       elements = []
@@ -106,6 +88,8 @@
     end
 
     def tokenize()
+      @state = :look_for_token
+
       @line   = 1
       @column = 1
 
@@ -201,7 +185,6 @@
           end
         
       when :parse_string:
-          # FIXME: "foo\\" will be parsed incorrectly
           if (c == ?" and @last_c != ?\\) then
             submit(:string, true)
           end