rename node Entity to Html

fperrad · Mar 30, 2009 · b6b8c83 · b6b8c83
1 parent 10c470f
commit b6b8c83
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/Compiler.pir b/src/Compiler.pir
@@ -514,11 +514,11 @@ Return generated HTML for all of its children.
     .return (code)
 .end
 
-=item html(Markdown::Entity node)
+=item html(Markdown::Html node)
 
 =cut
 
-.sub 'html' :method :multi(_, ['Markdown'; 'Entity'])
+.sub 'html' :method :multi(_, ['Markdown'; 'Html'])
     .param pmc node
     $S0 = node.'text'()
     $I0 = node.'detab'()

diff --git a/src/Node.pir b/src/Node.pir
@@ -23,8 +23,8 @@ for Markdown.
     p6meta.'new_class'('Markdown::Document', 'parent'=>base)
     p6meta.'new_class'('Markdown::Emphasis', 'parent'=>base)
     p6meta.'new_class'('Markdown::Email', 'parent'=>base)
-    p6meta.'new_class'('Markdown::Entity', 'parent'=>base)
     p6meta.'new_class'('Markdown::HorizontalRule', 'parent'=>base)
+    p6meta.'new_class'('Markdown::Html', 'parent'=>base)
     p6meta.'new_class'('Markdown::ItemizedList', 'parent'=>base)
     p6meta.'new_class'('Markdown::Line', 'parent'=>base)
     p6meta.'new_class'('Markdown::Link', 'parent'=>base)

diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -369,20 +369,20 @@ method RawHtml($/, $key) {
 }
 
 method HtmlComment($/) {
-    make Markdown::Entity.new( :text( $/.text() ),
-                               :detab( 1 ) );
+    make Markdown::Html.new( :text( $/.text() ),
+                             :detab( 1 ) );
 }
 
 method HtmlTag($/) {
-    make Markdown::Entity.new( :text( $/.text() ) );
+    make Markdown::Html.new( :text( $/.text() ) );
 }
 
 method EscapedChar($/) {
     make Markdown::Word.new( :text( $/[0].text() ) );
 }
 
 method Entity($/) {
-    make Markdown::Entity.new( :text( $/.text() ) );
+    make Markdown::Html.new( :text( $/.text() ) );
 }
 
 method Symbol($/) {
@@ -410,7 +410,7 @@ method Apostrophe($/) {
         make Markdown::Word.new( :text( $/.text() ) );
 #    }
 #    else {
-#        make Markdown::Entity.new( :text( '&rsquo;' ) );
+#        make Markdown::Html.new( :text( '&rsquo;' ) );
 #    }
 }
 
@@ -419,7 +419,7 @@ method Ellipsis($/) {
         make Markdown::Word.new( :text( $/.text() ) );
     }
     else {
-        make Markdown::Entity.new( :text( '&hellip;' ) );
+        make Markdown::Html.new( :text( '&hellip;' ) );
     }
 }
 
@@ -432,7 +432,7 @@ method EnDash($/) {
         make Markdown::Word.new( :text( $/.text() ) );
 #    }
 #    else {
-#        make Markdown::Entity.new( :text( '&ndash;' ) );
+#        make Markdown::Html.new( :text( '&ndash;' ) );
 #    }
 }
 
@@ -441,7 +441,7 @@ method EmDash($/) {
         make Markdown::Word.new( :text( $/.text() ) );
     }
     else {
-        make Markdown::Entity.new( :text( '&mdash;' ) );
+        make Markdown::Html.new( :text( '&mdash;' ) );
     }
 }