Parser: Analyze and transform ActionView helpers

Author: marcoroth

.clang-format-ignore

@@ -8,5 +8,6 @@ src/errors.c
 src/include/ast_nodes.h
 src/include/ast_pretty_print.h
 src/include/errors.h
+src/include/util/hb_foreach.h
 src/parser_match_tags.c
 src/visitor.c

Makefile

@@ -1,8 +1,8 @@
 exec = herb
 test_exec = run_herb_tests
 
-sources = $(wildcard src/*.c) $(wildcard src/**/*.c)
-headers = $(wildcard src/*.h) $(wildcard src/**/*.h)
+sources = $(shell find src -name '*.c')
+headers = $(shell find src -name '*.h')
 objects = $(sources:.c=.o)
 
 extension_sources = $(wildcard ext/**/*.c)

config.yml

@@ -426,13 +426,19 @@ nodes:
         - name: tag_name
           type: token
 
+    - name: HTMLVirtualCloseTagNode
+      fields:
+        - name: tag_name
+          type: token
+
     - name: HTMLElementNode
       fields:
         - name: open_tag
           type: node
           kind:
             - HTMLOpenTagNode
             - HTMLConditionalOpenTagNode
+            - ERBOpenTagNode
 
         - name: tag_name
           type: token
@@ -446,6 +452,7 @@ nodes:
           kind:
             - HTMLCloseTagNode
             - HTMLOmittedCloseTagNode
+            - HTMLVirtualCloseTagNode
 
         - name: is_void
           type: boolean
@@ -526,6 +533,37 @@ nodes:
           type: node
           kind: HTMLAttributeValueNode
 
+    - name: RubyLiteralNode
+      fields:
+        - name: content
+          type: string
+
+    - name: RubyHTMLAttributesSplatNode
+      fields:
+        - name: content
+          type: string
+
+        - name: prefix
+          type: string
+
+    - name: ERBOpenTagNode
+      fields:
+        - name: tag_opening
+          type: token
+
+        - name: content
+          type: token
+
+        - name: tag_closing
+          type: token
+
+        - name: tag_name
+          type: token
+
+        - name: children
+          type: array
+          kind: Node
+
     - name: HTMLTextNode
       fields:
         - name: content

ext/herb/extconf.rb

@@ -12,6 +12,7 @@
 
 $VPATH << "$(srcdir)/../../src"
 $VPATH << "$(srcdir)/../../src/analyze"
+$VPATH << "$(srcdir)/../../src/analyze/action_view"
 $VPATH << "$(srcdir)/../../src/util"
 $VPATH << prism_src_path
 $VPATH << "#{prism_src_path}/util"

ext/herb/extension.c

@@ -130,6 +130,12 @@ static VALUE Herb_parse(int argc, VALUE* argv, VALUE self) {
     if (NIL_P(strict)) { strict = rb_hash_lookup(options, ID2SYM(rb_intern("strict"))); }
     if (!NIL_P(strict)) { parser_options.strict = RTEST(strict); }
 
+    VALUE action_view_helpers = rb_hash_lookup(options, rb_utf8_str_new_cstr("action_view_helpers"));
+    if (NIL_P(action_view_helpers)) {
+      action_view_helpers = rb_hash_lookup(options, ID2SYM(rb_intern("action_view_helpers")));
+    }
+    if (!NIL_P(action_view_helpers) && RTEST(action_view_helpers)) { parser_options.action_view_helpers = true; }
+
     VALUE arena_stats = rb_hash_lookup(options, rb_utf8_str_new_cstr("arena_stats"));
     if (NIL_P(arena_stats)) { arena_stats = rb_hash_lookup(options, ID2SYM(rb_intern("arena_stats"))); }
     if (!NIL_P(arena_stats) && RTEST(arena_stats)) { print_arena_stats = true; }

ext/herb/extension_helpers.c

@@ -88,6 +88,7 @@ VALUE create_parse_result(AST_DOCUMENT_NODE_T* root, VALUE source, const parser_
   rb_hash_aset(kwargs, ID2SYM(rb_intern("strict")), options->strict ? Qtrue : Qfalse);
   rb_hash_aset(kwargs, ID2SYM(rb_intern("track_whitespace")), options->track_whitespace ? Qtrue : Qfalse);
   rb_hash_aset(kwargs, ID2SYM(rb_intern("analyze")), options->analyze ? Qtrue : Qfalse);
+  rb_hash_aset(kwargs, ID2SYM(rb_intern("action_view_helpers")), options->action_view_helpers ? Qtrue : Qfalse);
 
   VALUE parser_options_args[1] = { kwargs };
   VALUE parser_options = rb_class_new_instance_kw(1, parser_options_args, cParserOptions, RB_PASS_KEYWORDS);

java/Makefile

@@ -35,7 +35,7 @@ INCLUDES = -I. -I$(SRC_DIR)/include -I$(PRISM_INCLUDE) $(JNI_INCLUDES)
 LDFLAGS = -shared
 LIBS = $(PRISM_BUILD)/libprism.a
 
-HERB_SOURCES = $(wildcard $(SRC_DIR)/*.c) $(wildcard $(SRC_DIR)/**/*.c)
+HERB_SOURCES = $(shell find $(SRC_DIR) -name '*.c')
 HERB_OBJECTS = $(filter-out $(SRC_DIR)/main.o, $(HERB_SOURCES:.c=.o))
 
 JNI_SOURCES = herb_jni.c extension_helpers.c

java/herb_jni.c

@@ -60,6 +60,14 @@ Java_org_herb_Herb_parse(JNIEnv* env, jclass clazz, jstring source, jobject opti
       jboolean strict = (*env)->CallBooleanMethod(env, options, getStrict);
       parser_options.strict = (strict == JNI_TRUE);
     }
+
+    jmethodID getActionViewHelpers =
+        (*env)->GetMethodID(env, optionsClass, "isActionViewHelpers", "()Z");
+
+    if (getActionViewHelpers != NULL) {
+      jboolean actionViewHelpers = (*env)->CallBooleanMethod(env, options, getActionViewHelpers);
+      parser_options.action_view_helpers = (actionViewHelpers == JNI_TRUE);
+    }
   }
 
   hb_allocator_T allocator;

java/org/herb/ParserOptions.java

@@ -4,6 +4,7 @@ public class ParserOptions {
   private boolean trackWhitespace = false;
   private boolean analyze = true;
   private boolean strict = true;
+  private boolean actionViewHelpers = false;
 
   public ParserOptions() {}
 
@@ -34,6 +35,15 @@ public boolean isStrict() {
     return strict;
   }
 
+  public ParserOptions actionViewHelpers(boolean value) {
+    this.actionViewHelpers = value;
+    return this;
+  }
+
+  public boolean isActionViewHelpers() {
+    return actionViewHelpers;
+  }
+
   public static ParserOptions create() {
     return new ParserOptions();
   }