Switch baselines to formatted sexps

Summary: Use Sexp to pretty-print baselines - currently they are unreadable and not diff-friendly

Reviewed By: oulgen

Differential Revision: D6632253

fbshipit-source-id: ed376ac3c48c4eaa096d9f43a0a64b02acad3792

hphp/hack/test/full_fidelity/cases/context/test_extra_error_trivia.exp

@@ -1 +1,62 @@
-(script(list(markup_section(missing)((markup))(markup_suffix((<?))((name)(end_of_line)))(missing))(classish_declaration(missing)(missing)((end_of_line)(class)(whitespace))((name)(whitespace))(missing)(missing)(missing)(missing)(missing)(classish_body(({)(end_of_line))(list(methodish_declaration(missing)(function_declaration_header(list((end_of_line)(whitespace)(single_line_comment)(end_of_line)(whitespace)(public)(whitespace)))((extra_token_error)(whitespace)(function)(whitespace))(missing)((name))(missing)((lparen))(missing)((rparen)(whitespace))(missing)(missing)(missing))(compound_statement(({)(end_of_line))(missing)((whitespace)(})(end_of_line)))(missing))(methodish_declaration(missing)(function_declaration_header(list((end_of_line)(whitespace)(single_line_comment)(end_of_line)(whitespace)(public)(whitespace))((static)(whitespace)))((extra_token_error)(whitespace)(function)(whitespace))(missing)((name))(missing)((lparen))(missing)((rparen)(whitespace))(missing)(missing)(missing))(compound_statement(({)(end_of_line))(missing)((whitespace)(})(end_of_line)))(missing))(property_declaration(list((end_of_line)(whitespace)(single_line_comment)(end_of_line)(whitespace)(public)(whitespace)))(simple_type_specifier((name)(whitespace)))(list(list_item(property_declarator(missing)(missing))(missing)))(missing))(methodish_declaration(missing)(function_declaration_header(list((static)(whitespace)))((function)(whitespace))(missing)((name))(missing)((lparen))(missing)((rparen)(whitespace))(missing)(missing)(missing))(compound_statement(({)(end_of_line))(missing)((whitespace)(})(end_of_line)))(missing))(property_declaration(list((end_of_line)(whitespace)(single_line_comment)(end_of_line)(whitespace)(public)(whitespace)))(simple_type_specifier((name)(whitespace)))(list(list_item(property_declarator(missing)(missing))(missing)))(missing))(error((name)(whitespace)))(methodish_declaration(missing)(function_declaration_header(missing)((function)(whitespace))(missing)((name))(missing)((lparen))(missing)((rparen)(whitespace))(missing)(missing)(missing))(compound_statement(({)(end_of_line))(missing)((whitespace)(})(end_of_line)))(missing)))((end_of_line)(}))))))
+(script
+ (list
+  (markup_section (missing) ((markup))
+   (markup_suffix ((<?)) ((name) (end_of_line))) (missing))
+  (classish_declaration (missing) (missing)
+   ((end_of_line) (class) (whitespace)) ((name) (whitespace)) (missing)
+   (missing) (missing) (missing) (missing)
+   (classish_body (({) (end_of_line))
+    (list
+     (methodish_declaration (missing)
+      (function_declaration_header
+       (list
+        ((end_of_line) (whitespace) (single_line_comment) (end_of_line)
+         (whitespace) (public) (whitespace)))
+       ((extra_token_error) (whitespace) (function) (whitespace)) (missing)
+       ((name)) (missing) ((lparen)) (missing) ((rparen) (whitespace))
+       (missing) (missing) (missing))
+      (compound_statement (({) (end_of_line)) (missing)
+       ((whitespace) (}) (end_of_line)))
+      (missing))
+     (methodish_declaration (missing)
+      (function_declaration_header
+       (list
+        ((end_of_line) (whitespace) (single_line_comment) (end_of_line)
+         (whitespace) (public) (whitespace))
+        ((static) (whitespace)))
+       ((extra_token_error) (whitespace) (function) (whitespace)) (missing)
+       ((name)) (missing) ((lparen)) (missing) ((rparen) (whitespace))
+       (missing) (missing) (missing))
+      (compound_statement (({) (end_of_line)) (missing)
+       ((whitespace) (}) (end_of_line)))
+      (missing))
+     (property_declaration
+      (list
+       ((end_of_line) (whitespace) (single_line_comment) (end_of_line)
+        (whitespace) (public) (whitespace)))
+      (simple_type_specifier ((name) (whitespace)))
+      (list (list_item (property_declarator (missing) (missing)) (missing)))
+      (missing))
+     (methodish_declaration (missing)
+      (function_declaration_header (list ((static) (whitespace)))
+       ((function) (whitespace)) (missing) ((name)) (missing) ((lparen))
+       (missing) ((rparen) (whitespace)) (missing) (missing) (missing))
+      (compound_statement (({) (end_of_line)) (missing)
+       ((whitespace) (}) (end_of_line)))
+      (missing))
+     (property_declaration
+      (list
+       ((end_of_line) (whitespace) (single_line_comment) (end_of_line)
+        (whitespace) (public) (whitespace)))
+      (simple_type_specifier ((name) (whitespace)))
+      (list (list_item (property_declarator (missing) (missing)) (missing)))
+      (missing))
+     (error ((name) (whitespace)))
+     (methodish_declaration (missing)
+      (function_declaration_header (missing) ((function) (whitespace))
+       (missing) ((name)) (missing) ((lparen)) (missing)
+       ((rparen) (whitespace)) (missing) (missing) (missing))
+      (compound_statement (({) (end_of_line)) (missing)
+       ((whitespace) (}) (end_of_line)))
+      (missing)))
+    ((end_of_line) (}))))))

