Patch 1: makefile + fixes #467

amroamroamro · 2017-01-13T10:21:59Z

summary:

Makefile was given an update
added a variable HACK_TO_FIX_JS_INCLUDE_PL in js-modules/prettify.js as a hack so that the line include('defs.js') is correctly handled
reapplied some previous commits to the unprocessed file js-modules/prettify.js which were only modifying the generated src/prettify.js
added some new C/C++ keywords and types
some minor fixes
doc edits

I also ran make and committed the generated files (in preparation for a last release using makefile before we switch to grunt).

Instead of relying on timestamped dummy files to track dependencies, we create a list of separate targets to build from their corresponding sources. This is a better design because it allows recompiling only the modified targets instead of all or nothing. However the timestamp approach was kept for the lang-aliases rule because the alias targets are not known in advance and have to be extracted out of the language handler scripts. The code to extract lang-alias was ported to a node.js script, instead of the existing solution based on bash + perl + js-interpreter. The compiled files are placed directly into the "loader" folder, and and old cruft is dropped (no need for multiple archive formats TAR/TGZ/BZ2), instead only one ZIP archive is generated in the "distrib" folder.

C99: restrict C++11: alignas, noexcept, noreturn C_TYPES (STL containers): array, forward_*, reverse_*, unordered_*

include('defs.js') in prettify.js was inserted in the wrong place, this is because of the way the perl script expects surrounding lines to look like. So we add a dummy variable declaration without preceding comment lines.

mikesamuel · 2017-01-13T16:50:30Z

README.md

+* Widely used with good cross-browser support. Powers https://code.google.com/
+  and http://stackoverflow.com/
+
+[See an example][2].


Thanks for writing docs.

I actually lifted that features list from the old wiki pages :)
https://github.com/google/code-prettify/blob/wiki/ProjectHome.md

mikesamuel · 2017-01-13T19:03:14Z

docs/getting_started.md

-| callback=js_ident | | `window.exports["js_ident"]` will be called when prettyprinting finishes.  If specified multiple times, all are called. |
+| CGI parameter         | default | meaning                        |
+| --------------------- | ------- | ------------------------------ |
+| autorun=(true, false) | true    | run automatically on page load |


Good catch.

mikesamuel · 2017-01-13T19:06:52Z

src/run_prettify.js

-          "internal,into,is,let,lock,null,object,out,override,orderby,params," +
-          "partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong," +
-          "unchecked,unsafe,ushort,var,virtual,where"];
+          "abstract,add,alias,as,ascending,async,await,base,bool,by,byte,checked,decimal,delegate,descending," +


I'll take your word for it. C#'s keyword list is approaching the union of all other language's keywords.

I'm actually re-applying previous patches here that were mistakenly undone later. I didn't add any new C# keywords myself: PR #384 and PR #418

mikesamuel · 2017-01-13T19:11:11Z

src/run_prettify.js

@@ -1662,7 +1665,7 @@ var IN_GLOBAL_SCOPE = false;
              'keywords': JSCRIPT_KEYWORDS,
              'cStyleComments': true,
              'regexLiterals': true
-            }), ['javascript', 'js']);
+            }), ['javascript', 'js', 'ts', 'typescript']);


Note to self: we can think about .jsx down the road.

(Apparently Facebook reinvented E4X and is calling it React JS.)

same thing, this is coming from an already merged PR #423, which modified the generated file src/prettify.js and not the actual source in js-modules/prettify.js.

(JSX style of mixing JS/XML syntax would be a nice addition)

mikesamuel · 2017-01-13T19:14:22Z

tools/lang-handler-aliases.js

@@ -0,0 +1,87 @@
+#!/usr/bin/env node


Note to self: port of https://github.com/google/code-prettify/blob/master/tools/lang-handler-aliases.sh

yep. I should mention that I rewrote this script again, in a later patch, as a grunt plugin..

mikesamuel · 2017-01-13T19:20:47Z

tools/lang-handler-aliases.js

