From 99836d8245ce7f3d670b094c87ae503be2e69df7 Mon Sep 17 00:00:00 2001 From: ndparker Date: Sun, 18 Oct 2015 20:07:29 +0200 Subject: [PATCH] adjust C code for return\n/regex/ instances --- rjsmin.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rjsmin.c b/rjsmin.c index 082d0e0..882d3b7 100644 --- a/rjsmin.c +++ b/rjsmin.c @@ -159,8 +159,7 @@ rjsmin(const rchar *source, rchar *target, Py_ssize_t length, || RJSMIN_IS_PRE_REGEX_1(*((pctoken ? pctoken : target) - 1)) || ( - (!pctoken || spaced == U(' ')) - && (xtarget = pctoken ? pctoken : target) + (xtarget = pctoken ? pctoken : target) && (xtarget - tstart >= 6) && *(xtarget - 1) == U('n') && *(xtarget - 2) == U('r') @@ -176,9 +175,13 @@ rjsmin(const rchar *source, rchar *target, Py_ssize_t length, /* Regex */ if (post_regex) post_regex = 0; - if (pctoken) pctoken = NULL; - reset = source; + + if (pctoken) { + pctoken = NULL; + if (spaced == U('\n')) + *target++ = U('\n'); + } *target++ = U('/'); while (source < sentinel) { c = *source++;