hphp/hack/test/full_fidelity/cases/test_array_expression.exp

@@ -1 +1,48 @@
-(script(list(markup_section(missing)((markup))(markup_suffix((<?))((name)(end_of_line)))(missing))(function_declaration(missing)(function_declaration_header(missing)((function)(whitespace))(missing)((name))(missing)((lparen))(missing)((rparen))(missing)(missing)(missing))(compound_statement(({)(end_of_line))(list(expression_statement(array_intrinsic_expression((whitespace)(array))((lparen))(missing)((rparen)))((;)(end_of_line)))(expression_statement(array_intrinsic_expression((whitespace)(array))((lparen))(list(list_item(variable((variable)))(missing)))((rparen)))((;)(end_of_line)))(expression_statement(array_intrinsic_expression((whitespace)(array))((lparen))(list(list_item(variable((variable)))((,))))((rparen)))((;)(end_of_line)))(expression_statement(array_intrinsic_expression((whitespace)(array))((lparen))(list(list_item(variable((variable)))((,)(whitespace)))(list_item(variable((variable)))((,)(whitespace)))(list_item(variable((variable)))(missing)))((rparen)))((;)(end_of_line)))(expression_statement(array_creation_expression((whitespace)([))(missing)((])))((;)(end_of_line)))(expression_statement(array_creation_expression((whitespace)([))(list(list_item(variable((variable)))(missing)))((])))((;)(end_of_line)))(expression_statement(array_creation_expression((whitespace)([))(list(list_item(variable((variable)))((,))))((])))((;)(end_of_line)))(expression_statement(array_creation_expression((whitespace)([))(list(list_item(variable((variable)))((,)))(list_item(variable((variable)))((,)))(list_item(variable((variable)))(missing)))((])))((;)(end_of_line))))((}))))))
+(script
+ (list
+  (markup_section (missing) ((markup))
+   (markup_suffix ((<?)) ((name) (end_of_line))) (missing))
+  (function_declaration (missing)
+   (function_declaration_header (missing) ((function) (whitespace)) (missing)
+    ((name)) (missing) ((lparen)) (missing) ((rparen)) (missing) (missing)
+    (missing))
+   (compound_statement (({) (end_of_line))
+    (list
+     (expression_statement
+      (array_intrinsic_expression ((whitespace) (array)) ((lparen)) (missing)
+       ((rparen)))
+      ((";") (end_of_line)))
+     (expression_statement
+      (array_intrinsic_expression ((whitespace) (array)) ((lparen))
+       (list (list_item (variable ((variable))) (missing))) ((rparen)))
+      ((";") (end_of_line)))
+     (expression_statement
+      (array_intrinsic_expression ((whitespace) (array)) ((lparen))
+       (list (list_item (variable ((variable))) ((,)))) ((rparen)))
+      ((";") (end_of_line)))
+     (expression_statement
+      (array_intrinsic_expression ((whitespace) (array)) ((lparen))
+       (list (list_item (variable ((variable))) ((,) (whitespace)))
+        (list_item (variable ((variable))) ((,) (whitespace)))
+        (list_item (variable ((variable))) (missing)))
+       ((rparen)))
+      ((";") (end_of_line)))
+     (expression_statement
+      (array_creation_expression ((whitespace) ([)) (missing) ((])))
+      ((";") (end_of_line)))
+     (expression_statement
+      (array_creation_expression ((whitespace) ([))
+       (list (list_item (variable ((variable))) (missing))) ((])))
+      ((";") (end_of_line)))
+     (expression_statement
+      (array_creation_expression ((whitespace) ([))
+       (list (list_item (variable ((variable))) ((,)))) ((])))
+      ((";") (end_of_line)))
+     (expression_statement
+      (array_creation_expression ((whitespace) ([))
+       (list (list_item (variable ((variable))) ((,)))
+        (list_item (variable ((variable))) ((,)))
+        (list_item (variable ((variable))) (missing)))
+       ((])))
+      ((";") (end_of_line))))
+    ((}))))))