+
+    // for each unique alias, copy file if not already exist
+    langExtensions.filter(function (ext, pos) {
+        return langExtensions.indexOf(ext) == pos;


Note to self: equivalent of | uniq.

correct, I think I borrowed it from here: http://stackoverflow.com/a/14438954/97160

We could shorten some of this stuff by using a library like underscore or lodash, but I wanted to avoid adding npm dependencies if possible

+1 on minimal dependencies

mikesamuel · 2017-01-13T19:21:44Z

tools/lang-handler-aliases.js

+    });
+
+    // collect extensions list
+    var langExtensions = sandbox.langExtensions;


Could you sort the extensions here?

I should have in the original script to remove file-system child ordering as a source of non-determinism.

ok, will add .sort()

mikesamuel · 2017-01-13T19:23:43Z

js-modules/run_prettify.js

@@ -49,7 +49,7 @@
 * +------------------+---------------+------------------------------+--------+
 *
 * Exmaples


Not your fault but s/Exmaples/Examples/ please.

mikesamuel · 2017-01-13T19:25:32Z

loader/lang-swift.js

 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[ \n\r\t\v\f\0]+/,null," \n\r\t\v\f\x00"],["str",/^"(?:[^"\\]|(?:\\.)|(?:\\\((?:[^"\\)]|\\.)*\)))*"/,null,'"']],[["lit",/^(?:(?:0x[\da-fA-F][\da-fA-F_]*\.[\da-fA-F][\da-fA-F_]*[pP]?)|(?:\d[\d_]*\.\d[\d_]*[eE]?))[+-]?\d[\d_]*/,null],["lit",/^-?(?:(?:0(?:(?:b[01][01_]*)|(?:o[0-7][0-7_]*)|(?:x[\da-fA-F][\da-fA-F_]*)))|(?:\d[\d_]*))/,null],["lit",/^(?:true|false|nil)\b/,null],["kwd",/^\b(?:__COLUMN__|__FILE__|__FUNCTION__|__LINE__|#available|#else|#elseif|#endif|#if|#line|arch|arm|arm64|associativity|as|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic|dynamicType|else|enum|fallthrough|final|for|func|get|import|indirect|infix|init|inout|internal|i386|if|in|iOS|iOSApplicationExtension|is|lazy|left|let|mutating|none|nonmutating|operator|optional|OSX|OSXApplicationExtension|override|postfix|precedence|prefix|private|protocol|Protocol|public|required|rethrows|return|right|safe|self|set|static|struct|subscript|super|switch|throw|try|Type|typealias|unowned|unsafe|var|weak|watchOS|while|willSet|x86_64)\b/,
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[ \n\r\t\v\f\0]+/,null," \n\r\t\v\f\x00"],["str",/^"(?:[^"\\]|(?:\\.)|(?:\\\((?:[^"\\)]|\\.)*\)))*"/,null,'"']],[["lit",/^(?:(?:0x[\da-fA-F][\da-fA-F_]*\.[\da-fA-F][\da-fA-F_]*[pP]?)|(?:\d[\d_]*\.\d[\d_]*[eE]?))[+-]?\d[\d_]*/,null],["lit",/^-?(?:(?:0(?:(?:b[01][01_]*)|(?:o[0-7][0-7_]*)|(?:x[\da-fA-F][\da-fA-F_]*)))|(?:\d[\d_]*))/,null],["lit",/^(?:true|false|nil)\b/,null],["kwd",/^\b(?:__COLUMN__|__FILE__|__FUNCTION__|__LINE__|#available|#else|#elseif|#endif|#if|#line|arch|arm|arm64|associativity|as|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic|dynamicType|else|enum|extension|fallthrough|final|for|func|get|guard|import|indirect|infix|init|inout|internal|i386|if|in|iOS|iOSApplicationExtension|is|lazy|left|let|mutating|none|nonmutating|operator|optional|OSX|OSXApplicationExtension|override|postfix|precedence|prefix|private|protocol|Protocol|public|required|rethrows|return|right|safe|self|set|static|struct|subscript|super|switch|throw|try|Type|typealias|unowned|unsafe|var|weak|watchOS|while|willSet|x86_64)\b/,


Note to self: adds "extension" and "guard"

yes, this is coming from PR #415

mikesamuel · 2017-01-13T19:26:52Z

js-modules/prettify.js

@@ -59,6 +59,8 @@

 include("defs.js");

+var HACK_TO_FIX_JS_INCLUDE_PL;


Is this required by your port of jsinclude.pl? In another PR?

no, I got rid of it later, along with the perl scripts and the entire makefile.

(some of these fixes were made before I started working on porting to a grunt solution)

Looks harmless and no need to create merge work for the patch PR.

amroamroamro · 2017-01-13T21:50:23Z

The thing is files under loader/ and distrib/ directories, as well as src/(run_)prettify.js, are generated files and should not be manually edited. They are simply the result of running make.

oops, accidentally closed PR.

…s src/lang-rust.js

amroamroamro added 10 commits December 17, 2016 15:45

apply commit eace8e0 to the unprocessed soure code

07792f9

apply commit 2857525 to the unprocessed source code

6dc0793

add new C/C++ keywords and types

f826753

C99: restrict C++11: alignas, noexcept, noreturn C_TYPES (STL containers): array, forward_*, reverse_*, unordered_*

reapply patch from PR googlearchive#384 that was undone by later changes

e2777a9

a hack to fix an issue with js_include.pl

912e731

include('defs.js') in prettify.js was inserted in the wrong place, this is because of the way the perl script expects surrounding lines to look like. So we add a dummy variable declaration without preceding comment lines.

typo, fixes googlearchive#361

81c406f

wrap inside IIFE

505dfb6

doc edits

720cd66

cut a release and commit generated files

c8a660b

amroamroamro requested a review from mikesamuel January 13, 2017 10:22

mikesamuel reviewed Jan 13, 2017

View reviewed changes

amroamroamro closed this Jan 13, 2017

amroamroamro reopened this Jan 13, 2017

amroamroamro added 3 commits January 14, 2017 08:56

doc typo

75a4af8

aliases: simpler file exist check

2d5201f

aliases: sort extensions to ensure deterministic output

574b462

mikesamuel merged commit 04e95f6 into googlearchive:master Jan 18, 2017

amroamroamro deleted the patch-makefile branch January 18, 2017 14:42

amroamroamro mentioned this pull request Jan 19, 2017

Added async, await and yield C# keywords support #463

Closed

amroamroamro referenced this pull request Jan 19, 2017

prettify.js: remove registration of rust language handler which block…

7c60184

…s src/lang-rust.js

amroamroamro mentioned this pull request Mar 13, 2017

Cannot locate/download project archive #479

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Patch 1: makefile + fixes #467

Patch 1: makefile + fixes #467

amroamroamro commented Jan 13, 2017

mikesamuel Jan 13, 2017

amroamroamro Jan 13, 2017 •

edited

mikesamuel Jan 13, 2017

mikesamuel Jan 13, 2017

amroamroamro Jan 13, 2017

mikesamuel Jan 13, 2017

amroamroamro Jan 13, 2017

amroamroamro Jan 13, 2017

mikesamuel Jan 13, 2017

amroamroamro Jan 13, 2017

mikesamuel Jan 13, 2017

amroamroamro Jan 13, 2017

mikesamuel Jan 18, 2017

mikesamuel Jan 13, 2017

amroamroamro Jan 13, 2017

mikesamuel Jan 13, 2017

amroamroamro Jan 13, 2017

mikesamuel Jan 13, 2017

amroamroamro Jan 13, 2017

mikesamuel Jan 13, 2017

amroamroamro Jan 13, 2017

mikesamuel Jan 18, 2017

amroamroamro commented Jan 13, 2017 •

edited

		@@ -59,6 +59,8 @@

		include("defs.js");

		var HACK_TO_FIX_JS_INCLUDE_PL;

Patch 1: makefile + fixes #467

Patch 1: makefile + fixes #467

Conversation

amroamroamro commented Jan 13, 2017

Choose a reason for hiding this comment

amroamroamro Jan 13, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amroamroamro commented Jan 13, 2017 • edited

amroamroamro Jan 13, 2017 •

edited

amroamroamro commented Jan 13, 2017 •

edited