Merge pull request #1 from Polymer/master

pull latest changes from polymer

context-free-parser.js

@@ -1,4 +1,4 @@
-/*
+/**
  * @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
@@ -60,7 +60,7 @@
               };
               entities.push(current);
               break;
-            
+
             // an entity may have these describable sub-features
             case 'attribute':
             case 'property':
@@ -94,7 +94,17 @@
               }
 
               break;
-
+
+            case 'extends':
+            case 'mixins':
+              var parts = content.split(' ');
+              var subObj = {
+                name: parts[0],
+                url: parts[1] || null
+              };
+              makePragma(current, pragma, subObj);
+              break;
+
             // everything else
             default:
               current[pragma] = content;
@@ -127,4 +137,4 @@
     scope.ContextFreeParser = ContextFreeParser;
   }
 
-})(this);
+})(this);

package.json

@@ -0,0 +1,16 @@
+{
+  "name": "polymer-context-free-parser",
+  "version": "0.4.2",
+  "description": "context-free-parser scrapes source documentation data from input text or url.",
+  "main": "context-free-parser.js",
+  "repository": {
+    "type": "git",
+    "url": "ssh://[email protected]/Polymer/context-free-parser.git"
+  },
+  "author": "The Polymer Authors",
+  "license": "BSD",
+  "bugs": {
+    "url": "https://github.com/Polymer/context-free-parser/issues"
+  },
+  "homepage": "https://github.com/Polymer/context-free-parser"
+}