hphp/hack/test/full_fidelity/cases/test_array_key_value_precedence.exp

@@ -1 +1,25 @@
-(script(list(markup_section(missing)((markup))(markup_suffix((<?))((name)(end_of_line)))(missing))(function_declaration(missing)(function_declaration_header(missing)((function)(whitespace))(missing)((name))(missing)((lparen))(missing)((rparen))(missing)(missing)(missing))(compound_statement(({)(end_of_line))(list(expression_statement(prefix_unary_expression((whitespace)(await)(whitespace))(binary_expression(variable((variable)(whitespace)))((.)(whitespace))(array_intrinsic_expression((array)(whitespace))((lparen))(list(list_item(element_initializer(variable((variable)(whitespace)))((=>)(whitespace))(binary_expression(qualified_name((name)(whitespace)))((*=)(whitespace))(literal((decimal_literal)))))(missing)))((rparen)))))((;)(end_of_line))))((}))))))
+(script
+ (list
+  (markup_section (missing) ((markup))
+   (markup_suffix ((<?)) ((name) (end_of_line))) (missing))
+  (function_declaration (missing)
+   (function_declaration_header (missing) ((function) (whitespace)) (missing)
+    ((name)) (missing) ((lparen)) (missing) ((rparen)) (missing) (missing)
+    (missing))
+   (compound_statement (({) (end_of_line))
+    (list
+     (expression_statement
+      (prefix_unary_expression ((whitespace) (await) (whitespace))
+       (binary_expression (variable ((variable) (whitespace)))
+        ((.) (whitespace))
+        (array_intrinsic_expression ((array) (whitespace)) ((lparen))
+         (list
+          (list_item
+           (element_initializer (variable ((variable) (whitespace)))
+            ((=>) (whitespace))
+            (binary_expression (qualified_name ((name) (whitespace)))
+             ((*=) (whitespace)) (literal ((decimal_literal)))))
+           (missing)))
+         ((rparen)))))
+      ((";") (end_of_line))))
+    ((}))))))

hphp/hack/test/full_fidelity/cases/test_awaitable_creation.exp

