Changeset 3953 for to-imperative/trunk/java/refal/refal/plus/XML.rf

Timestamp:

Oct 2, 2008, 6:13:11 PM (12 years ago)

Author:

yura

Message:

• Expr.concat(Comparable, Expr) checks if term in array of expr and before it.
• XML parsing.

File:

• to-imperative/trunk/java/refal/refal/plus/XML.rf (modified) (2 diffs)

to-imperative/trunk/java/refal/refal/plus/XML.rf

@@ -2 +2 @@
 
 $use Convert Stream  StdIO;
+
+$func? GetComment s.stream = e.comment;
+
+GetComment s.stream,
+  <Scans s.stream '<!--'> : '<!--' =
+  <Get_Delims s.stream '-->'> : e.comment '-->',
+  '<!--' e.comment '-->';
+
+
+$func? GetCDATA s.stream = e.cdata;
+
+GetCDATA s.stream,
+  <Scans s.stream '<![CDATA['> : '<![CDATA[' =
+  <Get_Delims s.stream ']]>'> : e.cdata ']]>',
+  '<![CDATA[' e.cdata ']]>';
+
 
 $func? GetTag s.stream = e.text (e.tag);
@@ -7 +23 @@
 GetTag s.stream =
   <Get_Delim s.stream '<'> : e.text '<',
-  <Get_Delim s.stream '>'> : e.tag '>',
-  e.text ('<' e.tag '>');
+  <Ungets s.stream '<'>, {
+    e.text ((COMMENT) <GetComment s.stream>) <GetTag s.stream>;
+    e.text ((CDATA) <GetCDATA s.stream>) <GetTag s.stream>;
+    e.text (<Get_Delim s.stream '>'>);
+  };
 
-$func ReadTag s.stream e.tag = t;
+$func SplitName e = (e) e;
+
+SplitName {
+  e.name ' ' e.attrs = (e.name) e.attrs; 
+  e.name = (e.name); 
+};
+
+$func? ReadTag s.stream e.tag = t;
 
 ReadTag s.stream e.tag, e.tag : {
   '<' e.name '/>' =
-    (<ToWord e.name>);
+    <SplitName e.name> :: (e.name) e.attrs, 
+    (<ToWord e.name> <ToWord e.attrs>);
   '<' e.name '>' =
+    <SplitName e.name> :: (e.name) e.attrs,
     <GetTag s.stream> $iter e.text <ReadTag s.stream e.tag> <GetTag s.stream> :: e.text (e.tag),
     e.tag : '</' e.name '>',
-    (<ToWord e.name> e.text);
+    (<ToWord e.name> <ToWord e.attrs> e.text);
 };
 
-$public $func Read s = t;
+$public $func? Read s = e;
 
-Read s.stream = <GetTag s.stream> : (e.tag), <ReadTag s.stream e.tag>;
+Read s.stream = <GetTag s.stream> : e.text (e.tag), e.text <ReadTag s.stream e.tag>;
 
 $func Main = e;
 
 Main =
-  <WriteLn <Read <Expr_Open '<Z>as<C/><B>b<Z></Z></B><C>c</C></Z>'>>>;
+  <WriteLn <Read <Expr_Open '<Z>as<C/><B>b<!--<Z></Z>--></B><C>c</C></Z>'>>>;