Refactor code generation.

* use '\r\n' on windows, '\n' on linux.

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

Diff for: lib/core.js

@@ -154,30 +154,37 @@ core.starProblem = function(problem, starred, cb) {
 
 core.exportProblem = function(problem, f, codeOnly) {
   var output = '';
+  problem.code = problem.code.replace(/\r\n/g, '\n');
 
   if (codeOnly) {
     output = problem.code;
   } else {
-    var input = h.langToCommentStyle(h.extToLang(f));
+    var input = {
+      comment: h.langToCommentStyle(h.extToLang(f))
+    };
     // copy problem attrs thus we can render it in template
     _.extend(input, problem);
     input.percent = input.percent.toFixed(2);
     input.testcase = util.inspect(input.testcase || '');
 
     // NOTE: wordwrap internally uses '\n' as EOL, so here we have to
     // remove all '\r' in the raw string.
-    // FIXME: while in template file we still use '\r\n' for the sake
-    // of windows, is it really necessary?
     var desc = input.desc.replace(/\r\n/g, '\n')
                          .replace(/^ /mg, '⁠');
 
-    var wrap = require('wordwrap')(79 - input.commentLine.length);
+    var wrap = require('wordwrap')(79 - input.comment.line.length);
     input.desc = wrap(desc).split('\n');
 
     var tpl = fs.readFileSync(path.resolve(__dirname, '../source.tpl'), 'utf-8');
     output = _.template(tpl)(input);
   }
 
+  if (h.isWindows()) {
+    output = output.replace(/\n/g, '\r\n');
+  } else {
+    output = output.replace(/\r\n/g, '\n');
+  }
+
   fs.writeFileSync(f, output);
 };
 

Diff for: lib/helper.js

@@ -46,6 +46,10 @@ var LANGS = [
 
 var h = {};
 
+h.isWindows = function() {
+  return process.platform === 'win32';
+};
+
 h.prettyState = function(state) {
   switch (state) {
     case 'ac':    return this.prettyText('', true);
@@ -119,8 +123,8 @@ h.langToCommentStyle = function(lang) {
   });
 
   return (res && res.style === '#') ?
-  {commentHeader: '#',  commentLine: '#',  commentFooter: '#'} :
-  {commentHeader: '/*', commentLine: ' *', commentFooter: ' */'};
+  {start: '#',  line: '#',  end: '#'} :
+  {start: '/*', line: ' *', end: ' */'};
 };
 
 h.getFileData = function(p) {

Diff for: lib/icon.js

@@ -14,7 +14,7 @@ var icons = {
 };
 
 icons.setTheme = function(name) {
-  var defaultName = process.platform === 'win32' ? 'win7' : 'default';
+  var defaultName = h.isWindows() ? 'win7' : 'default';
   var theme = this.themes[name] || this.themes[defaultName] || {};
   _.extendOwn(this, theme);
 };

Diff for: source.tpl

@@ -1,14 +1,14 @@
-<%= commentHeader %>
-<%= commentLine %> [<%= id %>] <%= name %>
-<%= commentLine %>
-<%= commentLine %> <%= link %>
-<%= commentLine %>
-<%= commentLine %> <%= category %>
-<%= commentLine %> <%= level %> (<%= percent %>%)
-<%= commentLine %> Total Accepted:    <%= totalAC %>
-<%= commentLine %> Total Submissions: <%= totalSubmit %>
-<%= commentLine %> Testcase Example:  <%= testcase %>
-<%= commentLine %>
-<% _.each(desc, function(x) { %><%= commentLine %> <%= x %>
-<% }) %><%= commentFooter %>
-<%= code %>
+<%= comment.start %>
+<%= comment.line %> [<%= id %>] <%= name %>
+<%= comment.line %>
+<%= comment.line %> <%= link %>
+<%= comment.line %>
+<%= comment.line %> <%= category %>
+<%= comment.line %> <%= level %> (<%= percent %>%)
+<%= comment.line %> Total Accepted:    <%= totalAC %>
+<%= comment.line %> Total Submissions: <%= totalSubmit %>
+<%= comment.line %> Testcase Example:  <%= testcase %>
+<%= comment.line %>
+<% _.each(desc, function(x) { %><%= comment.line %> <%= x %>
+<% }) %><%= comment.end %>
+<%= code %>

Diff for: test/test_core.js

@@ -364,7 +364,7 @@ describe('core', function() {
           '',
           '    }',
           '};'
-        ].join('\r\n');
+        ].join('\n');
 
         injectVerify(expected, done);
 
@@ -399,7 +399,7 @@ describe('core', function() {
           '    }',
           '};',
           ''
-        ].join('\r\n');
+        ].join('\n');
 
         injectVerify(expected, done);
 
@@ -443,7 +443,7 @@ describe('core', function() {
           '    ',
           'end',
           ''
-        ].join('\r\n');
+        ].join('\n');
 
         injectVerify(expected, done);
 

Diff for: test/test_helper.js

@@ -134,16 +134,8 @@ describe('helper', function() {
 
   describe('#langToCommentStyle', function() {
     it('should ok', function() {
-      var C_STYLE = {
-        commentHeader: '/*',
-        commentLine:   ' *',
-        commentFooter: ' */'
-      };
-      var RUBY_STYLE = {
-        commentHeader: '#',
-        commentLine:   '#',
-        commentFooter: '#'
-      };
+      var C_STYLE = {start: '/*', line: ' *', end: ' */'};
+      var RUBY_STYLE = {start: '#', line: '#', end: '#'};
 
       assert.deepEqual(h.langToCommentStyle('bash'), RUBY_STYLE);
       assert.deepEqual(h.langToCommentStyle('c'), C_STYLE);