@@ -1 +1,73 @@
-(script(list(markup_section(missing)((markup))(markup_suffix((<?))((name)(end_of_line)))(missing))(function_declaration(missing)(function_declaration_header(missing)((function)(whitespace))(missing)((name)(whitespace))(missing)((lparen))(missing)((rparen)(whitespace))(missing)(missing)(missing))(compound_statement(({)(end_of_line))(list(expression_statement(binary_expression(variable((whitespace)(variable)(whitespace)))((=)(whitespace))(awaitable_creation_expression((async)(whitespace))(missing)(compound_statement(({))(missing)((})))))((;)(end_of_line)))(expression_statement(binary_expression(variable((whitespace)(variable)(whitespace)))((=)(whitespace))(binary_expression(awaitable_creation_expression((async)(whitespace))(missing)(compound_statement(({))(missing)((})(whitespace))))((+)(whitespace))(literal((decimal_literal)))))((;)(end_of_line)))(expression_statement(binary_expression(variable((whitespace)(variable)(whitespace)))((=)(whitespace))(binary_expression(literal((decimal_literal)(whitespace)))((+)(whitespace))(awaitable_creation_expression((async)(whitespace))(missing)(compound_statement(({))(missing)((}))))))((;)(end_of_line)))(expression_statement(binary_expression(variable((whitespace)(variable)(whitespace)))((=)(whitespace))(binary_expression(awaitable_creation_expression((async)(whitespace))(missing)(compound_statement(({))(missing)((})(whitespace))))((+)(whitespace))(awaitable_creation_expression((async)(whitespace))(missing)(compound_statement(({))(missing)((}))))))((;)(end_of_line)))(expression_statement(binary_expression(variable((whitespace)(variable)(whitespace)))((=)(whitespace))(awaitable_creation_expression((async)(whitespace))(missing)(compound_statement(({)(end_of_line))(list(expression_statement(binary_expression(variable((whitespace)(variable)(whitespace)))((=)(whitespace))(literal((decimal_literal))))((;)(end_of_line))))((whitespace)(})))))((;)(end_of_line)))(expression_statement(binary_expression(variable((whitespace)(variable)(whitespace)))((=)(whitespace))(awaitable_creation_expression((async)(whitespace))(missing)(compound_statement(({)(end_of_line))(list(expression_statement(binary_expression(variable((whitespace)(variable)(whitespace)))((=)(whitespace))(binary_expression(awaitable_creation_expression((async)(whitespace))(missing)(compound_statement(({))(missing)((})(whitespace))))((+)(whitespace))(literal((decimal_literal)))))((;)(end_of_line))))((whitespace)(})))))((;)(end_of_line))))((}))))))
+(script
+ (list
+  (markup_section (missing) ((markup))
+   (markup_suffix ((<?)) ((name) (end_of_line))) (missing))
+  (function_declaration (missing)
+   (function_declaration_header (missing) ((function) (whitespace)) (missing)
+    ((name) (whitespace)) (missing) ((lparen)) (missing)
+    ((rparen) (whitespace)) (missing) (missing) (missing))
+   (compound_statement (({) (end_of_line))
+    (list
+     (expression_statement
+      (binary_expression (variable ((whitespace) (variable) (whitespace)))
+       ((=) (whitespace))
+       (awaitable_creation_expression ((async) (whitespace)) (missing)
+        (compound_statement (({)) (missing) ((})))))
+      ((";") (end_of_line)))
+     (expression_statement
+      (binary_expression (variable ((whitespace) (variable) (whitespace)))
+       ((=) (whitespace))
+       (binary_expression
+        (awaitable_creation_expression ((async) (whitespace)) (missing)
+         (compound_statement (({)) (missing) ((}) (whitespace))))
+        ((+) (whitespace)) (literal ((decimal_literal)))))
+      ((";") (end_of_line)))
+     (expression_statement
+      (binary_expression (variable ((whitespace) (variable) (whitespace)))
+       ((=) (whitespace))
+       (binary_expression (literal ((decimal_literal) (whitespace)))
+        ((+) (whitespace))
+        (awaitable_creation_expression ((async) (whitespace)) (missing)
+         (compound_statement (({)) (missing) ((}))))))
+      ((";") (end_of_line)))
+     (expression_statement
+      (binary_expression (variable ((whitespace) (variable) (whitespace)))
+       ((=) (whitespace))
+       (binary_expression
+        (awaitable_creation_expression ((async) (whitespace)) (missing)
+         (compound_statement (({)) (missing) ((}) (whitespace))))
+        ((+) (whitespace))
+        (awaitable_creation_expression ((async) (whitespace)) (missing)
+         (compound_statement (({)) (missing) ((}))))))
+      ((";") (end_of_line)))
+     (expression_statement
+      (binary_expression (variable ((whitespace) (variable) (whitespace)))
+       ((=) (whitespace))
+       (awaitable_creation_expression ((async) (whitespace)) (missing)
+        (compound_statement (({) (end_of_line))
+         (list
+          (expression_statement
+           (binary_expression
+            (variable ((whitespace) (variable) (whitespace)))
+            ((=) (whitespace)) (literal ((decimal_literal))))
+           ((";") (end_of_line))))
+         ((whitespace) (})))))
+      ((";") (end_of_line)))
+     (expression_statement
+      (binary_expression (variable ((whitespace) (variable) (whitespace)))
+       ((=) (whitespace))
+       (awaitable_creation_expression ((async) (whitespace)) (missing)
+        (compound_statement (({) (end_of_line))
+         (list
+          (expression_statement
+           (binary_expression
+            (variable ((whitespace) (variable) (whitespace)))
+            ((=) (whitespace))
+            (binary_expression
+             (awaitable_creation_expression ((async) (whitespace)) (missing)
+              (compound_statement (({)) (missing) ((}) (whitespace))))
+             ((+) (whitespace)) (literal ((decimal_literal)))))
+           ((";") (end_of_line))))
+         ((whitespace) (})))))
+      ((";") (end_of_line))))
+    ((}))))))

