Skip to content

Add heredoc #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 6, 2020
Merged

Add heredoc #120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2d1b538
Add heredoc
mattn Jul 19, 2019
2e1e805
Fix raw string
mattn Jul 19, 2019
8e56b9b
Fix comment
mattn Jul 19, 2019
e99ee95
Do not use slice
mattn Jul 19, 2019
a5159db
Handle words correctly, Implement escape_string
mattn Jul 19, 2019
8aaa370
Fix compile_heredoc
mattn Jul 20, 2019
b1c1402
Gen
mattn Jul 20, 2019
2b5e08a
Fix heredoc
mattn Jul 21, 2019
14192b1
Fix heredoc
mattn Jul 21, 2019
516eb10
Fix test
mattn Jul 21, 2019
5a262b0
Fix heredoc
mattn Jul 21, 2019
79b9284
Merge branch 'master' into heredoc
mattn Mar 6, 2020
04faeeb
Recompile
mattn Mar 6, 2020
276981e
add abort
tyru Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Recompile
  • Loading branch information
@mattn
mattn committed Mar 6, 2020
commit 04faeeba63bd0dcaea16ffba01c39b2475404eab
18 changes: 9 additions & 9 deletions js/vimlparser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5031,9 +5031,9 @@ Compiler.prototype.compile_curlynameexpr = function(node) {
Compiler.prototype.escape_string = function(str) {
var m = {"\n":"\\n", "\t":"\\t", "\r":"\\r"};
var out = "\"";
var __c13 = viml_range(viml_len(str));
for (var __i13 = 0; __i13 < __c13.length; ++__i13) {
var i = __c13[__i13];
var __c14 = viml_range(viml_len(str));
for (var __i14 = 0; __i14 < __c14.length; ++__i14) {
var i = __c14[__i14];
var c = str[i];
if (viml_has_key(m, c)) {
out += m[c];
Expand Down Expand Up @@ -5748,9 +5748,9 @@ RegexpParser.prototype.get_token_sq_char_class = function() {
var r = this.reader.read_alpha();
if (this.reader.p(0) == ":" && this.reader.p(1) == "]") {
this.reader.seek_cur(2);
var __c14 = class_names;
for (var __i14 = 0; __i14 < __c14.length; ++__i14) {
var name = __c14[__i14];
var __c15 = class_names;
for (var __i15 = 0; __i15 < __c15.length; ++__i15) {
var name = __c15[__i15];
if (r == name) {
return "[:" + name + ":]";
}
Expand Down Expand Up @@ -5883,9 +5883,9 @@ RegexpParser.prototype.getoctchrs = function() {

RegexpParser.prototype.gethexchrs = function(n) {
var r = "";
var __c15 = viml_range(n);
for (var __i15 = 0; __i15 < __c15.length; ++__i15) {
var i = __c15[__i15];
var __c16 = viml_range(n);
for (var __i16 = 0; __i16 < __c16.length; ++__i16) {
var i = __c16[__i16];
var c = this.reader.peek();
if (!isxdigit(c)) {
break;
Expand Down
3 changes: 2 additions & 1 deletion py/vimlparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4002,7 +4002,7 @@ def compile_curlynameexpr(self, node):
return "{" + self.compile(node.value) + "}"

def escape_string(self, str):
m = AttributeDict({"\n":"\\n", "\t":"\\t", "\r":"\\r"})
m = AttributeDict({"\n": "\\n", "\t": "\\t", "\r": "\\r"})
out = "\""
for i in viml_range(viml_len(str)):
c = str[i]
Expand All @@ -4029,6 +4029,7 @@ def compile_heredoc(self, node):
op = self.escape_string(node.op)
return viml_printf("(heredoc %s %s %s)", rlist, op, body)


# TODO: under construction
class RegexpParser:
RE_VERY_NOMAGIC = 1
Expand Down