Changeset 13048

Timestamp:

09/05/06 21:56:10 (2 years ago)

Author:

Sage

Message:

The translator will now accept multiple modifiers after one -, so -VR and similar are valid. In addition, -O is now used for heavy object-oriented translation (but -Oo is still useable.
In addition, I found a stupid little error in ASTParser that I fixed (just some bad indentation, not sure how that got there).

Location:

misc/pX/Common/P5_to_P6_Translation

Files:

• ASTParser.hs (modified) (1 diff)
• ASTTranslate-sage.hs (modified) (1 diff)

misc/pX/Common/P5_to_P6_Translation/ASTParser.hs

@@ -186 +186 @@
 printTree outFile (AbstractNode atype []) options      = if (and [(atype=="UnknownAbs"),('u' `elem` options)]) then do{ hPutStr outFile "UnknownAbs"; putStrLn "UNKNOWN: UnknownAbs"; hPutStr outFile ""} else (hPutStr outFile "")
 printTree outFile (AbstractNode atype kids) options    = if (and [(atype=="UnknownAbs"),('u' `elem` options)]) then do{ hPutStr outFile "UnknownAbs"; putStrLn "UNKNOWN: UnknownAbs"; printTree outFile (head kids) options; printTree outFile (AbstractNode "P5AST" (tail kids)) options} else do{ printTree outFile (head kids) options; printTree outFile (AbstractNode "P5AST" (tail kids)) options}
-printTree outFile (Heredoc doc start end kids) options = do printTree outFile start options
-    hPutStr outFile ";\n"
-    printTree outFile (AbstractNode "P5AST" kids) options
-    printTree outFile end options
+printTree outFile (Heredoc doc start end kids) options = do{ printTree outFile start options;
+    hPutStr outFile "\n";
+    printTree outFile (AbstractNode "P5AST" kids) options;
+    printTree outFile end options}
 

misc/pX/Common/P5_to_P6_Translation/ASTTranslate-sage.hs

@@ -884 +884 @@
 getModifiers :: [String] -> String
 getModifiers []   = " "
-getModifiers args = case (head args) of
-    "-Oo"    ->  ('o':(getModifiers (drop 1 args)))
-    "-V"     ->  ('v':(getModifiers (drop 1 args)))
-    "-U"     ->  ('u':(getModifiers (drop 1 args)))
-    "-R"     ->  ('r':(getModifiers (drop 1 args)))
-    "-N"     ->  ('n':(getModifiers (drop 1 args)))
-    "-S"     ->  ('s':(getModifiers (drop 1 args)))
-    _        ->  (' ':(getModifiers (drop 1 args)))
+getModifiers args = if ((head (head args))=='-') then (multiMods (head args))++(getModifiers (drop 1 args)) else (getModifiers (drop 1 args))
+
+multiMods :: String -> String
+multiMods [] = " "
+multiMods mods = case (head mods) of
+    'O'    -> 'o':(multiMods (tail mods))
+    'U'    -> 'u':(multiMods (tail mods))
+    'V'    -> 'v':(multiMods (tail mods))
+    'S'    -> 's':(multiMods (tail mods))
+    'R'    -> 'r':(multiMods (tail mods))
+    'N'    -> 'n':(multiMods (tail mods))