Merge branch 'master' of ssh://github.com/Polymer/context-free-parser

googlearchive · Oct 5, 2014 · c1eefd0 · c1eefd0
2 parents b8b8f3b + 0a7e8cd
commit c1eefd0
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 1 deletion.
diff --git a/context-free-parser.html b/context-free-parser.html
@@ -1,3 +1,12 @@
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
 <script src="context-free-parser.js"></script>
 <link rel="import" href="../core-ajax/core-ajax.html">
 

diff --git a/context-free-parser.js b/context-free-parser.js
@@ -1,3 +1,13 @@
+/*
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
+
 (function(scope) {
 
   var ContextFreeParser = {
@@ -69,6 +79,21 @@
             case 'type':
               subCurrent[pragma] = content;
               break;
+
+            case 'param':
+              var eventParmsRe = /\{(.+)\}\s+(\w+[.\w+]+)\s+(.*)$/;
+
+              var params = content.match(eventParmsRe);
+              if (params) {
+                var subEventObj = {
+                  type: params[1],
+                  name: params[2],
+                  description: params[3]
+                };
+                makePragma(subCurrent, pragma + 's', subEventObj);
+              }
+
+              break;
 
             // everything else
             default:

diff --git a/demo.html b/demo.html
@@ -1,3 +1,12 @@
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
 <!doctype html>
 <html>
 <head>

diff --git a/index.html b/index.html
@@ -11,7 +11,6 @@
 <head>
 
   <script src="../platform/platform.js"></script>
-  <link rel="import" href="../polymer/polymer.html">
   <link rel="import" href="../core-component-page/core-component-page.html">
 
 </head>