hphp/hack/test/full_fidelity/cases/test_class_const.exp

@@ -1 +1,42 @@
-(script(list(markup_section(missing)((markup))(markup_suffix((<?))((name)(whitespace)(single_line_comment)(end_of_line)))(missing))(classish_declaration(missing)(missing)((end_of_line)(class)(whitespace))((name)(whitespace))(missing)(missing)(missing)(missing)(missing)(classish_body(({)(end_of_line))(list(const_declaration(missing)((whitespace)(const)(whitespace))(missing)(list(list_item(constant_declarator((name)(whitespace))(simple_initializer((=)(whitespace))(literal((double_quoted_string_literal)))))(missing)))((;)(end_of_line)))(const_declaration(missing)((whitespace)(const)(whitespace))(simple_type_specifier((string)(whitespace)))(list(list_item(constant_declarator((name)(whitespace))(simple_initializer((=)(whitespace))(literal((double_quoted_string_literal)))))(missing)))((;)(end_of_line)))(const_declaration(missing)((whitespace)(const)(whitespace))(generic_type_specifier((name))(type_arguments((<))(list(list_item(simple_type_specifier((string)))(missing)))((>)(whitespace))))(list(list_item(constant_declarator((name)(whitespace))(simple_initializer((=)(whitespace))(literal((double_quoted_string_literal)))))(missing)))((;)(end_of_line))))((}))))))
+(script
+ (list
+  (markup_section (missing) ((markup))
+   (markup_suffix ((<?))
+    ((name) (whitespace) (single_line_comment) (end_of_line)))
+   (missing))
+  (classish_declaration (missing) (missing)
+   ((end_of_line) (class) (whitespace)) ((name) (whitespace)) (missing)
+   (missing) (missing) (missing) (missing)
+   (classish_body (({) (end_of_line))
+    (list
+     (const_declaration (missing) ((whitespace) (const) (whitespace))
+      (missing)
+      (list
+       (list_item
+        (constant_declarator ((name) (whitespace))
+         (simple_initializer ((=) (whitespace))
+          (literal ((double_quoted_string_literal)))))
+        (missing)))
+      ((";") (end_of_line)))
+     (const_declaration (missing) ((whitespace) (const) (whitespace))
+      (simple_type_specifier ((string) (whitespace)))
+      (list
+       (list_item
+        (constant_declarator ((name) (whitespace))
+         (simple_initializer ((=) (whitespace))
+          (literal ((double_quoted_string_literal)))))
+        (missing)))
+      ((";") (end_of_line)))
+     (const_declaration (missing) ((whitespace) (const) (whitespace))
+      (generic_type_specifier ((name))
+       (type_arguments ((<))
+        (list (list_item (simple_type_specifier ((string))) (missing)))
+        ((>) (whitespace))))
+      (list
+       (list_item
+        (constant_declarator ((name) (whitespace))
+         (simple_initializer ((=) (whitespace))
+          (literal ((double_quoted_string_literal)))))
+        (missing)))
+      ((";") (end_of_line))))
+    ((}))))))