'}),i.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),i.prototype.constructor=i,i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent();t.find(".popover-title")[this.options.html?"html":"text"](e),t.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof i?"html":"append":"text"](i),t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},i.prototype.hasContent=function(){return this.getTitle()||this.getContent()},i.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var o=t.fn.popover;t.fn.popover=e,t.fn.popover.Constructor=i,t.fn.popover.noConflict=function(){return t.fn.popover=o,this}}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),n=o.data("bs.tab");n||o.data("bs.tab",n=new i(this)),"string"==typeof e&&n[e]()})}var i=function(e){this.element=t(e)};i.VERSION="3.3.6",i.TRANSITION_DURATION=150,i.prototype.show=function(){var e=this.element,i=e.closest("ul:not(.dropdown-menu)"),o=e.data("target");if(o||(o=e.attr("href"),o=o&&o.replace(/.*(?=#[^\s]*$)/,"")),!e.parent("li").hasClass("active")){var n=i.find(".active:last a"),s=t.Event("hide.bs.tab",{relatedTarget:e[0]}),a=t.Event("show.bs.tab",{relatedTarget:n[0]});if(n.trigger(s),e.trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){var r=t(o);this.activate(e.closest("li"),i),this.activate(r,r.parent(),function(){n.trigger({type:"hidden.bs.tab",relatedTarget:e[0]}),e.trigger({type:"shown.bs.tab",relatedTarget:n[0]})})}}},i.prototype.activate=function(e,o,n){function s(){a.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),e.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),r?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu").length&&e.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),n&&n()}var a=o.find("> .active"),r=n&&t.support.transition&&(a.length&&a.hasClass("fade")||!!o.find("> .fade").length);a.length&&r?a.one("bsTransitionEnd",s).emulateTransitionEnd(i.TRANSITION_DURATION):s(),a.removeClass("in")};var o=t.fn.tab;t.fn.tab=e,t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=o,this};var n=function(i){i.preventDefault(),e.call(t(this),"show")};t(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',n).on("click.bs.tab.data-api",'[data-toggle="pill"]',n)}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),n=o.data("bs.affix"),s="object"==typeof e&&e;n||o.data("bs.affix",n=new i(this,s)),"string"==typeof e&&n[e]()})}var i=function(e,o){this.options=t.extend({},i.DEFAULTS,o),this.$target=t(this.options.target).on("scroll.bs.affix.data-api",t.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",t.proxy(this.checkPositionWithEventLoop,this)),this.$element=t(e),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};i.VERSION="3.3.6",i.RESET="affix affix-top affix-bottom",i.DEFAULTS={offset:0,target:window},i.prototype.getState=function(t,e,i,o){var n=this.$target.scrollTop(),s=this.$element.offset(),a=this.$target.height();if(null!=i&&"top"==this.affixed)return i>n?"top":!1;if("bottom"==this.affixed)return null!=i?n+this.unpin<=s.top?!1:"bottom":t-o>=n+a?!1:"bottom";var r=null==this.affixed,l=r?n:s.top,h=r?a:e;return null!=i&&i>=n?"top":null!=o&&l+h>=t-o?"bottom":!1},i.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(i.RESET).addClass("affix");var t=this.$target.scrollTop(),e=this.$element.offset();return this.pinnedOffset=e.top-t},i.prototype.checkPositionWithEventLoop=function(){setTimeout(t.proxy(this.checkPosition,this),1)},i.prototype.checkPosition=function(){if(this.$element.is(":visible")){var e=this.$element.height(),o=this.options.offset,n=o.top,s=o.bottom,a=Math.max(t(document).height(),t(document.body).height());"object"!=typeof o&&(s=n=o),"function"==typeof n&&(n=o.top(this.$element)),"function"==typeof s&&(s=o.bottom(this.$element));var r=this.getState(a,e,n,s);if(this.affixed!=r){null!=this.unpin&&this.$element.css("top","");var l="affix"+(r?"-"+r:""),h=t.Event(l+".bs.affix");if(this.$element.trigger(h),h.isDefaultPrevented())return;this.affixed=r,this.unpin="bottom"==r?this.getPinnedOffset():null,this.$element.removeClass(i.RESET).addClass(l).trigger(l.replace("affix","affixed")+".bs.affix")}"bottom"==r&&this.$element.offset({top:a-e-s})}};var o=t.fn.affix;t.fn.affix=e,t.fn.affix.Constructor=i,t.fn.affix.noConflict=function(){return t.fn.affix=o,this},t(window).on("load",function(){t('[data-spy="affix"]').each(function(){var i=t(this),o=i.data();o.offset=o.offset||{},null!=o.offsetBottom&&(o.offset.bottom=o.offsetBottom),null!=o.offsetTop&&(o.offset.top=o.offsetTop),e.call(i,o)})})}(jQuery),+function(t){"use strict";function e(e){var i,o=e.attr("data-target")||(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"");return t(o)}function i(e){return this.each(function(){var i=t(this),n=i.data("bs.collapse"),s=t.extend({},o.DEFAULTS,i.data(),"object"==typeof e&&e);!n&&s.toggle&&/show|hide/.test(e)&&(s.toggle=!1),n||i.data("bs.collapse",n=new o(this,s)),"string"==typeof e&&n[e]()})}var o=function(e,i){this.$element=t(e),this.options=t.extend({},o.DEFAULTS,i),this.$trigger=t('[data-toggle="collapse"][href="#'+e.id+'"],[data-toggle="collapse"][data-target="#'+e.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};o.VERSION="3.3.6",o.TRANSITION_DURATION=350,o.DEFAULTS={toggle:!0},o.prototype.dimension=function(){var t=this.$element.hasClass("width");return t?"width":"height"},o.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var e,n=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(n&&n.length&&(e=n.data("bs.collapse"),e&&e.transitioning))){var s=t.Event("show.bs.collapse");if(this.$element.trigger(s),!s.isDefaultPrevented()){n&&n.length&&(i.call(n,"hide"),e||n.data("bs.collapse",null));var a=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[a](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var r=function(){this.$element.removeClass("collapsing").addClass("collapse in")[a](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!t.support.transition)return r.call(this);var l=t.camelCase(["scroll",a].join("-"));this.$element.one("bsTransitionEnd",t.proxy(r,this)).emulateTransitionEnd(o.TRANSITION_DURATION)[a](this.$element[0][l]);
-}}}},o.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var e=t.Event("hide.bs.collapse");if(this.$element.trigger(e),!e.isDefaultPrevented()){var i=this.dimension();this.$element[i](this.$element[i]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var n=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return t.support.transition?void this.$element[i](0).one("bsTransitionEnd",t.proxy(n,this)).emulateTransitionEnd(o.TRANSITION_DURATION):n.call(this)}}},o.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},o.prototype.getParent=function(){return t(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(t.proxy(function(i,o){var n=t(o);this.addAriaAndCollapsedClass(e(n),n)},this)).end()},o.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in");t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)};var n=t.fn.collapse;t.fn.collapse=i,t.fn.collapse.Constructor=o,t.fn.collapse.noConflict=function(){return t.fn.collapse=n,this},t(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(o){var n=t(this);n.attr("data-target")||o.preventDefault();var s=e(n),a=s.data("bs.collapse"),r=a?"toggle":n.data();i.call(s,r)})}(jQuery),+function(t){"use strict";function e(i,o){this.$body=t(document.body),this.$scrollElement=t(t(i).is(document.body)?window:i),this.options=t.extend({},e.DEFAULTS,o),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",t.proxy(this.process,this)),this.refresh(),this.process()}function i(i){return this.each(function(){var o=t(this),n=o.data("bs.scrollspy"),s="object"==typeof i&&i;n||o.data("bs.scrollspy",n=new e(this,s)),"string"==typeof i&&n[i]()})}e.VERSION="3.3.6",e.DEFAULTS={offset:10},e.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},e.prototype.refresh=function(){var e=this,i="offset",o=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),t.isWindow(this.$scrollElement[0])||(i="position",o=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var e=t(this),n=e.data("target")||e.attr("href"),s=/^#./.test(n)&&t(n);return s&&s.length&&s.is(":visible")&&[[s[i]().top+o,n]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){e.offsets.push(this[0]),e.targets.push(this[1])})},e.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),n=this.offsets,s=this.targets,a=this.activeTarget;if(this.scrollHeight!=i&&this.refresh(),e>=o)return a!=(t=s[s.length-1])&&this.activate(t);if(a&&e
| t |
","
"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d","
"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?"| t |
").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(g,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function lc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=lc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0)-a.scrollTop(),c.left+=n.css(a[0],"borderLeftWidth",!0)-a.scrollLeft()),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=lc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){
-n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var mc=a.jQuery,nc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=nc),b&&a.jQuery===n&&(a.jQuery=mc),n},b||(a.jQuery=a.$=n),n});
diff --git a/static/js/katex.min.js.REMOVED.git-id b/static/js/katex.min.js.REMOVED.git-id
deleted file mode 100644
index f46e03e..0000000
--- a/static/js/katex.min.js.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-863b1e8ab46655864ad069d055808141d760208b
\ No newline at end of file
diff --git a/static/js/markdown.js b/static/js/markdown.js
deleted file mode 100644
index a6942b3..0000000
--- a/static/js/markdown.js
+++ /dev/null
@@ -1,807 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"), require("../xml/xml"), require("../meta"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror", "../xml/xml", "../meta"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
-
- var htmlMode = CodeMirror.getMode(cmCfg, "text/html");
- var htmlModeMissing = htmlMode.name == "null"
-
- function getMode(name) {
- if (CodeMirror.findModeByName) {
- var found = CodeMirror.findModeByName(name);
- if (found) name = found.mime || found.mimes[0];
- }
- var mode = CodeMirror.getMode(cmCfg, name);
- return mode.name == "null" ? null : mode;
- }
-
- // Should characters that affect highlighting be highlighted separate?
- // Does not include characters that will be output (such as `1.` and `-` for lists)
- if (modeCfg.highlightFormatting === undefined)
- modeCfg.highlightFormatting = false;
-
- // Maximum number of nested blockquotes. Set to 0 for infinite nesting.
- // Excess `>` will emit `error` token.
- if (modeCfg.maxBlockquoteDepth === undefined)
- modeCfg.maxBlockquoteDepth = 0;
-
- // Should underscores in words open/close em/strong?
- if (modeCfg.underscoresBreakWords === undefined)
- modeCfg.underscoresBreakWords = true;
-
- // Use `fencedCodeBlocks` to configure fenced code blocks. false to
- // disable, string to specify a precise regexp that the fence should
- // match, and true to allow three or more backticks or tildes (as
- // per CommonMark).
-
- // Turn on task lists? ("- [ ] " and "- [x] ")
- if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
-
- // Turn on strikethrough syntax
- if (modeCfg.strikethrough === undefined)
- modeCfg.strikethrough = false;
-
- // Allow token types to be overridden by user-provided token types.
- if (modeCfg.tokenTypeOverrides === undefined)
- modeCfg.tokenTypeOverrides = {};
-
- var tokenTypes = {
- header: "header",
- code: "comment",
- quote: "quote",
- list1: "variable-2",
- list2: "variable-3",
- list3: "keyword",
- hr: "hr",
- image: "tag",
- formatting: "formatting",
- linkInline: "link",
- linkEmail: "link",
- linkText: "link",
- linkHref: "string",
- em: "em",
- strong: "strong",
- strikethrough: "strikethrough"
- };
-
- for (var tokenType in tokenTypes) {
- if (tokenTypes.hasOwnProperty(tokenType) && modeCfg.tokenTypeOverrides[tokenType]) {
- tokenTypes[tokenType] = modeCfg.tokenTypeOverrides[tokenType];
- }
- }
-
- var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
- , ulRE = /^[*\-+]\s+/
- , olRE = /^[0-9]+([.)])\s+/
- , taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
- , atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
- , setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
- , textRE = /^[^#!\[\]*_\\<>` "'(~]+/
- , fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
- ")[ \\t]*([\\w+#]*)");
-
- function switchInline(stream, state, f) {
- state.f = state.inline = f;
- return f(stream, state);
- }
-
- function switchBlock(stream, state, f) {
- state.f = state.block = f;
- return f(stream, state);
- }
-
- function lineIsEmpty(line) {
- return !line || !/\S/.test(line.string)
- }
-
- // Blocks
-
- function blankLine(state) {
- // Reset linkTitle state
- state.linkTitle = false;
- // Reset EM state
- state.em = false;
- // Reset STRONG state
- state.strong = false;
- // Reset strikethrough state
- state.strikethrough = false;
- // Reset state.quote
- state.quote = 0;
- // Reset state.indentedCode
- state.indentedCode = false;
- if (htmlModeMissing && state.f == htmlBlock) {
- state.f = inlineNormal;
- state.block = blockNormal;
- }
- // Reset state.trailingSpace
- state.trailingSpace = 0;
- state.trailingSpaceNewLine = false;
- // Mark this line as blank
- state.prevLine = state.thisLine
- state.thisLine = null
- return null;
- }
-
- function blockNormal(stream, state) {
-
- var sol = stream.sol();
-
- var prevLineIsList = state.list !== false,
- prevLineIsIndentedCode = state.indentedCode;
-
- state.indentedCode = false;
-
- if (prevLineIsList) {
- if (state.indentationDiff >= 0) { // Continued list
- if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
- state.indentation -= state.indentationDiff;
- }
- state.list = null;
- } else if (state.indentation > 0) {
- state.list = null;
- } else { // No longer a list
- state.list = false;
- }
- }
-
- var match = null;
- if (state.indentationDiff >= 4) {
- stream.skipToEnd();
- if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
- state.indentation -= 4;
- state.indentedCode = true;
- return tokenTypes.code;
- } else {
- return null;
- }
- } else if (stream.eatSpace()) {
- return null;
- } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
- state.header = match[1].length;
- if (modeCfg.highlightFormatting) state.formatting = "header";
- state.f = state.inline;
- return getType(state);
- } else if (!lineIsEmpty(state.prevLine) && !state.quote && !prevLineIsList &&
- !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
- state.header = match[0].charAt(0) == '=' ? 1 : 2;
- if (modeCfg.highlightFormatting) state.formatting = "header";
- state.f = state.inline;
- return getType(state);
- } else if (stream.eat('>')) {
- state.quote = sol ? 1 : state.quote + 1;
- if (modeCfg.highlightFormatting) state.formatting = "quote";
- stream.eatSpace();
- return getType(state);
- } else if (stream.peek() === '[') {
- return switchInline(stream, state, footnoteLink);
- } else if (stream.match(hrRE, true)) {
- state.hr = true;
- return tokenTypes.hr;
- } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
- var listType = null;
- if (stream.match(ulRE, true)) {
- listType = 'ul';
- } else {
- stream.match(olRE, true);
- listType = 'ol';
- }
- state.indentation = stream.column() + stream.current().length;
- state.list = true;
-
- // While this list item's marker's indentation
- // is less than the deepest list item's content's indentation,
- // pop the deepest list item indentation off the stack.
- while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) {
- state.listStack.pop();
- }
-
- // Add this list item's content's indentation to the stack
- state.listStack.push(state.indentation);
-
- if (modeCfg.taskLists && stream.match(taskListRE, false)) {
- state.taskList = true;
- }
- state.f = state.inline;
- if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
- return getType(state);
- } else if (modeCfg.fencedCodeBlocks && (match = stream.match(fencedCodeRE, true))) {
- state.fencedChars = match[1]
- // try switching mode
- state.localMode = getMode(match[2]);
- if (state.localMode) state.localState = state.localMode.startState();
- state.f = state.block = local;
- if (modeCfg.highlightFormatting) state.formatting = "code-block";
- state.code = -1
- return getType(state);
- }
-
- return switchInline(stream, state, state.inline);
- }
-
- function htmlBlock(stream, state) {
- var style = htmlMode.token(stream, state.htmlState);
- if (!htmlModeMissing) {
- var inner = CodeMirror.innerMode(htmlMode, state.htmlState)
- if ((inner.mode.name == "xml" && inner.state.tagStart === null &&
- (!inner.state.context && inner.state.tokenize.isInText)) ||
- (state.md_inside && stream.current().indexOf(">") > -1)) {
- state.f = inlineNormal;
- state.block = blockNormal;
- state.htmlState = null;
- }
- }
- return style;
- }
-
- function local(stream, state) {
- if (state.fencedChars && stream.match(state.fencedChars, false)) {
- state.localMode = state.localState = null;
- state.f = state.block = leavingLocal;
- return null;
- } else if (state.localMode) {
- return state.localMode.token(stream, state.localState);
- } else {
- stream.skipToEnd();
- return tokenTypes.code;
- }
- }
-
- function leavingLocal(stream, state) {
- stream.match(state.fencedChars);
- state.block = blockNormal;
- state.f = inlineNormal;
- state.fencedChars = null;
- if (modeCfg.highlightFormatting) state.formatting = "code-block";
- state.code = 1
- var returnType = getType(state);
- state.code = 0
- return returnType;
- }
-
- // Inline
- function getType(state) {
- var styles = [];
-
- if (state.formatting) {
- styles.push(tokenTypes.formatting);
-
- if (typeof state.formatting === "string") state.formatting = [state.formatting];
-
- for (var i = 0; i < state.formatting.length; i++) {
- styles.push(tokenTypes.formatting + "-" + state.formatting[i]);
-
- if (state.formatting[i] === "header") {
- styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.header);
- }
-
- // Add `formatting-quote` and `formatting-quote-#` for blockquotes
- // Add `error` instead if the maximum blockquote nesting depth is passed
- if (state.formatting[i] === "quote") {
- if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
- styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.quote);
- } else {
- styles.push("error");
- }
- }
- }
- }
-
- if (state.taskOpen) {
- styles.push("meta");
- return styles.length ? styles.join(' ') : null;
- }
- if (state.taskClosed) {
- styles.push("property");
- return styles.length ? styles.join(' ') : null;
- }
-
- if (state.linkHref) {
- styles.push(tokenTypes.linkHref, "url");
- } else { // Only apply inline styles to non-url text
- if (state.strong) { styles.push(tokenTypes.strong); }
- if (state.em) { styles.push(tokenTypes.em); }
- if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
- if (state.linkText) { styles.push(tokenTypes.linkText); }
- if (state.code) { styles.push(tokenTypes.code); }
- }
-
- if (state.header) { styles.push(tokenTypes.header, tokenTypes.header + "-" + state.header); }
-
- if (state.quote) {
- styles.push(tokenTypes.quote);
-
- // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth
- if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
- styles.push(tokenTypes.quote + "-" + state.quote);
- } else {
- styles.push(tokenTypes.quote + "-" + modeCfg.maxBlockquoteDepth);
- }
- }
-
- if (state.list !== false) {
- var listMod = (state.listStack.length - 1) % 3;
- if (!listMod) {
- styles.push(tokenTypes.list1);
- } else if (listMod === 1) {
- styles.push(tokenTypes.list2);
- } else {
- styles.push(tokenTypes.list3);
- }
- }
-
- if (state.trailingSpaceNewLine) {
- styles.push("trailing-space-new-line");
- } else if (state.trailingSpace) {
- styles.push("trailing-space-" + (state.trailingSpace % 2 ? "a" : "b"));
- }
-
- return styles.length ? styles.join(' ') : null;
- }
-
- function handleText(stream, state) {
- if (stream.match(textRE, true)) {
- return getType(state);
- }
- return undefined;
- }
-
- function inlineNormal(stream, state) {
- var style = state.text(stream, state);
- if (typeof style !== 'undefined')
- return style;
-
- if (state.list) { // List marker (*, +, -, 1., etc)
- state.list = null;
- return getType(state);
- }
-
- if (state.taskList) {
- var taskOpen = stream.match(taskListRE, true)[1] !== "x";
- if (taskOpen) state.taskOpen = true;
- else state.taskClosed = true;
- if (modeCfg.highlightFormatting) state.formatting = "task";
- state.taskList = false;
- return getType(state);
- }
-
- state.taskOpen = false;
- state.taskClosed = false;
-
- if (state.header && stream.match(/^#+$/, true)) {
- if (modeCfg.highlightFormatting) state.formatting = "header";
- return getType(state);
- }
-
- // Get sol() value now, before character is consumed
- var sol = stream.sol();
-
- var ch = stream.next();
-
- // Matches link titles present on next line
- if (state.linkTitle) {
- state.linkTitle = false;
- var matchCh = ch;
- if (ch === '(') {
- matchCh = ')';
- }
- matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
- var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
- if (stream.match(new RegExp(regex), true)) {
- return tokenTypes.linkHref;
- }
- }
-
- // If this block is changed, it may need to be updated in GFM mode
- if (ch === '`') {
- var previousFormatting = state.formatting;
- if (modeCfg.highlightFormatting) state.formatting = "code";
- stream.eatWhile('`');
- var count = stream.current().length
- if (state.code == 0) {
- state.code = count
- return getType(state)
- } else if (count == state.code) { // Must be exact
- var t = getType(state)
- state.code = 0
- return t
- } else {
- state.formatting = previousFormatting
- return getType(state)
- }
- } else if (state.code) {
- return getType(state);
- }
-
- if (ch === '\\') {
- stream.next();
- if (modeCfg.highlightFormatting) {
- var type = getType(state);
- var formattingEscape = tokenTypes.formatting + "-escape";
- return type ? type + " " + formattingEscape : formattingEscape;
- }
- }
-
- if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
- stream.match(/\[[^\]]*\]/);
- state.inline = state.f = linkHref;
- return tokenTypes.image;
- }
-
- if (ch === '[' && stream.match(/.*\](\(.*\)| ?\[.*\])/, false)) {
- state.linkText = true;
- if (modeCfg.highlightFormatting) state.formatting = "link";
- return getType(state);
- }
-
- if (ch === ']' && state.linkText && stream.match(/\(.*\)| ?\[.*\]/, false)) {
- if (modeCfg.highlightFormatting) state.formatting = "link";
- var type = getType(state);
- state.linkText = false;
- state.inline = state.f = linkHref;
- return type;
- }
-
- if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, false)) {
- state.f = state.inline = linkInline;
- if (modeCfg.highlightFormatting) state.formatting = "link";
- var type = getType(state);
- if (type){
- type += " ";
- } else {
- type = "";
- }
- return type + tokenTypes.linkInline;
- }
-
- if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
- state.f = state.inline = linkInline;
- if (modeCfg.highlightFormatting) state.formatting = "link";
- var type = getType(state);
- if (type){
- type += " ";
- } else {
- type = "";
- }
- return type + tokenTypes.linkEmail;
- }
-
- if (ch === '<' && stream.match(/^(!--|\w)/, false)) {
- var end = stream.string.indexOf(">", stream.pos);
- if (end != -1) {
- var atts = stream.string.substring(stream.start, end);
- if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) state.md_inside = true;
- }
- stream.backUp(1);
- state.htmlState = CodeMirror.startState(htmlMode);
- return switchBlock(stream, state, htmlBlock);
- }
-
- if (ch === '<' && stream.match(/^\/\w*?>/)) {
- state.md_inside = false;
- return "tag";
- }
-
- var ignoreUnderscore = false;
- if (!modeCfg.underscoresBreakWords) {
- if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) {
- var prevPos = stream.pos - 2;
- if (prevPos >= 0) {
- var prevCh = stream.string.charAt(prevPos);
- if (prevCh !== '_' && prevCh.match(/(\w)/, false)) {
- ignoreUnderscore = true;
- }
- }
- }
- }
- if (ch === '*' || (ch === '_' && !ignoreUnderscore)) {
- if (sol && stream.peek() === ' ') {
- // Do nothing, surrounded by newline and space
- } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
- if (modeCfg.highlightFormatting) state.formatting = "strong";
- var t = getType(state);
- state.strong = false;
- return t;
- } else if (!state.strong && stream.eat(ch)) { // Add STRONG
- state.strong = ch;
- if (modeCfg.highlightFormatting) state.formatting = "strong";
- return getType(state);
- } else if (state.em === ch) { // Remove EM
- if (modeCfg.highlightFormatting) state.formatting = "em";
- var t = getType(state);
- state.em = false;
- return t;
- } else if (!state.em) { // Add EM
- state.em = ch;
- if (modeCfg.highlightFormatting) state.formatting = "em";
- return getType(state);
- }
- } else if (ch === ' ') {
- if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces
- if (stream.peek() === ' ') { // Surrounded by spaces, ignore
- return getType(state);
- } else { // Not surrounded by spaces, back up pointer
- stream.backUp(1);
- }
- }
- }
-
- if (modeCfg.strikethrough) {
- if (ch === '~' && stream.eatWhile(ch)) {
- if (state.strikethrough) {// Remove strikethrough
- if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
- var t = getType(state);
- state.strikethrough = false;
- return t;
- } else if (stream.match(/^[^\s]/, false)) {// Add strikethrough
- state.strikethrough = true;
- if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
- return getType(state);
- }
- } else if (ch === ' ') {
- if (stream.match(/^~~/, true)) { // Probably surrounded by space
- if (stream.peek() === ' ') { // Surrounded by spaces, ignore
- return getType(state);
- } else { // Not surrounded by spaces, back up pointer
- stream.backUp(2);
- }
- }
- }
- }
-
- if (ch === ' ') {
- if (stream.match(/ +$/, false)) {
- state.trailingSpace++;
- } else if (state.trailingSpace) {
- state.trailingSpaceNewLine = true;
- }
- }
-
- return getType(state);
- }
-
- function linkInline(stream, state) {
- var ch = stream.next();
-
- if (ch === ">") {
- state.f = state.inline = inlineNormal;
- if (modeCfg.highlightFormatting) state.formatting = "link";
- var type = getType(state);
- if (type){
- type += " ";
- } else {
- type = "";
- }
- return type + tokenTypes.linkInline;
- }
-
- stream.match(/^[^>]+/, true);
-
- return tokenTypes.linkInline;
- }
-
- function linkHref(stream, state) {
- // Check if space, and return NULL if so (to avoid marking the space)
- if(stream.eatSpace()){
- return null;
- }
- var ch = stream.next();
- if (ch === '(' || ch === '[') {
- state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]");
- if (modeCfg.highlightFormatting) state.formatting = "link-string";
- state.linkHref = true;
- return getType(state);
- }
- return 'error';
- }
-
- function getLinkHrefInside(endChar) {
- return function(stream, state) {
- var ch = stream.next();
-
- if (ch === endChar) {
- state.f = state.inline = inlineNormal;
- if (modeCfg.highlightFormatting) state.formatting = "link-string";
- var returnState = getType(state);
- state.linkHref = false;
- return returnState;
- }
-
- if (stream.match(inlineRE(endChar), true)) {
- stream.backUp(1);
- }
-
- state.linkHref = true;
- return getType(state);
- };
- }
-
- function footnoteLink(stream, state) {
- if (stream.match(/^([^\]\\]|\\.)*\]:/, false)) {
- state.f = footnoteLinkInside;
- stream.next(); // Consume [
- if (modeCfg.highlightFormatting) state.formatting = "link";
- state.linkText = true;
- return getType(state);
- }
- return switchInline(stream, state, inlineNormal);
- }
-
- function footnoteLinkInside(stream, state) {
- if (stream.match(/^\]:/, true)) {
- state.f = state.inline = footnoteUrl;
- if (modeCfg.highlightFormatting) state.formatting = "link";
- var returnType = getType(state);
- state.linkText = false;
- return returnType;
- }
-
- stream.match(/^([^\]\\]|\\.)+/, true);
-
- return tokenTypes.linkText;
- }
-
- function footnoteUrl(stream, state) {
- // Check if space, and return NULL if so (to avoid marking the space)
- if(stream.eatSpace()){
- return null;
- }
- // Match URL
- stream.match(/^[^\s]+/, true);
- // Check for link title
- if (stream.peek() === undefined) { // End of line, set flag to check next line
- state.linkTitle = true;
- } else { // More content on line, check if link title
- stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
- }
- state.f = state.inline = inlineNormal;
- return tokenTypes.linkHref + " url";
- }
-
- var savedInlineRE = [];
- function inlineRE(endChar) {
- if (!savedInlineRE[endChar]) {
- // Escape endChar for RegExp (taken from http://stackoverflow.com/a/494122/526741)
- endChar = (endChar+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
- // Match any non-endChar, escaped character, as well as the closing
- // endChar.
- savedInlineRE[endChar] = new RegExp('^(?:[^\\\\]|\\\\.)*?(' + endChar + ')');
- }
- return savedInlineRE[endChar];
- }
-
- var mode = {
- startState: function() {
- return {
- f: blockNormal,
-
- prevLine: null,
- thisLine: null,
-
- block: blockNormal,
- htmlState: null,
- indentation: 0,
-
- inline: inlineNormal,
- text: handleText,
-
- formatting: false,
- linkText: false,
- linkHref: false,
- linkTitle: false,
- code: 0,
- em: false,
- strong: false,
- header: 0,
- hr: false,
- taskList: false,
- list: false,
- listStack: [],
- quote: 0,
- trailingSpace: 0,
- trailingSpaceNewLine: false,
- strikethrough: false,
- fencedChars: null
- };
- },
-
- copyState: function(s) {
- return {
- f: s.f,
-
- prevLine: s.prevLine,
- thisLine: s.thisLine,
-
- block: s.block,
- htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),
- indentation: s.indentation,
-
- localMode: s.localMode,
- localState: s.localMode ? CodeMirror.copyState(s.localMode, s.localState) : null,
-
- inline: s.inline,
- text: s.text,
- formatting: false,
- linkTitle: s.linkTitle,
- code: s.code,
- em: s.em,
- strong: s.strong,
- strikethrough: s.strikethrough,
- header: s.header,
- hr: s.hr,
- taskList: s.taskList,
- list: s.list,
- listStack: s.listStack.slice(0),
- quote: s.quote,
- indentedCode: s.indentedCode,
- trailingSpace: s.trailingSpace,
- trailingSpaceNewLine: s.trailingSpaceNewLine,
- md_inside: s.md_inside,
- fencedChars: s.fencedChars
- };
- },
-
- token: function(stream, state) {
-
- // Reset state.formatting
- state.formatting = false;
-
- if (stream != state.thisLine) {
- var forceBlankLine = state.header || state.hr;
-
- // Reset state.header and state.hr
- state.header = 0;
- state.hr = false;
-
- if (stream.match(/^\s*$/, true) || forceBlankLine) {
- blankLine(state);
- if (!forceBlankLine) return null
- state.prevLine = null
- }
-
- state.prevLine = state.thisLine
- state.thisLine = stream
-
- // Reset state.taskList
- state.taskList = false;
-
- // Reset state.trailingSpace
- state.trailingSpace = 0;
- state.trailingSpaceNewLine = false;
-
- state.f = state.block;
- var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, ' ').length;
- state.indentationDiff = Math.min(indentation - state.indentation, 4);
- state.indentation = state.indentation + state.indentationDiff;
- if (indentation > 0) return null;
- }
- return state.f(stream, state);
- },
-
- innerMode: function(state) {
- if (state.block == htmlBlock) return {state: state.htmlState, mode: htmlMode};
- if (state.localState) return {state: state.localState, mode: state.localMode};
- return {state: state, mode: mode};
- },
-
- blankLine: blankLine,
-
- getType: getType,
-
- fold: "markdown"
- };
- return mode;
-}, "xml");
-
-CodeMirror.defineMIME("text/x-markdown", "markdown");
-
-});
diff --git a/static/js/python.js b/static/js/python.js
deleted file mode 100755
index 196b026..0000000
--- a/static/js/python.js
+++ /dev/null
@@ -1,348 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- "use strict";
-
- function wordRegexp(words) {
- return new RegExp("^((" + words.join(")|(") + "))\\b");
- }
-
- var wordOperators = wordRegexp(["and", "or", "not", "is"]);
- var commonKeywords = ["as", "assert", "break", "class", "continue",
- "def", "del", "elif", "else", "except", "finally",
- "for", "from", "global", "if", "import",
- "lambda", "pass", "raise", "return",
- "try", "while", "with", "yield", "in"];
- var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
- "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
- "enumerate", "eval", "filter", "float", "format", "frozenset",
- "getattr", "globals", "hasattr", "hash", "help", "hex", "id",
- "input", "int", "isinstance", "issubclass", "iter", "len",
- "list", "locals", "map", "max", "memoryview", "min", "next",
- "object", "oct", "open", "ord", "pow", "property", "range",
- "repr", "reversed", "round", "set", "setattr", "slice",
- "sorted", "staticmethod", "str", "sum", "super", "tuple",
- "type", "vars", "zip", "__import__", "NotImplemented",
- "Ellipsis", "__debug__"];
- var py2 = {builtins: ["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
- "file", "intern", "long", "raw_input", "reduce", "reload",
- "unichr", "unicode", "xrange", "False", "True", "None"],
- keywords: ["exec", "print"]};
- var py3 = {builtins: ["ascii", "bytes", "exec", "print"],
- keywords: ["nonlocal", "False", "True", "None", "async", "await"]};
-
- CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
-
- function top(state) {
- return state.scopes[state.scopes.length - 1];
- }
-
- CodeMirror.defineMode("python", function(conf, parserConf) {
- var ERRORCLASS = "error";
-
- var singleDelimiters = parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
- var doubleOperators = parserConf.doubleOperators || /^([!<>]==|<>|<<|>>|\/\/|\*\*)/;
- var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
- var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
-
- if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
- // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
- var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
- var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
- } else {
- var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
- var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
- }
-
- var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
-
- var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
- if (parserConf.extra_keywords != undefined)
- myKeywords = myKeywords.concat(parserConf.extra_keywords);
-
- if (parserConf.extra_builtins != undefined)
- myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
-
- if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
- myKeywords = myKeywords.concat(py3.keywords);
- myBuiltins = myBuiltins.concat(py3.builtins);
- var stringPrefixes = new RegExp("^(([rb]|(br))?('{3}|\"{3}|['\"]))", "i");
- } else {
- myKeywords = myKeywords.concat(py2.keywords);
- myBuiltins = myBuiltins.concat(py2.builtins);
- var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
- }
- var keywords = wordRegexp(myKeywords);
- var builtins = wordRegexp(myBuiltins);
-
- // tokenizers
- function tokenBase(stream, state) {
- if (stream.sol()) state.indent = stream.indentation()
- // Handle scope changes
- if (stream.sol() && top(state).type == "py") {
- var scopeOffset = top(state).offset;
- if (stream.eatSpace()) {
- var lineOffset = stream.indentation();
- if (lineOffset > scopeOffset)
- pushPyScope(state);
- else if (lineOffset < scopeOffset && dedent(stream, state))
- state.errorToken = true;
- return null;
- } else {
- var style = tokenBaseInner(stream, state);
- if (scopeOffset > 0 && dedent(stream, state))
- style += " " + ERRORCLASS;
- return style;
- }
- }
- return tokenBaseInner(stream, state);
- }
-
- function tokenBaseInner(stream, state) {
- if (stream.eatSpace()) return null;
-
- var ch = stream.peek();
-
- // Handle Comments
- if (ch == "#") {
- stream.skipToEnd();
- return "comment";
- }
-
- // Handle Number Literals
- if (stream.match(/^[0-9\.]/, false)) {
- var floatLiteral = false;
- // Floats
- if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
- if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
- if (stream.match(/^\.\d+/)) { floatLiteral = true; }
- if (floatLiteral) {
- // Float literals may be "imaginary"
- stream.eat(/J/i);
- return "number";
- }
- // Integers
- var intLiteral = false;
- // Hex
- if (stream.match(/^0x[0-9a-f]+/i)) intLiteral = true;
- // Binary
- if (stream.match(/^0b[01]+/i)) intLiteral = true;
- // Octal
- if (stream.match(/^0o[0-7]+/i)) intLiteral = true;
- // Decimal
- if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
- // Decimal literals may be "imaginary"
- stream.eat(/J/i);
- // TODO - Can you have imaginary longs?
- intLiteral = true;
- }
- // Zero by itself with no other piece of number.
- if (stream.match(/^0(?![\dx])/i)) intLiteral = true;
- if (intLiteral) {
- // Integer literals may be "long"
- stream.eat(/L/i);
- return "number";
- }
- }
-
- // Handle Strings
- if (stream.match(stringPrefixes)) {
- state.tokenize = tokenStringFactory(stream.current());
- return state.tokenize(stream, state);
- }
-
- // Handle operators and Delimiters
- if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
- return "punctuation";
-
- if (stream.match(doubleOperators) || stream.match(singleOperators))
- return "operator";
-
- if (stream.match(singleDelimiters))
- return "punctuation";
-
- if (state.lastToken == "." && stream.match(identifiers))
- return "property";
-
- if (stream.match(keywords) || stream.match(wordOperators))
- return "keyword";
-
- if (stream.match(builtins))
- return "builtin";
-
- if (stream.match(/^(self|cls)\b/))
- return "variable-2";
-
- if (stream.match(identifiers)) {
- if (state.lastToken == "def" || state.lastToken == "class")
- return "def";
- return "variable";
- }
-
- // Handle non-detected items
- stream.next();
- return ERRORCLASS;
- }
-
- function tokenStringFactory(delimiter) {
- while ("rub".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
- delimiter = delimiter.substr(1);
-
- var singleline = delimiter.length == 1;
- var OUTCLASS = "string";
-
- function tokenString(stream, state) {
- while (!stream.eol()) {
- stream.eatWhile(/[^'"\\]/);
- if (stream.eat("\\")) {
- stream.next();
- if (singleline && stream.eol())
- return OUTCLASS;
- } else if (stream.match(delimiter)) {
- state.tokenize = tokenBase;
- return OUTCLASS;
- } else {
- stream.eat(/['"]/);
- }
- }
- if (singleline) {
- if (parserConf.singleLineStringErrors)
- return ERRORCLASS;
- else
- state.tokenize = tokenBase;
- }
- return OUTCLASS;
- }
- tokenString.isString = true;
- return tokenString;
- }
-
- function pushPyScope(state) {
- while (top(state).type != "py") state.scopes.pop()
- state.scopes.push({offset: top(state).offset + conf.indentUnit,
- type: "py",
- align: null})
- }
-
- function pushBracketScope(stream, state, type) {
- var align = stream.match(/^([\s\[\{\(]|#.*)*$/, false) ? null : stream.column() + 1
- state.scopes.push({offset: state.indent + hangingIndent,
- type: type,
- align: align})
- }
-
- function dedent(stream, state) {
- var indented = stream.indentation();
- while (top(state).offset > indented) {
- if (top(state).type != "py") return true;
- state.scopes.pop();
- }
- return top(state).offset != indented;
- }
-
- function tokenLexer(stream, state) {
- var style = state.tokenize(stream, state);
- var current = stream.current();
-
- // Handle decorators
- if (current == "@") {
- if (parserConf.version && parseInt(parserConf.version, 10) == 3)
- return stream.match(identifiers, false) ? "meta" : "operator";
- else
- return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
- }
-
- if ((style == "variable" || style == "builtin")
- && state.lastToken == "meta")
- style = "meta";
-
- // Handle scope changes.
- if (current == "pass" || current == "return")
- state.dedent += 1;
-
- if (current == "lambda") state.lambda = true;
- if (current == ":" && !state.lambda && top(state).type == "py")
- pushPyScope(state);
-
- var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1;
- if (delimiter_index != -1)
- pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
-
- delimiter_index = "])}".indexOf(current);
- if (delimiter_index != -1) {
- if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
- else return ERRORCLASS;
- }
- if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
- if (state.scopes.length > 1) state.scopes.pop();
- state.dedent -= 1;
- }
-
- return style;
- }
-
- var external = {
- startState: function(basecolumn) {
- return {
- tokenize: tokenBase,
- scopes: [{offset: basecolumn || 0, type: "py", align: null}],
- indent: basecolumn || 0,
- lastToken: null,
- lambda: false,
- dedent: 0
- };
- },
-
- token: function(stream, state) {
- var addErr = state.errorToken;
- if (addErr) state.errorToken = false;
- var style = tokenLexer(stream, state);
-
- if (style && style != "comment")
- state.lastToken = (style == "keyword" || style == "punctuation") ? stream.current() : style;
- if (style == "punctuation") style = null;
-
- if (stream.eol() && state.lambda)
- state.lambda = false;
- return addErr ? style + " " + ERRORCLASS : style;
- },
-
- indent: function(state, textAfter) {
- if (state.tokenize != tokenBase)
- return state.tokenize.isString ? CodeMirror.Pass : 0;
-
- var scope = top(state), closing = scope.type == textAfter.charAt(0)
- if (scope.align != null)
- return scope.align - (closing ? 1 : 0)
- else
- return scope.offset - (closing ? hangingIndent : 0)
- },
-
- electricInput: /^\s*[\}\]\)]$/,
- closeBrackets: {triples: "'\""},
- lineComment: "#",
- fold: "indent"
- };
- return external;
- });
-
- CodeMirror.defineMIME("text/x-python", "python");
-
- var words = function(str) { return str.split(" "); };
-
- CodeMirror.defineMIME("text/x-cython", {
- name: "python",
- extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
- "extern gil include nogil property public"+
- "readonly struct union DEF IF ELIF ELSE")
- });
-
-});
diff --git a/static/js/shell.js b/static/js/shell.js
deleted file mode 100644
index a684e8c..0000000
--- a/static/js/shell.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('shell', function() {
-
- var words = {};
- function define(style, string) {
- var split = string.split(' ');
- for(var i = 0; i < split.length; i++) {
- words[split[i]] = style;
- }
- };
-
- // Atoms
- define('atom', 'true false');
-
- // Keywords
- define('keyword', 'if then do else elif while until for in esac fi fin ' +
- 'fil done exit set unset export function');
-
- // Commands
- define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
- 'curl cut diff echo find gawk gcc get git grep kill killall ln ls make ' +
- 'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
- 'shopt shred source sort sleep ssh start stop su sudo tee telnet top ' +
- 'touch vi vim wall wc wget who write yes zsh');
-
- function tokenBase(stream, state) {
- if (stream.eatSpace()) return null;
-
- var sol = stream.sol();
- var ch = stream.next();
-
- if (ch === '\\') {
- stream.next();
- return null;
- }
- if (ch === '\'' || ch === '"' || ch === '`') {
- state.tokens.unshift(tokenString(ch));
- return tokenize(stream, state);
- }
- if (ch === '#') {
- if (sol && stream.eat('!')) {
- stream.skipToEnd();
- return 'meta'; // 'comment'?
- }
- stream.skipToEnd();
- return 'comment';
- }
- if (ch === '$') {
- state.tokens.unshift(tokenDollar);
- return tokenize(stream, state);
- }
- if (ch === '+' || ch === '=') {
- return 'operator';
- }
- if (ch === '-') {
- stream.eat('-');
- stream.eatWhile(/\w/);
- return 'attribute';
- }
- if (/\d/.test(ch)) {
- stream.eatWhile(/\d/);
- if(stream.eol() || !/\w/.test(stream.peek())) {
- return 'number';
- }
- }
- stream.eatWhile(/[\w-]/);
- var cur = stream.current();
- if (stream.peek() === '=' && /\w+/.test(cur)) return 'def';
- return words.hasOwnProperty(cur) ? words[cur] : null;
- }
-
- function tokenString(quote) {
- return function(stream, state) {
- var next, end = false, escaped = false;
- while ((next = stream.next()) != null) {
- if (next === quote && !escaped) {
- end = true;
- break;
- }
- if (next === '$' && !escaped && quote !== '\'') {
- escaped = true;
- stream.backUp(1);
- state.tokens.unshift(tokenDollar);
- break;
- }
- escaped = !escaped && next === '\\';
- }
- if (end || !escaped) {
- state.tokens.shift();
- }
- return (quote === '`' || quote === ')' ? 'quote' : 'string');
- };
- };
-
- var tokenDollar = function(stream, state) {
- if (state.tokens.length > 1) stream.eat('$');
- var ch = stream.next(), hungry = /\w/;
- if (ch === '{') hungry = /[^}]/;
- if (ch === '(') {
- state.tokens[0] = tokenString(')');
- return tokenize(stream, state);
- }
- if (!/\d/.test(ch)) {
- stream.eatWhile(hungry);
- stream.eat('}');
- }
- state.tokens.shift();
- return 'def';
- };
-
- function tokenize(stream, state) {
- return (state.tokens[0] || tokenBase) (stream, state);
- };
-
- return {
- startState: function() {return {tokens:[]};},
- token: function(stream, state) {
- return tokenize(stream, state);
- },
- lineComment: '#',
- fold: "brace"
- };
-});
-
-CodeMirror.defineMIME('text/x-sh', 'shell');
-
-});
diff --git a/static/js/sweetalert-dev.js b/static/js/sweetalert-dev.js
deleted file mode 100644
index 7e294b8..0000000
--- a/static/js/sweetalert-dev.js
+++ /dev/null
@@ -1,1285 +0,0 @@
-;(function(window, document, undefined) {
- "use strict";
-
- (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o call showInputError with errorMessage
- */
-sweetAlert.showInputError = swal.showInputError = function (errorMessage) {
- var modal = _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getModal();
-
- var $errorIcon = modal.querySelector('.sa-input-error');
- _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.addClass($errorIcon, 'show');
-
- var $errorContainer = modal.querySelector('.sa-error-container');
- _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.addClass($errorContainer, 'show');
-
- $errorContainer.querySelector('p').innerHTML = errorMessage;
-
- setTimeout(function () {
- sweetAlert.enableButtons();
- }, 1);
-
- modal.querySelector('input').focus();
-};
-
-/*
- * Reset input error DOM elements
- */
-sweetAlert.resetInputError = swal.resetInputError = function (event) {
- // If press enter => ignore
- if (event && event.keyCode === 13) {
- return false;
- }
-
- var $modal = _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getModal();
-
- var $errorIcon = $modal.querySelector('.sa-input-error');
- _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($errorIcon, 'show');
-
- var $errorContainer = $modal.querySelector('.sa-error-container');
- _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($errorContainer, 'show');
-};
-
-/*
- * Disable confirm and cancel buttons
- */
-sweetAlert.disableButtons = swal.disableButtons = function (event) {
- var modal = _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getModal();
- var $confirmButton = modal.querySelector('button.confirm');
- var $cancelButton = modal.querySelector('button.cancel');
- $confirmButton.disabled = true;
- $cancelButton.disabled = true;
-};
-
-/*
- * Enable confirm and cancel buttons
- */
-sweetAlert.enableButtons = swal.enableButtons = function (event) {
- var modal = _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getModal();
- var $confirmButton = modal.querySelector('button.confirm');
- var $cancelButton = modal.querySelector('button.cancel');
- $confirmButton.disabled = false;
- $cancelButton.disabled = false;
-};
-
-if (typeof window !== 'undefined') {
- // The 'handle-click' module requires
- // that 'sweetAlert' was set as global.
- window.sweetAlert = window.swal = sweetAlert;
-} else {
- _extend$hexToRgb$isIE8$logStr$colorLuminance.logStr('SweetAlert is a frontend module!');
-}
-module.exports = exports['default'];
-
-},{"./modules/default-params":2,"./modules/handle-click":3,"./modules/handle-dom":4,"./modules/handle-key":5,"./modules/handle-swal-dom":6,"./modules/set-params":8,"./modules/utils":9}],2:[function(require,module,exports){
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
- value: true
-});
-var defaultParams = {
- title: '',
- text: '',
- type: null,
- allowOutsideClick: false,
- showConfirmButton: true,
- showCancelButton: false,
- closeOnConfirm: true,
- closeOnCancel: true,
- confirmButtonText: 'OK',
- confirmButtonColor: '#8CD4F5',
- cancelButtonText: 'Cancel',
- imageUrl: null,
- imageSize: null,
- timer: null,
- customClass: '',
- html: false,
- animation: true,
- allowEscapeKey: true,
- inputType: 'text',
- inputPlaceholder: '',
- inputValue: '',
- showLoaderOnConfirm: false
-};
-
-exports['default'] = defaultParams;
-module.exports = exports['default'];
-
-},{}],3:[function(require,module,exports){
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
- value: true
-});
-
-var _colorLuminance = require('./utils');
-
-var _getModal = require('./handle-swal-dom');
-
-var _hasClass$isDescendant = require('./handle-dom');
-
-/*
- * User clicked on "Confirm"/"OK" or "Cancel"
- */
-var handleButton = function handleButton(event, params, modal) {
- var e = event || window.event;
- var target = e.target || e.srcElement;
-
- var targetedConfirm = target.className.indexOf('confirm') !== -1;
- var targetedOverlay = target.className.indexOf('sweet-overlay') !== -1;
- var modalIsVisible = _hasClass$isDescendant.hasClass(modal, 'visible');
- var doneFunctionExists = params.doneFunction && modal.getAttribute('data-has-done-function') === 'true';
-
- // Since the user can change the background-color of the confirm button programmatically,
- // we must calculate what the color should be on hover/active
- var normalColor, hoverColor, activeColor;
- if (targetedConfirm && params.confirmButtonColor) {
- normalColor = params.confirmButtonColor;
- hoverColor = _colorLuminance.colorLuminance(normalColor, -0.04);
- activeColor = _colorLuminance.colorLuminance(normalColor, -0.14);
- }
-
- function shouldSetConfirmButtonColor(color) {
- if (targetedConfirm && params.confirmButtonColor) {
- target.style.backgroundColor = color;
- }
- }
-
- switch (e.type) {
- case 'mouseover':
- shouldSetConfirmButtonColor(hoverColor);
- break;
-
- case 'mouseout':
- shouldSetConfirmButtonColor(normalColor);
- break;
-
- case 'mousedown':
- shouldSetConfirmButtonColor(activeColor);
- break;
-
- case 'mouseup':
- shouldSetConfirmButtonColor(hoverColor);
- break;
-
- case 'focus':
- var $confirmButton = modal.querySelector('button.confirm');
- var $cancelButton = modal.querySelector('button.cancel');
-
- if (targetedConfirm) {
- $cancelButton.style.boxShadow = 'none';
- } else {
- $confirmButton.style.boxShadow = 'none';
- }
- break;
-
- case 'click':
- var clickedOnModal = modal === target;
- var clickedOnModalChild = _hasClass$isDescendant.isDescendant(modal, target);
-
- // Ignore click outside if allowOutsideClick is false
- if (!clickedOnModal && !clickedOnModalChild && modalIsVisible && !params.allowOutsideClick) {
- break;
- }
-
- if (targetedConfirm && doneFunctionExists && modalIsVisible) {
- handleConfirm(modal, params);
- } else if (doneFunctionExists && modalIsVisible || targetedOverlay) {
- handleCancel(modal, params);
- } else if (_hasClass$isDescendant.isDescendant(modal, target) && target.tagName === 'BUTTON') {
- sweetAlert.close();
- }
- break;
- }
-};
-
-/*
- * User clicked on "Confirm"/"OK"
- */
-var handleConfirm = function handleConfirm(modal, params) {
- var callbackValue = true;
-
- if (_hasClass$isDescendant.hasClass(modal, 'show-input')) {
- callbackValue = modal.querySelector('input').value;
-
- if (!callbackValue) {
- callbackValue = '';
- }
- }
-
- params.doneFunction(callbackValue);
-
- if (params.closeOnConfirm) {
- sweetAlert.close();
- }
- // Disable cancel and confirm button if the parameter is true
- if (params.showLoaderOnConfirm) {
- sweetAlert.disableButtons();
- }
-};
-
-/*
- * User clicked on "Cancel"
- */
-var handleCancel = function handleCancel(modal, params) {
- // Check if callback function expects a parameter (to track cancel actions)
- var functionAsStr = String(params.doneFunction).replace(/\s/g, '');
- var functionHandlesCancel = functionAsStr.substring(0, 9) === 'function(' && functionAsStr.substring(9, 10) !== ')';
-
- if (functionHandlesCancel) {
- params.doneFunction(false);
- }
-
- if (params.closeOnCancel) {
- sweetAlert.close();
- }
-};
-
-exports['default'] = {
- handleButton: handleButton,
- handleConfirm: handleConfirm,
- handleCancel: handleCancel
-};
-module.exports = exports['default'];
-
-},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],4:[function(require,module,exports){
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
- value: true
-});
-var hasClass = function hasClass(elem, className) {
- return new RegExp(' ' + className + ' ').test(' ' + elem.className + ' ');
-};
-
-var addClass = function addClass(elem, className) {
- if (!hasClass(elem, className)) {
- elem.className += ' ' + className;
- }
-};
-
-var removeClass = function removeClass(elem, className) {
- var newClass = ' ' + elem.className.replace(/[\t\r\n]/g, ' ') + ' ';
- if (hasClass(elem, className)) {
- while (newClass.indexOf(' ' + className + ' ') >= 0) {
- newClass = newClass.replace(' ' + className + ' ', ' ');
- }
- elem.className = newClass.replace(/^\s+|\s+$/g, '');
- }
-};
-
-var escapeHtml = function escapeHtml(str) {
- var div = document.createElement('div');
- div.appendChild(document.createTextNode(str));
- return div.innerHTML;
-};
-
-var _show = function _show(elem) {
- elem.style.opacity = '';
- elem.style.display = 'block';
-};
-
-var show = function show(elems) {
- if (elems && !elems.length) {
- return _show(elems);
- }
- for (var i = 0; i < elems.length; ++i) {
- _show(elems[i]);
- }
-};
-
-var _hide = function _hide(elem) {
- elem.style.opacity = '';
- elem.style.display = 'none';
-};
-
-var hide = function hide(elems) {
- if (elems && !elems.length) {
- return _hide(elems);
- }
- for (var i = 0; i < elems.length; ++i) {
- _hide(elems[i]);
- }
-};
-
-var isDescendant = function isDescendant(parent, child) {
- var node = child.parentNode;
- while (node !== null) {
- if (node === parent) {
- return true;
- }
- node = node.parentNode;
- }
- return false;
-};
-
-var getTopMargin = function getTopMargin(elem) {
- elem.style.left = '-9999px';
- elem.style.display = 'block';
-
- var height = elem.clientHeight,
- padding;
- if (typeof getComputedStyle !== 'undefined') {
- // IE 8
- padding = parseInt(getComputedStyle(elem).getPropertyValue('padding-top'), 10);
- } else {
- padding = parseInt(elem.currentStyle.padding);
- }
-
- elem.style.left = '';
- elem.style.display = 'none';
- return '-' + parseInt((height + padding) / 2) + 'px';
-};
-
-var fadeIn = function fadeIn(elem, interval) {
- if (+elem.style.opacity < 1) {
- interval = interval || 16;
- elem.style.opacity = 0;
- elem.style.display = 'block';
- var last = +new Date();
- var tick = (function (_tick) {
- function tick() {
- return _tick.apply(this, arguments);
- }
-
- tick.toString = function () {
- return _tick.toString();
- };
-
- return tick;
- })(function () {
- elem.style.opacity = +elem.style.opacity + (new Date() - last) / 100;
- last = +new Date();
-
- if (+elem.style.opacity < 1) {
- setTimeout(tick, interval);
- }
- });
- tick();
- }
- elem.style.display = 'block'; //fallback IE8
-};
-
-var fadeOut = function fadeOut(elem, interval) {
- interval = interval || 16;
- elem.style.opacity = 1;
- var last = +new Date();
- var tick = (function (_tick2) {
- function tick() {
- return _tick2.apply(this, arguments);
- }
-
- tick.toString = function () {
- return _tick2.toString();
- };
-
- return tick;
- })(function () {
- elem.style.opacity = +elem.style.opacity - (new Date() - last) / 100;
- last = +new Date();
-
- if (+elem.style.opacity > 0) {
- setTimeout(tick, interval);
- } else {
- elem.style.display = 'none';
- }
- });
- tick();
-};
-
-var fireClick = function fireClick(node) {
- // Taken from http://www.nonobtrusive.com/2011/11/29/programatically-fire-crossbrowser-click-event-with-javascript/
- // Then fixed for today's Chrome browser.
- if (typeof MouseEvent === 'function') {
- // Up-to-date approach
- var mevt = new MouseEvent('click', {
- view: window,
- bubbles: false,
- cancelable: true
- });
- node.dispatchEvent(mevt);
- } else if (document.createEvent) {
- // Fallback
- var evt = document.createEvent('MouseEvents');
- evt.initEvent('click', false, false);
- node.dispatchEvent(evt);
- } else if (document.createEventObject) {
- node.fireEvent('onclick');
- } else if (typeof node.onclick === 'function') {
- node.onclick();
- }
-};
-
-var stopEventPropagation = function stopEventPropagation(e) {
- // In particular, make sure the space bar doesn't scroll the main window.
- if (typeof e.stopPropagation === 'function') {
- e.stopPropagation();
- e.preventDefault();
- } else if (window.event && window.event.hasOwnProperty('cancelBubble')) {
- window.event.cancelBubble = true;
- }
-};
-
-exports.hasClass = hasClass;
-exports.addClass = addClass;
-exports.removeClass = removeClass;
-exports.escapeHtml = escapeHtml;
-exports._show = _show;
-exports.show = show;
-exports._hide = _hide;
-exports.hide = hide;
-exports.isDescendant = isDescendant;
-exports.getTopMargin = getTopMargin;
-exports.fadeIn = fadeIn;
-exports.fadeOut = fadeOut;
-exports.fireClick = fireClick;
-exports.stopEventPropagation = stopEventPropagation;
-
-},{}],5:[function(require,module,exports){
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
- value: true
-});
-
-var _stopEventPropagation$fireClick = require('./handle-dom');
-
-var _setFocusStyle = require('./handle-swal-dom');
-
-var handleKeyDown = function handleKeyDown(event, params, modal) {
- var e = event || window.event;
- var keyCode = e.keyCode || e.which;
-
- var $okButton = modal.querySelector('button.confirm');
- var $cancelButton = modal.querySelector('button.cancel');
- var $modalButtons = modal.querySelectorAll('button[tabindex]');
-
- if ([9, 13, 32, 27].indexOf(keyCode) === -1) {
- // Don't do work on keys we don't care about.
- return;
- }
-
- var $targetElement = e.target || e.srcElement;
-
- var btnIndex = -1; // Find the button - note, this is a nodelist, not an array.
- for (var i = 0; i < $modalButtons.length; i++) {
- if ($targetElement === $modalButtons[i]) {
- btnIndex = i;
- break;
- }
- }
-
- if (keyCode === 9) {
- // TAB
- if (btnIndex === -1) {
- // No button focused. Jump to the confirm button.
- $targetElement = $okButton;
- } else {
- // Cycle to the next button
- if (btnIndex === $modalButtons.length - 1) {
- $targetElement = $modalButtons[0];
- } else {
- $targetElement = $modalButtons[btnIndex + 1];
- }
- }
-
- _stopEventPropagation$fireClick.stopEventPropagation(e);
- $targetElement.focus();
-
- if (params.confirmButtonColor) {
- _setFocusStyle.setFocusStyle($targetElement, params.confirmButtonColor);
- }
- } else {
- if (keyCode === 13) {
- if ($targetElement.tagName === 'INPUT') {
- $targetElement = $okButton;
- $okButton.focus();
- }
-
- if (btnIndex === -1) {
- // ENTER/SPACE clicked outside of a button.
- $targetElement = $okButton;
- } else {
- // Do nothing - let the browser handle it.
- $targetElement = undefined;
- }
- } else if (keyCode === 27 && params.allowEscapeKey === true) {
- $targetElement = $cancelButton;
- _stopEventPropagation$fireClick.fireClick($targetElement, e);
- } else {
- // Fallback - let the browser handle it.
- $targetElement = undefined;
- }
- }
-};
-
-exports['default'] = handleKeyDown;
-module.exports = exports['default'];
-
-},{"./handle-dom":4,"./handle-swal-dom":6}],6:[function(require,module,exports){
-'use strict';
-
-var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
-
-Object.defineProperty(exports, '__esModule', {
- value: true
-});
-
-var _hexToRgb = require('./utils');
-
-var _removeClass$getTopMargin$fadeIn$show$addClass = require('./handle-dom');
-
-var _defaultParams = require('./default-params');
-
-var _defaultParams2 = _interopRequireWildcard(_defaultParams);
-
-/*
- * Add modal + overlay to DOM
- */
-
-var _injectedHTML = require('./injected-html');
-
-var _injectedHTML2 = _interopRequireWildcard(_injectedHTML);
-
-var modalClass = '.sweet-alert';
-var overlayClass = '.sweet-overlay';
-
-var sweetAlertInitialize = function sweetAlertInitialize() {
- var sweetWrap = document.createElement('div');
- sweetWrap.innerHTML = _injectedHTML2['default'];
-
- // Append elements to body
- while (sweetWrap.firstChild) {
- document.body.appendChild(sweetWrap.firstChild);
- }
-};
-
-/*
- * Get DOM element of modal
- */
-var getModal = (function (_getModal) {
- function getModal() {
- return _getModal.apply(this, arguments);
- }
-
- getModal.toString = function () {
- return _getModal.toString();
- };
-
- return getModal;
-})(function () {
- var $modal = document.querySelector(modalClass);
-
- if (!$modal) {
- sweetAlertInitialize();
- $modal = getModal();
- }
-
- return $modal;
-});
-
-/*
- * Get DOM element of input (in modal)
- */
-var getInput = function getInput() {
- var $modal = getModal();
- if ($modal) {
- return $modal.querySelector('input');
- }
-};
-
-/*
- * Get DOM element of overlay
- */
-var getOverlay = function getOverlay() {
- return document.querySelector(overlayClass);
-};
-
-/*
- * Add box-shadow style to button (depending on its chosen bg-color)
- */
-var setFocusStyle = function setFocusStyle($button, bgColor) {
- var rgbColor = _hexToRgb.hexToRgb(bgColor);
- $button.style.boxShadow = '0 0 2px rgba(' + rgbColor + ', 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)';
-};
-
-/*
- * Animation when opening modal
- */
-var openModal = function openModal(callback) {
- var $modal = getModal();
- _removeClass$getTopMargin$fadeIn$show$addClass.fadeIn(getOverlay(), 10);
- _removeClass$getTopMargin$fadeIn$show$addClass.show($modal);
- _removeClass$getTopMargin$fadeIn$show$addClass.addClass($modal, 'showSweetAlert');
- _removeClass$getTopMargin$fadeIn$show$addClass.removeClass($modal, 'hideSweetAlert');
-
- window.previousActiveElement = document.activeElement;
- var $okButton = $modal.querySelector('button.confirm');
- $okButton.focus();
-
- setTimeout(function () {
- _removeClass$getTopMargin$fadeIn$show$addClass.addClass($modal, 'visible');
- }, 500);
-
- var timer = $modal.getAttribute('data-timer');
-
- if (timer !== 'null' && timer !== '') {
- var timerCallback = callback;
- $modal.timeout = setTimeout(function () {
- var doneFunctionExists = (timerCallback || null) && $modal.getAttribute('data-has-done-function') === 'true';
- if (doneFunctionExists) {
- timerCallback(null);
- } else {
- sweetAlert.close();
- }
- }, timer);
- }
-};
-
-/*
- * Reset the styling of the input
- * (for example if errors have been shown)
- */
-var resetInput = function resetInput() {
- var $modal = getModal();
- var $input = getInput();
-
- _removeClass$getTopMargin$fadeIn$show$addClass.removeClass($modal, 'show-input');
- $input.value = _defaultParams2['default'].inputValue;
- $input.setAttribute('type', _defaultParams2['default'].inputType);
- $input.setAttribute('placeholder', _defaultParams2['default'].inputPlaceholder);
-
- resetInputError();
-};
-
-var resetInputError = function resetInputError(event) {
- // If press enter => ignore
- if (event && event.keyCode === 13) {
- return false;
- }
-
- var $modal = getModal();
-
- var $errorIcon = $modal.querySelector('.sa-input-error');
- _removeClass$getTopMargin$fadeIn$show$addClass.removeClass($errorIcon, 'show');
-
- var $errorContainer = $modal.querySelector('.sa-error-container');
- _removeClass$getTopMargin$fadeIn$show$addClass.removeClass($errorContainer, 'show');
-};
-
-/*
- * Set "margin-top"-property on modal based on its computed height
- */
-var fixVerticalPosition = function fixVerticalPosition() {
- var $modal = getModal();
- $modal.style.marginTop = _removeClass$getTopMargin$fadeIn$show$addClass.getTopMargin(getModal());
-};
-
-exports.sweetAlertInitialize = sweetAlertInitialize;
-exports.getModal = getModal;
-exports.getOverlay = getOverlay;
-exports.getInput = getInput;
-exports.setFocusStyle = setFocusStyle;
-exports.openModal = openModal;
-exports.resetInput = resetInput;
-exports.resetInputError = resetInputError;
-exports.fixVerticalPosition = fixVerticalPosition;
-
-},{"./default-params":2,"./handle-dom":4,"./injected-html":7,"./utils":9}],7:[function(require,module,exports){
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-var injectedHTML =
-
-// Dark overlay
-"" +
-
-// Modal
-"
'); - - /* - * Text - */ - $text.innerHTML = params.html ? params.text : _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.text || '').split('\n').join('
'); - if (params.text) _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.show($text); - - /* - * Custom class - */ - if (params.customClass) { - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass(modal, params.customClass); - modal.setAttribute('data-custom-class', params.customClass); - } else { - // Find previously set classes and remove them - var customClass = modal.getAttribute('data-custom-class'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.removeClass(modal, customClass); - modal.setAttribute('data-custom-class', ''); - } - - /* - * Icon - */ - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.hide(modal.querySelectorAll('.sa-icon')); - - if (params.type && !_isIE8.isIE8()) { - var _ret = (function () { - - var validType = false; - - for (var i = 0; i < alertTypes.length; i++) { - if (params.type === alertTypes[i]) { - validType = true; - break; - } - } - - if (!validType) { - logStr('Unknown alert type: ' + params.type); - return { - v: false - }; - } - - var typesWithIcons = ['success', 'error', 'warning', 'info']; - var $icon = undefined; - - if (typesWithIcons.indexOf(params.type) !== -1) { - $icon = modal.querySelector('.sa-icon.' + 'sa-' + params.type); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.show($icon); - } - - var $input = _getModal$getInput$setFocusStyle.getInput(); - - // Animate icon - switch (params.type) { - - case 'success': - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon, 'animate'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-tip'), 'animateSuccessTip'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-long'), 'animateSuccessLong'); - break; - - case 'error': - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon, 'animateErrorIcon'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-x-mark'), 'animateXMark'); - break; - - case 'warning': - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon, 'pulseWarning'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-body'), 'pulseWarningIns'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-dot'), 'pulseWarningIns'); - break; - - case 'input': - case 'prompt': - $input.setAttribute('type', params.inputType); - $input.value = params.inputValue; - $input.setAttribute('placeholder', params.inputPlaceholder); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass(modal, 'show-input'); - setTimeout(function () { - $input.focus(); - $input.addEventListener('keyup', swal.resetInputError); - }, 400); - break; - } - })(); - - if (typeof _ret === 'object') { - return _ret.v; - } - } - - /* - * Custom image - */ - if (params.imageUrl) { - var $customIcon = modal.querySelector('.sa-icon.sa-custom'); - - $customIcon.style.backgroundImage = 'url(' + params.imageUrl + ')'; - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.show($customIcon); - - var _imgWidth = 80; - var _imgHeight = 80; - - if (params.imageSize) { - var dimensions = params.imageSize.toString().split('x'); - var imgWidth = dimensions[0]; - var imgHeight = dimensions[1]; - - if (!imgWidth || !imgHeight) { - logStr('Parameter imageSize expects value with format WIDTHxHEIGHT, got ' + params.imageSize); - } else { - _imgWidth = imgWidth; - _imgHeight = imgHeight; - } - } - - $customIcon.setAttribute('style', $customIcon.getAttribute('style') + 'width:' + _imgWidth + 'px; height:' + _imgHeight + 'px'); - } - - /* - * Show cancel button? - */ - modal.setAttribute('data-has-cancel-button', params.showCancelButton); - if (params.showCancelButton) { - $cancelBtn.style.display = 'inline-block'; - } else { - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.hide($cancelBtn); - } - - /* - * Show confirm button? - */ - modal.setAttribute('data-has-confirm-button', params.showConfirmButton); - if (params.showConfirmButton) { - $confirmBtn.style.display = 'inline-block'; - } else { - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.hide($confirmBtn); - } - - /* - * Custom text on cancel/confirm buttons - */ - if (params.cancelButtonText) { - $cancelBtn.innerHTML = _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.cancelButtonText); - } - if (params.confirmButtonText) { - $confirmBtn.innerHTML = _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.confirmButtonText); - } - - /* - * Custom color on confirm button - */ - if (params.confirmButtonColor) { - // Set confirm button to selected background color - $confirmBtn.style.backgroundColor = params.confirmButtonColor; - - // Set the confirm button color to the loading ring - $confirmBtn.style.borderLeftColor = params.confirmLoadingButtonColor; - $confirmBtn.style.borderRightColor = params.confirmLoadingButtonColor; - - // Set box-shadow to default focused button - _getModal$getInput$setFocusStyle.setFocusStyle($confirmBtn, params.confirmButtonColor); - } - - /* - * Allow outside click - */ - modal.setAttribute('data-allow-outside-click', params.allowOutsideClick); - - /* - * Callback function - */ - var hasDoneFunction = params.doneFunction ? true : false; - modal.setAttribute('data-has-done-function', hasDoneFunction); - - /* - * Animation - */ - if (!params.animation) { - modal.setAttribute('data-animation', 'none'); - } else if (typeof params.animation === 'string') { - modal.setAttribute('data-animation', params.animation); // Custom animation - } else { - modal.setAttribute('data-animation', 'pop'); - } - - /* - * Timer - */ - modal.setAttribute('data-timer', params.timer); -}; - -exports['default'] = setParameters; -module.exports = exports['default']; - -},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],9:[function(require,module,exports){ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); -/* - * Allow user to pass their own params - */ -var extend = function extend(a, b) { - for (var key in b) { - if (b.hasOwnProperty(key)) { - a[key] = b[key]; - } - } - return a; -}; - -/* - * Convert HEX codes to RGB values (#000000 -> rgb(0,0,0)) - */ -var hexToRgb = function hexToRgb(hex) { - var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); - return result ? parseInt(result[1], 16) + ', ' + parseInt(result[2], 16) + ', ' + parseInt(result[3], 16) : null; -}; - -/* - * Check if the user is using Internet Explorer 8 (for fallbacks) - */ -var isIE8 = function isIE8() { - return window.attachEvent && !window.addEventListener; -}; - -/* - * IE compatible logging for developers - */ -var logStr = function logStr(string) { - if (window.console) { - // IE... - window.console.log('SweetAlert: ' + string); - } -}; - -/* - * Set hover, active and focus-states for buttons - * (source: http://www.sitepoint.com/javascript-generate-lighter-darker-color) - */ -var colorLuminance = function colorLuminance(hex, lum) { - // Validate hex string - hex = String(hex).replace(/[^0-9a-f]/gi, ''); - if (hex.length < 6) { - hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2]; - } - lum = lum || 0; - - // Convert to decimal and change luminosity - var rgb = '#'; - var c; - var i; - - for (i = 0; i < 3; i++) { - c = parseInt(hex.substr(i * 2, 2), 16); - c = Math.round(Math.min(Math.max(0, c + c * lum), 255)).toString(16); - rgb += ('00' + c).substr(c.length); - } - - return rgb; -}; - -exports.extend = extend; -exports.hexToRgb = hexToRgb; -exports.isIE8 = isIE8; -exports.logStr = logStr; -exports.colorLuminance = colorLuminance; - -},{}]},{},[1]) -//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["node_modules/browserify/node_modules/browser-pack/_prelude.js","/Users/Tristan/dev/SweetAlert/dev/sweetalert.es6.js","/Users/Tristan/dev/SweetAlert/dev/modules/default-params.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-click.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-dom.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-key.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-swal-dom.js","/Users/Tristan/dev/SweetAlert/dev/modules/injected-html.js","/Users/Tristan/dev/SweetAlert/dev/modules/set-params.js","/Users/Tristan/dev/SweetAlert/dev/modules/utils.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;sJCgBO,sBAAsB;;;;;;2DAWtB,iBAAiB;;;;;;wHAcjB,2BAA2B;;;;uDAIwB,wBAAwB;;6BACxD,sBAAsB;;;;;;6BAItB,0BAA0B;;;;6BAC1B,sBAAsB;;;;;;;;AAMhD,IAAI,qBAAqB,CAAC;AAC1B,IAAI,iBAAiB,CAAC;;;;;;AAOtB,IAAI,UAAU,EAAE,IAAI,CAAC;;qBAEN,UAAU,GAAG,IAAI,GAAG,YAAW;AAC5C,MAAI,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;;AAElC,0IA9DU,QAAQ,CA8DT,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;AAC1C,4GAhCA,UAAU,EAgCE,CAAC;;;;;;;AAOb,WAAS,iBAAiB,CAAC,GAAG,EAAE;AAC9B,QAAI,IAAI,GAAG,cAAc,CAAC;AAC1B,WAAO,AAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,GAAK,2BAAc,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;GACpE;;AAED,MAAI,cAAc,KAAK,SAAS,EAAE;AAChC,iDA3DF,MAAM,CA2DG,0CAA0C,CAAC,CAAC;AACnD,WAAO,KAAK,CAAC;GACd;;AAED,MAAI,MAAM,GAAG,6CAlEb,MAAM,CAkEc,EAAE,6BAAgB,CAAC;;AAEvC,UAAQ,OAAO,cAAc;;;AAG3B,SAAK,QAAQ;AACX,YAAM,CAAC,KAAK,GAAG,cAAc,CAAC;AAC9B,YAAM,CAAC,IAAI,GAAI,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAClC,YAAM,CAAC,IAAI,GAAI,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAClC,YAAM;;AAAA;AAGR,SAAK,QAAQ;AACX,UAAI,cAAc,CAAC,KAAK,KAAK,SAAS,EAAE;AACtC,qDA7EN,MAAM,CA6EO,2BAA2B,CAAC,CAAC;AACpC,eAAO,KAAK,CAAC;OACd;;AAED,YAAM,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;;AAEpC,WAAK,IAAI,UAAU,gCAAmB;AACpC,cAAM,CAAC,UAAU,CAAC,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;OACpD;;;AAGD,YAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,GAAG,SAAS,GAAG,2BAAc,iBAAiB,CAAC;AACjG,YAAM,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;;;AAGlE,YAAM,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;;AAE3C,YAAM;;AAAA,AAER;AACE,mDAjGJ,MAAM,CAiGK,kEAAkE,GAAG,OAAO,cAAc,CAAC,CAAC;AACnG,aAAO,KAAK,CAAC;;AAAA,GAEhB;;AAED,6BAAc,MAAM,CAAC,CAAC;AACtB,4GAxFA,mBAAmB,EAwFE,CAAC;AACtB,4GA3FA,SAAS,CA2FC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;;;AAGxB,MAAI,KAAK,GAAG,0GAlGZ,QAAQ,EAkGc,CAAC;;;;;AAMvB,MAAI,QAAQ,GAAG,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;AAChD,MAAI,YAAY,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AACnG,MAAI,aAAa,GAAG,uBAAC,CAAC;WAAK,yCA/FpB,YAAY,CA+FqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC;GAAA,CAAC;;AAE1D,OAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;AAC7D,SAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;AACjE,UAAI,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;AACpC,cAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;KAC5C;GACF;;;AAGD,4GAnHA,UAAU,EAmHE,CAAC,OAAO,GAAG,aAAa,CAAC;;AAErC,uBAAqB,GAAG,MAAM,CAAC,SAAS,CAAC;;AAEzC,MAAI,UAAU,GAAG,oBAAC,CAAC;WAAK,2BAAc,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC;GAAA,CAAC;AACxD,QAAM,CAAC,SAAS,GAAG,UAAU,CAAC;;AAE9B,QAAM,CAAC,OAAO,GAAG,YAAY;;AAE3B,cAAU,CAAC,YAAY;;;AAGrB,UAAI,iBAAiB,KAAK,SAAS,EAAE;AACnC,yBAAiB,CAAC,KAAK,EAAE,CAAC;AAC1B,yBAAiB,GAAG,SAAS,CAAC;OAC/B;KACF,EAAE,CAAC,CAAC,CAAC;GACP,CAAC;;;AAGF,MAAI,CAAC,aAAa,EAAE,CAAC;CACtB;;;;;;AAQD,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,GAAG,UAAS,UAAU,EAAE;AAC/D,MAAI,CAAC,UAAU,EAAE;AACf,UAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;GAC3C;AACD,MAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;AAClC,UAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;GAClD;;AAED,+CArKA,MAAM,6BAqKgB,UAAU,CAAC,CAAC;CACnC,CAAC;;;;;AAMF,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,YAAW;AACzC,MAAI,KAAK,GAAG,0GAjKZ,QAAQ,EAiKc,CAAC;;AAEvB,0IAxLQ,OAAO,CAwLP,0GAlKR,UAAU,EAkKU,EAAE,CAAC,CAAC,CAAC;AACzB,0IAzLQ,OAAO,CAyLP,KAAK,EAAE,CAAC,CAAC,CAAC;AAClB,0IA/LoB,WAAW,CA+LnB,KAAK,EAAE,gBAAgB,CAAC,CAAC;AACrC,0IAhMU,QAAQ,CAgMT,KAAK,EAAE,gBAAgB,CAAC,CAAC;AAClC,0IAjMoB,WAAW,CAiMnB,KAAK,EAAE,SAAS,CAAC,CAAC;;;;;AAK9B,MAAI,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAC9D,0IAvMoB,WAAW,CAuMnB,YAAY,EAAE,SAAS,CAAC,CAAC;AACrC,0IAxMoB,WAAW,CAwMnB,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC,CAAC;AACxE,0IAzMoB,WAAW,CAyMnB,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC,CAAC;;AAE1E,MAAI,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;AAC1D,0IA5MoB,WAAW,CA4MnB,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAC5C,0IA7MoB,WAAW,CA6MnB,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,CAAC;;AAEpE,MAAI,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAC9D,0IAhNoB,WAAW,CAgNnB,YAAY,EAAE,cAAc,CAAC,CAAC;AAC1C,0IAjNoB,WAAW,CAiNnB,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;AACvE,0IAlNoB,WAAW,CAkNnB,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAC;;;AAGtE,YAAU,CAAC,YAAW;AACpB,QAAI,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAC1D,4IAvNkB,WAAW,CAuNjB,KAAK,EAAE,WAAW,CAAC,CAAC;GACjC,EAAE,GAAG,CAAC,CAAC;;;AAGR,0IA3NoB,WAAW,CA2NnB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;;;AAG7C,QAAM,CAAC,SAAS,GAAG,qBAAqB,CAAC;AACzC,MAAI,MAAM,CAAC,qBAAqB,EAAE;AAChC,UAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;GACtC;AACD,mBAAiB,GAAG,SAAS,CAAC;AAC9B,cAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;;AAE5B,SAAO,IAAI,CAAC;CACb,CAAC;;;;;;AAOF,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,GAAG,UAAS,YAAY,EAAE;AACvE,MAAI,KAAK,GAAG,0GApNZ,QAAQ,EAoNc,CAAC;;AAEvB,MAAI,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;AACxD,0IAjPU,QAAQ,CAiPT,UAAU,EAAE,MAAM,CAAC,CAAC;;AAE7B,MAAI,eAAe,GAAG,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AACjE,0IApPU,QAAQ,CAoPT,eAAe,EAAE,MAAM,CAAC,CAAC;;AAElC,iBAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,YAAY,CAAC;;AAE5D,YAAU,CAAC,YAAW;AACpB,cAAU,CAAC,aAAa,EAAE,CAAC;GAC5B,EAAE,CAAC,CAAC,CAAC;;AAEN,OAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;CACtC,CAAC;;;;;AAMF,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,GAAG,UAAS,KAAK,EAAE;;AAElE,MAAI,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE,EAAE;AACjC,WAAO,KAAK,CAAC;GACd;;AAED,MAAI,MAAM,GAAG,0GA/Ob,QAAQ,EA+Oe,CAAC;;AAExB,MAAI,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;AACzD,0IA5QoB,WAAW,CA4QnB,UAAU,EAAE,MAAM,CAAC,CAAC;;AAEhC,MAAI,eAAe,GAAG,MAAM,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAClE,0IA/QoB,WAAW,CA+QnB,eAAe,EAAE,MAAM,CAAC,CAAC;CACtC,CAAC;;;;;AAKF,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,GAAG,UAAS,KAAK,EAAE;AAChE,MAAI,KAAK,GAAG,0GA5PZ,QAAQ,EA4Pc,CAAC;AACvB,MAAI,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AAC3D,MAAI,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;AACzD,gBAAc,CAAC,QAAQ,GAAG,IAAI,CAAC;AAC/B,eAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;CAC/B,CAAC;;;;;AAKF,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,GAAG,UAAS,KAAK,EAAE;AAC9D,MAAI,KAAK,GAAG,0GAvQZ,QAAQ,EAuQc,CAAC;AACvB,MAAI,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AAC3D,MAAI,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;AACzD,gBAAc,CAAC,QAAQ,GAAG,KAAK,CAAC;AAChC,eAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;CAChC,CAAC;;AAEF,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;;;AAGjC,QAAM,CAAC,UAAU,GAAG,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC;CAC9C,MAAM;AACL,+CA5RA,MAAM,CA4RC,kCAAkC,CAAC,CAAC;CAC5C;;;;;;;;;ACtTD,IAAI,aAAa,GAAG;AAClB,OAAK,EAAE,EAAE;AACT,MAAI,EAAE,EAAE;AACR,MAAI,EAAE,IAAI;AACV,mBAAiB,EAAE,KAAK;AACxB,mBAAiB,EAAE,IAAI;AACvB,kBAAgB,EAAE,KAAK;AACvB,gBAAc,EAAE,IAAI;AACpB,eAAa,EAAE,IAAI;AACnB,mBAAiB,EAAE,IAAI;AACvB,oBAAkB,EAAE,SAAS;AAC7B,kBAAgB,EAAE,QAAQ;AAC1B,UAAQ,EAAE,IAAI;AACd,WAAS,EAAE,IAAI;AACf,OAAK,EAAE,IAAI;AACX,aAAW,EAAE,EAAE;AACf,MAAI,EAAE,KAAK;AACX,WAAS,EAAE,IAAI;AACf,gBAAc,EAAE,IAAI;AACpB,WAAS,EAAE,MAAM;AACjB,kBAAgB,EAAE,EAAE;AACpB,YAAU,EAAE,EAAE;AACd,qBAAmB,EAAE,KAAK;CAC3B,CAAC;;qBAEa,aAAa;;;;;;;;;;8BCzBG,SAAS;;wBACf,mBAAmB;;qCACL,cAAc;;;;;AAMrD,IAAI,YAAY,GAAG,sBAAS,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;AAChD,MAAI,CAAC,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;AAC9B,MAAI,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC;;AAEtC,MAAI,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AACjE,MAAI,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;AACvE,MAAI,cAAc,GAAI,uBAZf,QAAQ,CAYgB,KAAK,EAAE,SAAS,CAAC,CAAC;AACjD,MAAI,kBAAkB,GAAI,MAAM,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,CAAC,wBAAwB,CAAC,KAAK,MAAM,AAAC,CAAC;;;;AAI1G,MAAI,WAAW,EAAE,UAAU,EAAE,WAAW,CAAC;AACzC,MAAI,eAAe,IAAI,MAAM,CAAC,kBAAkB,EAAE;AAChD,eAAW,GAAI,MAAM,CAAC,kBAAkB,CAAC;AACzC,cAAU,GAAK,gBAtBV,cAAc,CAsBW,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC;AAClD,eAAW,GAAI,gBAvBV,cAAc,CAuBW,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC;GACnD;;AAED,WAAS,2BAA2B,CAAC,KAAK,EAAE;AAC1C,QAAI,eAAe,IAAI,MAAM,CAAC,kBAAkB,EAAE;AAChD,YAAM,CAAC,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC;KACtC;GACF;;AAED,UAAQ,CAAC,CAAC,IAAI;AACZ,SAAK,WAAW;AACd,iCAA2B,CAAC,UAAU,CAAC,CAAC;AACxC,YAAM;;AAAA,AAER,SAAK,UAAU;AACb,iCAA2B,CAAC,WAAW,CAAC,CAAC;AACzC,YAAM;;AAAA,AAER,SAAK,WAAW;AACd,iCAA2B,CAAC,WAAW,CAAC,CAAC;AACzC,YAAM;;AAAA,AAER,SAAK,SAAS;AACZ,iCAA2B,CAAC,UAAU,CAAC,CAAC;AACxC,YAAM;;AAAA,AAER,SAAK,OAAO;AACV,UAAI,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AAC3D,UAAI,aAAa,GAAI,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;;AAE1D,UAAI,eAAe,EAAE;AACnB,qBAAa,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;OACxC,MAAM;AACL,sBAAc,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;OACzC;AACD,YAAM;;AAAA,AAER,SAAK,OAAO;AACV,UAAI,cAAc,GAAI,KAAK,KAAK,MAAM,AAAC,CAAC;AACxC,UAAI,mBAAmB,GAAG,uBA5Db,YAAY,CA4Dc,KAAK,EAAE,MAAM,CAAC,CAAC;;;AAGtD,UAAI,CAAC,cAAc,IAAI,CAAC,mBAAmB,IAAI,cAAc,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;AAC1F,cAAM;OACP;;AAED,UAAI,eAAe,IAAI,kBAAkB,IAAI,cAAc,EAAE;AAC3D,qBAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;OAC9B,MAAM,IAAI,kBAAkB,IAAI,cAAc,IAAI,eAAe,EAAE;AAClE,oBAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;OAC7B,MAAM,IAAI,uBAvEE,YAAY,CAuED,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE;AACrE,kBAAU,CAAC,KAAK,EAAE,CAAC;OACpB;AACD,YAAM;AAAA,GACT;CACF,CAAC;;;;;AAKF,IAAI,aAAa,GAAG,uBAAS,KAAK,EAAE,MAAM,EAAE;AAC1C,MAAI,aAAa,GAAG,IAAI,CAAC;;AAEzB,MAAI,uBApFG,QAAQ,CAoFF,KAAK,EAAE,YAAY,CAAC,EAAE;AACjC,iBAAa,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;;AAEnD,QAAI,CAAC,aAAa,EAAE;AAClB,mBAAa,GAAG,EAAE,CAAC;KACpB;GACF;;AAED,QAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;;AAEnC,MAAI,MAAM,CAAC,cAAc,EAAE;AACzB,cAAU,CAAC,KAAK,EAAE,CAAC;GACpB;;AAED,MAAI,MAAM,CAAC,mBAAmB,EAAE;AAC9B,cAAU,CAAC,cAAc,EAAE,CAAC;GAC7B;CACF,CAAC;;;;;AAKF,IAAI,YAAY,GAAG,sBAAS,KAAK,EAAE,MAAM,EAAE;;AAEzC,MAAI,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACnE,MAAI,qBAAqB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,WAAW,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC;;AAEpH,MAAI,qBAAqB,EAAE;AACzB,UAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;GAC5B;;AAED,MAAI,MAAM,CAAC,aAAa,EAAE;AACxB,cAAU,CAAC,KAAK,EAAE,CAAC;GACpB;CACF,CAAC;;qBAGa;AACb,cAAY,EAAZ,YAAY;AACZ,eAAa,EAAb,aAAa;AACb,cAAY,EAAZ,YAAY;CACb;;;;;;;;;AC/HD,IAAI,QAAQ,GAAG,kBAAS,IAAI,EAAE,SAAS,EAAE;AACvC,SAAO,IAAI,MAAM,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC;CAC3E,CAAC;;AAEF,IAAI,QAAQ,GAAG,kBAAS,IAAI,EAAE,SAAS,EAAE;AACvC,MAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;AAC9B,QAAI,CAAC,SAAS,IAAI,GAAG,GAAG,SAAS,CAAC;GACnC;CACF,CAAC;;AAEF,IAAI,WAAW,GAAG,qBAAS,IAAI,EAAE,SAAS,EAAE;AAC1C,MAAI,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;AACpE,MAAI,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;AAC7B,WAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE;AACnD,cAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;KACzD;AACD,QAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;GACrD;CACF,CAAC;;AAEF,IAAI,UAAU,GAAG,oBAAS,GAAG,EAAE;AAC7B,MAAI,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AACxC,KAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9C,SAAO,GAAG,CAAC,SAAS,CAAC;CACtB,CAAC;;AAEF,IAAI,KAAK,GAAG,eAAS,IAAI,EAAE;AACzB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC;AACxB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;CAC9B,CAAC;;AAEF,IAAI,IAAI,GAAG,cAAS,KAAK,EAAE;AACzB,MAAI,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;AAC1B,WAAO,KAAK,CAAC,KAAK,CAAC,CAAC;GACrB;AACD,OAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;AACrC,SAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;GACjB;CACF,CAAC;;AAEF,IAAI,KAAK,GAAG,eAAS,IAAI,EAAE;AACzB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC;AACxB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;CAC7B,CAAC;;AAEF,IAAI,IAAI,GAAG,cAAS,KAAK,EAAE;AACzB,MAAI,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;AAC1B,WAAO,KAAK,CAAC,KAAK,CAAC,CAAC;GACrB;AACD,OAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;AACrC,SAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;GACjB;CACF,CAAC;;AAEF,IAAI,YAAY,GAAG,sBAAS,MAAM,EAAE,KAAK,EAAE;AACzC,MAAI,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC;AAC5B,SAAO,IAAI,KAAK,IAAI,EAAE;AACpB,QAAI,IAAI,KAAK,MAAM,EAAE;AACnB,aAAO,IAAI,CAAC;KACb;AACD,QAAI,GAAG,IAAI,CAAC,UAAU,CAAC;GACxB;AACD,SAAO,KAAK,CAAC;CACd,CAAC;;AAEF,IAAI,YAAY,GAAG,sBAAS,IAAI,EAAE;AAChC,MAAI,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC;AAC5B,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;;AAE7B,MAAI,MAAM,GAAG,IAAI,CAAC,YAAY;MAC1B,OAAO,CAAC;AACZ,MAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE;;AAC3C,WAAO,GAAG,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;GAChF,MAAM;AACL,WAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;GAC/C;;AAED,MAAI,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC;AACrB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;AAC5B,SAAQ,GAAG,GAAG,QAAQ,CAAC,CAAC,MAAM,GAAG,OAAO,CAAA,GAAI,CAAC,CAAC,GAAG,IAAI,CAAE;CACxD,CAAC;;AAEF,IAAI,MAAM,GAAG,gBAAS,IAAI,EAAE,QAAQ,EAAE;AACpC,MAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE;AAC3B,YAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;AAC1B,QAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;AACvB,QAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;AAC7B,QAAI,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;AACvB,QAAI,IAAI;;;;;;;;;;OAAG,YAAW;AACpB,UAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,GAAG,IAAI,CAAA,GAAI,GAAG,CAAC;AACrE,UAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;;AAEnB,UAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE;AAC3B,kBAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;OAC5B;KACF,CAAA,CAAC;AACF,QAAI,EAAE,CAAC;GACR;AACD,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;CAC9B,CAAC;;AAEF,IAAI,OAAO,GAAG,iBAAS,IAAI,EAAE,QAAQ,EAAE;AACrC,UAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;AAC1B,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;AACvB,MAAI,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;AACvB,MAAI,IAAI;;;;;;;;;;KAAG,YAAW;AACpB,QAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,GAAG,IAAI,CAAA,GAAI,GAAG,CAAC;AACrE,QAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;;AAEnB,QAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE;AAC3B,gBAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;KAC5B,MAAM;AACL,UAAI,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;KAC7B;GACF,CAAA,CAAC;AACF,MAAI,EAAE,CAAC;CACR,CAAC;;AAEF,IAAI,SAAS,GAAG,mBAAS,IAAI,EAAE;;;AAG7B,MAAI,OAAO,UAAU,KAAK,UAAU,EAAE;;AAEpC,QAAI,IAAI,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE;AACjC,UAAI,EAAE,MAAM;AACZ,aAAO,EAAE,KAAK;AACd,gBAAU,EAAE,IAAI;KACjB,CAAC,CAAC;AACH,QAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;GAC1B,MAAM,IAAK,QAAQ,CAAC,WAAW,EAAG;;AAEjC,QAAI,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;AAC9C,OAAG,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACrC,QAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;GACzB,MAAM,IAAI,QAAQ,CAAC,iBAAiB,EAAE;AACrC,QAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAE;GAC5B,MAAM,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,UAAU,EAAG;AAC9C,QAAI,CAAC,OAAO,EAAE,CAAC;GAChB;CACF,CAAC;;AAEF,IAAI,oBAAoB,GAAG,8BAAS,CAAC,EAAE;;AAErC,MAAI,OAAO,CAAC,CAAC,eAAe,KAAK,UAAU,EAAE;AAC3C,KAAC,CAAC,eAAe,EAAE,CAAC;AACpB,KAAC,CAAC,cAAc,EAAE,CAAC;GACpB,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE;AACtE,UAAM,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;GAClC;CACF,CAAC;;QAGA,QAAQ,GAAR,QAAQ;QAAE,QAAQ,GAAR,QAAQ;QAAE,WAAW,GAAX,WAAW;QAC/B,UAAU,GAAV,UAAU;QACV,KAAK,GAAL,KAAK;QAAE,IAAI,GAAJ,IAAI;QAAE,KAAK,GAAL,KAAK;QAAE,IAAI,GAAJ,IAAI;QACxB,YAAY,GAAZ,YAAY;QACZ,YAAY,GAAZ,YAAY;QACZ,MAAM,GAAN,MAAM;QAAE,OAAO,GAAP,OAAO;QACf,SAAS,GAAT,SAAS;QACT,oBAAoB,GAApB,oBAAoB;;;;;;;;;8CC/J0B,cAAc;;6BAChC,mBAAmB;;AAGjD,IAAI,aAAa,GAAG,uBAAS,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;AACjD,MAAI,CAAC,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;AAC9B,MAAI,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,CAAC;;AAEnC,MAAI,SAAS,GAAO,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AAC1D,MAAI,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;AACzD,MAAI,aAAa,GAAG,KAAK,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;;AAG/D,MAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;;AAE3C,WAAO;GACR;;AAED,MAAI,cAAc,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC;;AAE9C,MAAI,QAAQ,GAAG,CAAC,CAAC,CAAC;AAClB,OAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AAC7C,QAAI,cAAc,KAAK,aAAa,CAAC,CAAC,CAAC,EAAE;AACvC,cAAQ,GAAG,CAAC,CAAC;AACb,YAAM;KACP;GACF;;AAED,MAAI,OAAO,KAAK,CAAC,EAAE;;AAEjB,QAAI,QAAQ,KAAK,CAAC,CAAC,EAAE;;AAEnB,oBAAc,GAAG,SAAS,CAAC;KAC5B,MAAM;;AAEL,UAAI,QAAQ,KAAK,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;AACzC,sBAAc,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;OACnC,MAAM;AACL,sBAAc,GAAG,aAAa,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;OAC9C;KACF;;AAED,oCA1CK,oBAAoB,CA0CJ,CAAC,CAAC,CAAC;AACxB,kBAAc,CAAC,KAAK,EAAE,CAAC;;AAEvB,QAAI,MAAM,CAAC,kBAAkB,EAAE;AAC7B,qBA7CG,aAAa,CA6CF,cAAc,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC;KAC1D;GACF,MAAM;AACL,QAAI,OAAO,KAAK,EAAE,EAAE;AAClB,UAAI,cAAc,CAAC,OAAO,KAAK,OAAO,EAAE;AACtC,sBAAc,GAAG,SAAS,CAAC;AAC3B,iBAAS,CAAC,KAAK,EAAE,CAAC;OACnB;;AAED,UAAI,QAAQ,KAAK,CAAC,CAAC,EAAE;;AAEnB,sBAAc,GAAG,SAAS,CAAC;OAC5B,MAAM;;AAEL,sBAAc,GAAG,SAAS,CAAC;OAC5B;KACF,MAAM,IAAI,OAAO,KAAK,EAAE,IAAI,MAAM,CAAC,cAAc,KAAK,IAAI,EAAE;AAC3D,oBAAc,GAAG,aAAa,CAAC;AAC/B,sCAhEyB,SAAS,CAgExB,cAAc,EAAE,CAAC,CAAC,CAAC;KAC9B,MAAM;;AAEL,oBAAc,GAAG,SAAS,CAAC;KAC5B;GACF;CACF,CAAC;;qBAEa,aAAa;;;;;;;;;;;;wBCxEH,SAAS;;6DACgC,cAAc;;6BACtD,kBAAkB;;;;;;;;4BAQnB,iBAAiB;;;;AAN1C,IAAI,UAAU,GAAK,cAAc,CAAC;AAClC,IAAI,YAAY,GAAG,gBAAgB,CAAC;;AAOpC,IAAI,oBAAoB,GAAG,gCAAW;AACpC,MAAI,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC9C,WAAS,CAAC,SAAS,4BAAe,CAAC;;;AAGnC,SAAO,SAAS,CAAC,UAAU,EAAE;AAC3B,YAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;GACjD;CACF,CAAC;;;;;AAKF,IAAI,QAAQ;;;;;;;;;;GAAG,YAAW;AACxB,MAAI,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;;AAEhD,MAAI,CAAC,MAAM,EAAE;AACX,wBAAoB,EAAE,CAAC;AACvB,UAAM,GAAG,QAAQ,EAAE,CAAC;GACrB;;AAED,SAAO,MAAM,CAAC;CACf,CAAA,CAAC;;;;;AAKF,IAAI,QAAQ,GAAG,oBAAW;AACxB,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;AACxB,MAAI,MAAM,EAAE;AACV,WAAO,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;GACtC;CACF,CAAC;;;;;AAKF,IAAI,UAAU,GAAG,sBAAW;AAC1B,SAAO,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;CAC7C,CAAC;;;;;AAKF,IAAI,aAAa,GAAG,uBAAS,OAAO,EAAE,OAAO,EAAE;AAC7C,MAAI,QAAQ,GAAG,UAzDR,QAAQ,CAyDS,OAAO,CAAC,CAAC;AACjC,SAAO,CAAC,KAAK,CAAC,SAAS,GAAG,eAAe,GAAG,QAAQ,GAAG,6CAA6C,CAAC;CACtG,CAAC;;;;;AAKF,IAAI,SAAS,GAAG,mBAAS,QAAQ,EAAE;AACjC,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;AACxB,iDAjEkC,MAAM,CAiEjC,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;AACzB,iDAlE0C,IAAI,CAkEzC,MAAM,CAAC,CAAC;AACb,iDAnEgD,QAAQ,CAmE/C,MAAM,EAAE,gBAAgB,CAAC,CAAC;AACnC,iDApEO,WAAW,CAoEN,MAAM,EAAE,gBAAgB,CAAC,CAAC;;AAEtC,QAAM,CAAC,qBAAqB,GAAG,QAAQ,CAAC,aAAa,CAAC;AACtD,MAAI,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AACvD,WAAS,CAAC,KAAK,EAAE,CAAC;;AAElB,YAAU,CAAC,YAAY;AACrB,mDA3E8C,QAAQ,CA2E7C,MAAM,EAAE,SAAS,CAAC,CAAC;GAC7B,EAAE,GAAG,CAAC,CAAC;;AAER,MAAI,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;;AAE9C,MAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,EAAE,EAAE;AACpC,QAAI,aAAa,GAAG,QAAQ,CAAC;AAC7B,UAAM,CAAC,OAAO,GAAG,UAAU,CAAC,YAAW;AACrC,UAAI,kBAAkB,GAAI,CAAC,aAAa,IAAI,IAAI,CAAA,IAAK,MAAM,CAAC,YAAY,CAAC,wBAAwB,CAAC,KAAK,MAAM,AAAC,CAAC;AAC/G,UAAI,kBAAkB,EAAE;AACtB,qBAAa,CAAC,IAAI,CAAC,CAAC;OACrB,MACI;AACH,kBAAU,CAAC,KAAK,EAAE,CAAC;OACpB;KACF,EAAE,KAAK,CAAC,CAAC;GACX;CACF,CAAC;;;;;;AAMF,IAAI,UAAU,GAAG,sBAAW;AAC1B,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;AACxB,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;;AAExB,iDAtGO,WAAW,CAsGN,MAAM,EAAE,YAAY,CAAC,CAAC;AAClC,QAAM,CAAC,KAAK,GAAG,2BAAc,UAAU,CAAC;AACxC,QAAM,CAAC,YAAY,CAAC,MAAM,EAAE,2BAAc,SAAS,CAAC,CAAC;AACrD,QAAM,CAAC,YAAY,CAAC,aAAa,EAAE,2BAAc,gBAAgB,CAAC,CAAC;;AAEnE,iBAAe,EAAE,CAAC;CACnB,CAAC;;AAGF,IAAI,eAAe,GAAG,yBAAS,KAAK,EAAE;;AAEpC,MAAI,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE,EAAE;AACjC,WAAO,KAAK,CAAC;GACd;;AAED,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;;AAExB,MAAI,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;AACzD,iDAxHO,WAAW,CAwHN,UAAU,EAAE,MAAM,CAAC,CAAC;;AAEhC,MAAI,eAAe,GAAG,MAAM,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAClE,iDA3HO,WAAW,CA2HN,eAAe,EAAE,MAAM,CAAC,CAAC;CACtC,CAAC;;;;;AAMF,IAAI,mBAAmB,GAAG,+BAAW;AACnC,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;AACxB,QAAM,CAAC,KAAK,CAAC,SAAS,GAAG,+CApIL,YAAY,CAoIM,QAAQ,EAAE,CAAC,CAAC;CACnD,CAAC;;QAIA,oBAAoB,GAApB,oBAAoB;QACpB,QAAQ,GAAR,QAAQ;QACR,UAAU,GAAV,UAAU;QACV,QAAQ,GAAR,QAAQ;QACR,aAAa,GAAb,aAAa;QACb,SAAS,GAAT,SAAS;QACT,UAAU,GAAV,UAAU;QACV,eAAe,GAAf,eAAe;QACf,mBAAmB,GAAnB,mBAAmB;;;;;;;;AClJrB,IAAI,YAAY;;;AAGd;;;6BAG2B;;;kMAQlB;;;6HAMA;;;uCAG8B;;;+NAS9B,4CAEgC;;;4JAQ3B;;;4GAML;;;qNAM8C;;;6IAS9C;;;QAGD,CAAC;;qBAEI,YAAY;;;;;;;;;;qBChEpB,SAAS;;+CAMT,mBAAmB;;8EAMnB,cAAc;;AAhBrB,IAAI,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;;;;;AAsB5E,IAAI,aAAa,GAAG,uBAAS,MAAM,EAAE;AACnC,MAAI,KAAK,GAAG,iCAhBZ,QAAQ,EAgBc,CAAC;;AAEvB,MAAI,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;AACvC,MAAI,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;AACrC,MAAI,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;AACtD,MAAI,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;;;;;AAKxD,QAAM,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,GAAG,gEAnBhD,UAAU,CAmBiD,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;;;;;AAKlG,OAAK,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,gEAxB9C,UAAU,CAwB+C,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACrG,MAAI,MAAM,CAAC,IAAI,EAAE,gEAxBV,IAAI,CAwBW,KAAK,CAAC,CAAC;;;;;AAK7B,MAAI,MAAM,CAAC,WAAW,EAAE;AACtB,oEAhCQ,QAAQ,CAgCP,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;AACpC,SAAK,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;GAC7D,MAAM;;AAEL,QAAI,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAC1D,oEArCkB,WAAW,CAqCjB,KAAK,EAAE,WAAW,CAAC,CAAC;AAChC,SAAK,CAAC,YAAY,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;GAC7C;;;;;AAKD,kEA1CoB,IAAI,CA0CnB,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;;AAEzC,MAAI,MAAM,CAAC,IAAI,IAAI,CAAC,OAxDpB,KAAK,EAwDsB,EAAE;;;AAE3B,UAAI,SAAS,GAAG,KAAK,CAAC;;AAEtB,WAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AAC1C,YAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE;AACjC,mBAAS,GAAG,IAAI,CAAC;AACjB,gBAAM;SACP;OACF;;AAED,UAAI,CAAC,SAAS,EAAE;AACd,cAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;AAC7C;aAAO,KAAK;UAAC;OACd;;AAED,UAAI,cAAc,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AAC7D,UAAI,KAAK,YAAA,CAAC;;AAEV,UAAI,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;AAC9C,aAAK,GAAG,KAAK,CAAC,aAAa,CAAC,WAAW,GAAG,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;AAC/D,wEAjEG,IAAI,CAiEF,KAAK,CAAC,CAAC;OACb;;AAED,UAAI,MAAM,GAAG,iCA3Ef,QAAQ,EA2EiB,CAAC;;;AAGxB,cAAQ,MAAM,CAAC,IAAI;;AAEjB,aAAK,SAAS;AACZ,0EA5EI,QAAQ,CA4EH,KAAK,EAAE,SAAS,CAAC,CAAC;AAC3B,0EA7EI,QAAQ,CA6EH,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC,CAAC;AAC9D,0EA9EI,QAAQ,CA8EH,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAChE,gBAAM;;AAAA,AAER,aAAK,OAAO;AACV,0EAlFI,QAAQ,CAkFH,KAAK,EAAE,kBAAkB,CAAC,CAAC;AACpC,0EAnFI,QAAQ,CAmFH,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,CAAC;AAC5D,gBAAM;;AAAA,AAER,aAAK,SAAS;AACZ,0EAvFI,QAAQ,CAuFH,KAAK,EAAE,cAAc,CAAC,CAAC;AAChC,0EAxFI,QAAQ,CAwFH,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAC7D,0EAzFI,QAAQ,CAyFH,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAC5D,gBAAM;;AAAA,AAER,aAAK,OAAO,CAAC;AACb,aAAK,QAAQ;AACX,gBAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;AAC9C,gBAAM,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;AACjC,gBAAM,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAC5D,0EAjGI,QAAQ,CAiGH,KAAK,EAAE,YAAY,CAAC,CAAC;AAC9B,oBAAU,CAAC,YAAY;AACrB,kBAAM,CAAC,KAAK,EAAE,CAAC;AACf,kBAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;WACxD,EAAE,GAAG,CAAC,CAAC;AACR,gBAAM;AAAA,OACT;;;;;;GACF;;;;;AAKD,MAAI,MAAM,CAAC,QAAQ,EAAE;AACnB,QAAI,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;;AAE5D,eAAW,CAAC,KAAK,CAAC,eAAe,GAAG,MAAM,GAAG,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAC;AACnE,oEA/GK,IAAI,CA+GJ,WAAW,CAAC,CAAC;;AAElB,QAAI,SAAS,GAAG,EAAE,CAAC;AACnB,QAAI,UAAU,GAAG,EAAE,CAAC;;AAEpB,QAAI,MAAM,CAAC,SAAS,EAAE;AACpB,UAAI,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACxD,UAAI,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAC7B,UAAI,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;;AAE9B,UAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,EAAE;AAC3B,cAAM,CAAC,kEAAkE,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;OAC/F,MAAM;AACL,iBAAS,GAAG,QAAQ,CAAC;AACrB,kBAAU,GAAG,SAAS,CAAC;OACxB;KACF;;AAED,eAAW,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,QAAQ,GAAG,SAAS,GAAG,aAAa,GAAG,UAAU,GAAG,IAAI,CAAC,CAAC;GACjI;;;;;AAKD,OAAK,CAAC,YAAY,CAAC,wBAAwB,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACtE,MAAI,MAAM,CAAC,gBAAgB,EAAE;AAC3B,cAAU,CAAC,KAAK,CAAC,OAAO,GAAG,cAAc,CAAC;GAC3C,MAAM;AACL,oEA3IkB,IAAI,CA2IjB,UAAU,CAAC,CAAC;GAClB;;;;;AAKD,OAAK,CAAC,YAAY,CAAC,yBAAyB,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACxE,MAAI,MAAM,CAAC,iBAAiB,EAAE;AAC5B,eAAW,CAAC,KAAK,CAAC,OAAO,GAAG,cAAc,CAAC;GAC5C,MAAM;AACL,oEArJkB,IAAI,CAqJjB,WAAW,CAAC,CAAC;GACnB;;;;;AAKD,MAAI,MAAM,CAAC,gBAAgB,EAAE;AAC3B,cAAU,CAAC,SAAS,GAAG,gEA7JzB,UAAU,CA6J0B,MAAM,CAAC,gBAAgB,CAAC,CAAC;GAC5D;AACD,MAAI,MAAM,CAAC,iBAAiB,EAAE;AAC5B,eAAW,CAAC,SAAS,GAAG,gEAhK1B,UAAU,CAgK2B,MAAM,CAAC,iBAAiB,CAAC,CAAC;GAC9D;;;;;AAKD,MAAI,MAAM,CAAC,kBAAkB,EAAE;;AAE7B,eAAW,CAAC,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,kBAAkB,CAAC;;;AAG9D,eAAW,CAAC,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,yBAAyB,CAAC;AACrE,eAAW,CAAC,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC,yBAAyB,CAAC;;;AAGtE,qCApLF,aAAa,CAoLG,WAAW,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC;GACvD;;;;;AAKD,OAAK,CAAC,YAAY,CAAC,0BAA0B,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;;;;;AAKzE,MAAI,eAAe,GAAG,MAAM,CAAC,YAAY,GAAG,IAAI,GAAG,KAAK,CAAC;AACzD,OAAK,CAAC,YAAY,CAAC,wBAAwB,EAAE,eAAe,CAAC,CAAC;;;;;AAK9D,MAAI,CAAC,MAAM,CAAC,SAAS,EAAE;AACrB,SAAK,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;GAC9C,MAAM,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,EAAE;AAC/C,SAAK,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;GACxD,MAAM;AACL,SAAK,CAAC,YAAY,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;GAC7C;;;;;AAKD,OAAK,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAChD,CAAC;;qBAEa,aAAa;;;;;;;;;;;;ACzN5B,IAAI,MAAM,GAAG,gBAAS,CAAC,EAAE,CAAC,EAAE;AAC1B,OAAK,IAAI,GAAG,IAAI,CAAC,EAAE;AACjB,QAAI,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;AACzB,OAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;KACjB;GACF;AACD,SAAO,CAAC,CAAC;CACV,CAAC;;;;;AAKF,IAAI,QAAQ,GAAG,kBAAS,GAAG,EAAE;AAC3B,MAAI,MAAM,GAAG,2CAA2C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACnE,SAAO,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC;CAClH,CAAC;;;;;AAKF,IAAI,KAAK,GAAG,iBAAW;AACrB,SAAQ,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAE;CACzD,CAAC;;;;;AAKF,IAAI,MAAM,GAAG,gBAAS,MAAM,EAAE;AAC5B,MAAI,MAAM,CAAC,OAAO,EAAE;;AAElB,UAAM,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC,CAAC;GAC7C;CACF,CAAC;;;;;;AAMF,IAAI,cAAc,GAAG,wBAAS,GAAG,EAAE,GAAG,EAAE;;AAEtC,KAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC7C,MAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;AAClB,OAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;GAC3D;AACD,KAAG,GAAG,GAAG,IAAI,CAAC,CAAC;;;AAGf,MAAI,GAAG,GAAG,GAAG,CAAC;AACd,MAAI,CAAC,CAAC;AACN,MAAI,CAAC,CAAC;;AAEN,OAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;AACtB,KAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACvC,KAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACrE,OAAG,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA,CAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;GACpC;;AAED,SAAO,GAAG,CAAC;CACZ,CAAC;;QAIA,MAAM,GAAN,MAAM;QACN,QAAQ,GAAR,QAAQ;QACR,KAAK,GAAL,KAAK;QACL,MAAM,GAAN,MAAM;QACN,cAAc,GAAd,cAAc","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","// SweetAlert\n// 2014-2015 (c) - Tristan Edwards\n// github.com/t4t5/sweetalert\n\n/*\n * jQuery-like functions for manipulating the DOM\n */\nimport {\n  hasClass, addClass, removeClass,\n  escapeHtml,\n  _show, show, _hide, hide,\n  isDescendant,\n  getTopMargin,\n  fadeIn, fadeOut,\n  fireClick,\n  stopEventPropagation\n} from './modules/handle-dom';\n\n/*\n * Handy utilities\n */\nimport {\n  extend,\n  hexToRgb,\n  isIE8,\n  logStr,\n  colorLuminance\n} from './modules/utils';\n\n/*\n *  Handle sweetAlert's DOM elements\n */\nimport {\n  sweetAlertInitialize,\n  getModal,\n  getOverlay,\n  getInput,\n  setFocusStyle,\n  openModal,\n  resetInput,\n  fixVerticalPosition\n} from './modules/handle-swal-dom';\n\n\n// Handle button events and keyboard events\nimport { handleButton, handleConfirm, handleCancel } from './modules/handle-click';\nimport handleKeyDown from './modules/handle-key';\n\n\n// Default values\nimport defaultParams from './modules/default-params';\nimport setParameters from './modules/set-params';\n\n/*\n * Remember state in cases where opening and handling a modal will fiddle with it.\n * (We also use window.previousActiveElement as a global variable)\n */\nvar previousWindowKeyDown;\nvar lastFocusedButton;\n\n\n/*\n * Global sweetAlert function\n * (this is what the user calls)\n */\nvar sweetAlert, swal;\n\nexport default sweetAlert = swal = function() {\n  var customizations = arguments[0];\n\n  addClass(document.body, 'stop-scrolling');\n  resetInput();\n\n  /*\n   * Use argument if defined or default value from params object otherwise.\n   * Supports the case where a default value is boolean true and should be\n   * overridden by a corresponding explicit argument which is boolean false.\n   */\n  function argumentOrDefault(key) {\n    var args = customizations;\n    return (args[key] === undefined) ?  defaultParams[key] : args[key];\n  }\n\n  if (customizations === undefined) {\n    logStr('SweetAlert expects at least 1 attribute!');\n    return false;\n  }\n\n  var params = extend({}, defaultParams);\n\n  switch (typeof customizations) {\n\n    // Ex: swal(\"Hello\", \"Just testing\", \"info\");\n    case 'string':\n      params.title = customizations;\n      params.text  = arguments[1] || '';\n      params.type  = arguments[2] || '';\n      break;\n\n    // Ex: swal({ title:\"Hello\", text: \"Just testing\", type: \"info\" });\n    case 'object':\n      if (customizations.title === undefined) {\n        logStr('Missing \"title\" argument!');\n        return false;\n      }\n\n      params.title = customizations.title;\n\n      for (let customName in defaultParams) {\n        params[customName] = argumentOrDefault(customName);\n      }\n\n      // Show \"Confirm\" instead of \"OK\" if cancel button is visible\n      params.confirmButtonText = params.showCancelButton ? 'Confirm' : defaultParams.confirmButtonText;\n      params.confirmButtonText = argumentOrDefault('confirmButtonText');\n\n      // Callback function when clicking on \"OK\"/\"Cancel\"\n      params.doneFunction = arguments[1] || null;\n\n      break;\n\n    default:\n      logStr('Unexpected type of argument! Expected \"string\" or \"object\", got ' + typeof customizations);\n      return false;\n\n  }\n\n  setParameters(params);\n  fixVerticalPosition();\n  openModal(arguments[1]);\n\n  // Modal interactions\n  var modal = getModal();\n\n\n  /*\n   * Make sure all modal buttons respond to all events\n   */\n  var $buttons = modal.querySelectorAll('button');\n  var buttonEvents = ['onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'onfocus'];\n  var onButtonEvent = (e) => handleButton(e, params, modal);\n\n  for (let btnIndex = 0; btnIndex < $buttons.length; btnIndex++) {\n    for (let evtIndex = 0; evtIndex < buttonEvents.length; evtIndex++) {\n      let btnEvt = buttonEvents[evtIndex];\n      $buttons[btnIndex][btnEvt] = onButtonEvent;\n    }\n  }\n\n  // Clicking outside the modal dismisses it (if allowed by user)\n  getOverlay().onclick = onButtonEvent;\n\n  previousWindowKeyDown = window.onkeydown;\n\n  var onKeyEvent = (e) => handleKeyDown(e, params, modal);\n  window.onkeydown = onKeyEvent;\n\n  window.onfocus = function () {\n    // When the user has focused away and focused back from the whole window.\n    setTimeout(function () {\n      // Put in a timeout to jump out of the event sequence.\n      // Calling focus() in the event sequence confuses things.\n      if (lastFocusedButton !== undefined) {\n        lastFocusedButton.focus();\n        lastFocusedButton = undefined;\n      }\n    }, 0);\n  };\n  \n  // Show alert with enabled buttons always\n  swal.enableButtons();\n};\n\n\n\n/*\n * Set default params for each popup\n * @param {Object} userParams\n */\nsweetAlert.setDefaults = swal.setDefaults = function(userParams) {\n  if (!userParams) {\n    throw new Error('userParams is required');\n  }\n  if (typeof userParams !== 'object') {\n    throw new Error('userParams has to be a object');\n  }\n\n  extend(defaultParams, userParams);\n};\n\n\n/*\n * Animation when closing modal\n */\nsweetAlert.close = swal.close = function() {\n  var modal = getModal();\n\n  fadeOut(getOverlay(), 5);\n  fadeOut(modal, 5);\n  removeClass(modal, 'showSweetAlert');\n  addClass(modal, 'hideSweetAlert');\n  removeClass(modal, 'visible');\n\n  /*\n   * Reset icon animations\n   */\n  var $successIcon = modal.querySelector('.sa-icon.sa-success');\n  removeClass($successIcon, 'animate');\n  removeClass($successIcon.querySelector('.sa-tip'), 'animateSuccessTip');\n  removeClass($successIcon.querySelector('.sa-long'), 'animateSuccessLong');\n\n  var $errorIcon = modal.querySelector('.sa-icon.sa-error');\n  removeClass($errorIcon, 'animateErrorIcon');\n  removeClass($errorIcon.querySelector('.sa-x-mark'), 'animateXMark');\n\n  var $warningIcon = modal.querySelector('.sa-icon.sa-warning');\n  removeClass($warningIcon, 'pulseWarning');\n  removeClass($warningIcon.querySelector('.sa-body'), 'pulseWarningIns');\n  removeClass($warningIcon.querySelector('.sa-dot'), 'pulseWarningIns');\n\n  // Reset custom class (delay so that UI changes aren't visible)\n  setTimeout(function() {\n    var customClass = modal.getAttribute('data-custom-class');\n    removeClass(modal, customClass);\n  }, 300);\n\n  // Make page scrollable again\n  removeClass(document.body, 'stop-scrolling');\n\n  // Reset the page to its previous state\n  window.onkeydown = previousWindowKeyDown;\n  if (window.previousActiveElement) {\n    window.previousActiveElement.focus();\n  }\n  lastFocusedButton = undefined;\n  clearTimeout(modal.timeout);\n\n  return true;\n};\n\n\n/*\n * Validation of the input field is done by user\n * If something is wrong => call showInputError with errorMessage\n */\nsweetAlert.showInputError = swal.showInputError = function(errorMessage) {\n  var modal = getModal();\n\n  var $errorIcon = modal.querySelector('.sa-input-error');\n  addClass($errorIcon, 'show');\n\n  var $errorContainer = modal.querySelector('.sa-error-container');\n  addClass($errorContainer, 'show');\n\n  $errorContainer.querySelector('p').innerHTML = errorMessage;\n\n  setTimeout(function() {\n    sweetAlert.enableButtons();\n  }, 1);\n\n  modal.querySelector('input').focus();\n};\n\n\n/*\n * Reset input error DOM elements\n */\nsweetAlert.resetInputError = swal.resetInputError = function(event) {\n  // If press enter => ignore\n  if (event && event.keyCode === 13) {\n    return false;\n  }\n\n  var $modal = getModal();\n\n  var $errorIcon = $modal.querySelector('.sa-input-error');\n  removeClass($errorIcon, 'show');\n\n  var $errorContainer = $modal.querySelector('.sa-error-container');\n  removeClass($errorContainer, 'show');\n};\n\n/*\n * Disable confirm and cancel buttons\n */\nsweetAlert.disableButtons = swal.disableButtons = function(event) {\n  var modal = getModal();\n  var $confirmButton = modal.querySelector('button.confirm');\n  var $cancelButton = modal.querySelector('button.cancel');\n  $confirmButton.disabled = true;\n  $cancelButton.disabled = true;\n};\n\n/*\n * Enable confirm and cancel buttons\n */\nsweetAlert.enableButtons = swal.enableButtons = function(event) {\n  var modal = getModal();\n  var $confirmButton = modal.querySelector('button.confirm');\n  var $cancelButton = modal.querySelector('button.cancel');\n  $confirmButton.disabled = false;\n  $cancelButton.disabled = false;\n};\n\nif (typeof window !== 'undefined') {\n  // The 'handle-click' module requires\n  // that 'sweetAlert' was set as global.\n  window.sweetAlert = window.swal = sweetAlert;\n} else {\n  logStr('SweetAlert is a frontend module!');\n}\n","var defaultParams = {\n  title: '',\n  text: '',\n  type: null,\n  allowOutsideClick: false,\n  showConfirmButton: true,\n  showCancelButton: false,\n  closeOnConfirm: true,\n  closeOnCancel: true,\n  confirmButtonText: 'OK',\n  confirmButtonColor: '#8CD4F5',\n  cancelButtonText: 'Cancel',\n  imageUrl: null,\n  imageSize: null,\n  timer: null,\n  customClass: '',\n  html: false,\n  animation: true,\n  allowEscapeKey: true,\n  inputType: 'text',\n  inputPlaceholder: '',\n  inputValue: '',\n  showLoaderOnConfirm: false\n};\n\nexport default defaultParams;\n","import { colorLuminance } from './utils';\nimport { getModal } from './handle-swal-dom';\nimport { hasClass, isDescendant } from './handle-dom';\n\n\n/*\n * User clicked on \"Confirm\"/\"OK\" or \"Cancel\"\n */\nvar handleButton = function(event, params, modal) {\n  var e = event || window.event;\n  var target = e.target || e.srcElement;\n\n  var targetedConfirm = target.className.indexOf('confirm') !== -1;\n  var targetedOverlay = target.className.indexOf('sweet-overlay') !== -1;\n  var modalIsVisible  = hasClass(modal, 'visible');\n  var doneFunctionExists = (params.doneFunction && modal.getAttribute('data-has-done-function') === 'true');\n\n  // Since the user can change the background-color of the confirm button programmatically,\n  // we must calculate what the color should be on hover/active\n  var normalColor, hoverColor, activeColor;\n  if (targetedConfirm && params.confirmButtonColor) {\n    normalColor  = params.confirmButtonColor;\n    hoverColor   = colorLuminance(normalColor, -0.04);\n    activeColor  = colorLuminance(normalColor, -0.14);\n  }\n\n  function shouldSetConfirmButtonColor(color) {\n    if (targetedConfirm && params.confirmButtonColor) {\n      target.style.backgroundColor = color;\n    }\n  }\n\n  switch (e.type) {\n    case 'mouseover':\n      shouldSetConfirmButtonColor(hoverColor);\n      break;\n\n    case 'mouseout':\n      shouldSetConfirmButtonColor(normalColor);\n      break;\n\n    case 'mousedown':\n      shouldSetConfirmButtonColor(activeColor);\n      break;\n\n    case 'mouseup':\n      shouldSetConfirmButtonColor(hoverColor);\n      break;\n\n    case 'focus':\n      let $confirmButton = modal.querySelector('button.confirm');\n      let $cancelButton  = modal.querySelector('button.cancel');\n\n      if (targetedConfirm) {\n        $cancelButton.style.boxShadow = 'none';\n      } else {\n        $confirmButton.style.boxShadow = 'none';\n      }\n      break;\n\n    case 'click':\n      let clickedOnModal = (modal === target);\n      let clickedOnModalChild = isDescendant(modal, target);\n\n      // Ignore click outside if allowOutsideClick is false\n      if (!clickedOnModal && !clickedOnModalChild && modalIsVisible && !params.allowOutsideClick) {\n        break;\n      }\n\n      if (targetedConfirm && doneFunctionExists && modalIsVisible) {\n        handleConfirm(modal, params);\n      } else if (doneFunctionExists && modalIsVisible || targetedOverlay) {\n        handleCancel(modal, params);\n      } else if (isDescendant(modal, target) && target.tagName === 'BUTTON') {\n        sweetAlert.close();\n      }\n      break;\n  }\n};\n\n/*\n *  User clicked on \"Confirm\"/\"OK\"\n */\nvar handleConfirm = function(modal, params) {\n  var callbackValue = true;\n\n  if (hasClass(modal, 'show-input')) {\n    callbackValue = modal.querySelector('input').value;\n\n    if (!callbackValue) {\n      callbackValue = '';\n    }\n  }\n\n  params.doneFunction(callbackValue);\n\n  if (params.closeOnConfirm) {\n    sweetAlert.close();\n  }\n  // Disable cancel and confirm button if the parameter is true\n  if (params.showLoaderOnConfirm) {\n    sweetAlert.disableButtons();\n  }\n};\n\n/*\n *  User clicked on \"Cancel\"\n */\nvar handleCancel = function(modal, params) {\n  // Check if callback function expects a parameter (to track cancel actions)\n  var functionAsStr = String(params.doneFunction).replace(/\\s/g, '');\n  var functionHandlesCancel = functionAsStr.substring(0, 9) === 'function(' && functionAsStr.substring(9, 10) !== ')';\n\n  if (functionHandlesCancel) {\n    params.doneFunction(false);\n  }\n\n  if (params.closeOnCancel) {\n    sweetAlert.close();\n  }\n};\n\n\nexport default {\n  handleButton,\n  handleConfirm,\n  handleCancel\n};\n","var hasClass = function(elem, className) {\n  return new RegExp(' ' + className + ' ').test(' ' + elem.className + ' ');\n};\n\nvar addClass = function(elem, className) {\n  if (!hasClass(elem, className)) {\n    elem.className += ' ' + className;\n  }\n};\n\nvar removeClass = function(elem, className) {\n  var newClass = ' ' + elem.className.replace(/[\\t\\r\\n]/g, ' ') + ' ';\n  if (hasClass(elem, className)) {\n    while (newClass.indexOf(' ' + className + ' ') >= 0) {\n      newClass = newClass.replace(' ' + className + ' ', ' ');\n    }\n    elem.className = newClass.replace(/^\\s+|\\s+$/g, '');\n  }\n};\n\nvar escapeHtml = function(str) {\n  var div = document.createElement('div');\n  div.appendChild(document.createTextNode(str));\n  return div.innerHTML;\n};\n\nvar _show = function(elem) {\n  elem.style.opacity = '';\n  elem.style.display = 'block';\n};\n\nvar show = function(elems) {\n  if (elems && !elems.length) {\n    return _show(elems);\n  }\n  for (var i = 0; i < elems.length; ++i) {\n    _show(elems[i]);\n  }\n};\n\nvar _hide = function(elem) {\n  elem.style.opacity = '';\n  elem.style.display = 'none';\n};\n\nvar hide = function(elems) {\n  if (elems && !elems.length) {\n    return _hide(elems);\n  }\n  for (var i = 0; i < elems.length; ++i) {\n    _hide(elems[i]);\n  }\n};\n\nvar isDescendant = function(parent, child) {\n  var node = child.parentNode;\n  while (node !== null) {\n    if (node === parent) {\n      return true;\n    }\n    node = node.parentNode;\n  }\n  return false;\n};\n\nvar getTopMargin = function(elem) {\n  elem.style.left = '-9999px';\n  elem.style.display = 'block';\n\n  var height = elem.clientHeight,\n      padding;\n  if (typeof getComputedStyle !== \"undefined\") { // IE 8\n    padding = parseInt(getComputedStyle(elem).getPropertyValue('padding-top'), 10);\n  } else {\n    padding = parseInt(elem.currentStyle.padding);\n  }\n\n  elem.style.left = '';\n  elem.style.display = 'none';\n  return ('-' + parseInt((height + padding) / 2) + 'px');\n};\n\nvar fadeIn = function(elem, interval) {\n  if (+elem.style.opacity < 1) {\n    interval = interval || 16;\n    elem.style.opacity = 0;\n    elem.style.display = 'block';\n    var last = +new Date();\n    var tick = function() {\n      elem.style.opacity = +elem.style.opacity + (new Date() - last) / 100;\n      last = +new Date();\n\n      if (+elem.style.opacity < 1) {\n        setTimeout(tick, interval);\n      }\n    };\n    tick();\n  }\n  elem.style.display = 'block'; //fallback IE8\n};\n\nvar fadeOut = function(elem, interval) {\n  interval = interval || 16;\n  elem.style.opacity = 1;\n  var last = +new Date();\n  var tick = function() {\n    elem.style.opacity = +elem.style.opacity - (new Date() - last) / 100;\n    last = +new Date();\n\n    if (+elem.style.opacity > 0) {\n      setTimeout(tick, interval);\n    } else {\n      elem.style.display = 'none';\n    }\n  };\n  tick();\n};\n\nvar fireClick = function(node) {\n  // Taken from http://www.nonobtrusive.com/2011/11/29/programatically-fire-crossbrowser-click-event-with-javascript/\n  // Then fixed for today's Chrome browser.\n  if (typeof MouseEvent === 'function') {\n    // Up-to-date approach\n    var mevt = new MouseEvent('click', {\n      view: window,\n      bubbles: false,\n      cancelable: true\n    });\n    node.dispatchEvent(mevt);\n  } else if ( document.createEvent ) {\n    // Fallback\n    var evt = document.createEvent('MouseEvents');\n    evt.initEvent('click', false, false);\n    node.dispatchEvent(evt);\n  } else if (document.createEventObject) {\n    node.fireEvent('onclick') ;\n  } else if (typeof node.onclick === 'function' ) {\n    node.onclick();\n  }\n};\n\nvar stopEventPropagation = function(e) {\n  // In particular, make sure the space bar doesn't scroll the main window.\n  if (typeof e.stopPropagation === 'function') {\n    e.stopPropagation();\n    e.preventDefault();\n  } else if (window.event && window.event.hasOwnProperty('cancelBubble')) {\n    window.event.cancelBubble = true;\n  }\n};\n\nexport { \n  hasClass, addClass, removeClass, \n  escapeHtml, \n  _show, show, _hide, hide, \n  isDescendant, \n  getTopMargin,\n  fadeIn, fadeOut,\n  fireClick,\n  stopEventPropagation\n};\n","import { stopEventPropagation, fireClick } from './handle-dom';\nimport { setFocusStyle } from './handle-swal-dom';\n\n\nvar handleKeyDown = function(event, params, modal) {\n  var e = event || window.event;\n  var keyCode = e.keyCode || e.which;\n\n  var $okButton     = modal.querySelector('button.confirm');\n  var $cancelButton = modal.querySelector('button.cancel');\n  var $modalButtons = modal.querySelectorAll('button[tabindex]');\n\n\n  if ([9, 13, 32, 27].indexOf(keyCode) === -1) {\n    // Don't do work on keys we don't care about.\n    return;\n  }\n\n  var $targetElement = e.target || e.srcElement;\n\n  var btnIndex = -1; // Find the button - note, this is a nodelist, not an array.\n  for (var i = 0; i < $modalButtons.length; i++) {\n    if ($targetElement === $modalButtons[i]) {\n      btnIndex = i;\n      break;\n    }\n  }\n\n  if (keyCode === 9) {\n    // TAB\n    if (btnIndex === -1) {\n      // No button focused. Jump to the confirm button.\n      $targetElement = $okButton;\n    } else {\n      // Cycle to the next button\n      if (btnIndex === $modalButtons.length - 1) {\n        $targetElement = $modalButtons[0];\n      } else {\n        $targetElement = $modalButtons[btnIndex + 1];\n      }\n    }\n\n    stopEventPropagation(e);\n    $targetElement.focus();\n\n    if (params.confirmButtonColor) {\n      setFocusStyle($targetElement, params.confirmButtonColor);\n    }\n  } else {\n    if (keyCode === 13) {\n      if ($targetElement.tagName === 'INPUT') {\n        $targetElement = $okButton;\n        $okButton.focus();\n      }\n\n      if (btnIndex === -1) {\n        // ENTER/SPACE clicked outside of a button.\n        $targetElement = $okButton;\n      } else {\n        // Do nothing - let the browser handle it.\n        $targetElement = undefined;\n      }\n    } else if (keyCode === 27 && params.allowEscapeKey === true) {\n      $targetElement = $cancelButton;\n      fireClick($targetElement, e);\n    } else {\n      // Fallback - let the browser handle it.\n      $targetElement = undefined;\n    }\n  }\n};\n\nexport default handleKeyDown;\n","import { hexToRgb } from './utils';\nimport { removeClass, getTopMargin, fadeIn, show, addClass } from './handle-dom';\nimport defaultParams from './default-params';\n\nvar modalClass   = '.sweet-alert';\nvar overlayClass = '.sweet-overlay';\n\n/*\n * Add modal + overlay to DOM\n */\nimport injectedHTML from './injected-html';\n\nvar sweetAlertInitialize = function() {\n  var sweetWrap = document.createElement('div');\n  sweetWrap.innerHTML = injectedHTML;\n\n  // Append elements to body\n  while (sweetWrap.firstChild) {\n    document.body.appendChild(sweetWrap.firstChild);\n  }\n};\n\n/*\n * Get DOM element of modal\n */\nvar getModal = function() {\n  var $modal = document.querySelector(modalClass);\n\n  if (!$modal) {\n    sweetAlertInitialize();\n    $modal = getModal();\n  }\n\n  return $modal;\n};\n\n/*\n * Get DOM element of input (in modal)\n */\nvar getInput = function() {\n  var $modal = getModal();\n  if ($modal) {\n    return $modal.querySelector('input');\n  }\n};\n\n/*\n * Get DOM element of overlay\n */\nvar getOverlay = function() {\n  return document.querySelector(overlayClass);\n};\n\n/*\n * Add box-shadow style to button (depending on its chosen bg-color)\n */\nvar setFocusStyle = function($button, bgColor) {\n  var rgbColor = hexToRgb(bgColor);\n  $button.style.boxShadow = '0 0 2px rgba(' + rgbColor + ', 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)';\n};\n\n/*\n * Animation when opening modal\n */\nvar openModal = function(callback) {\n  var $modal = getModal();\n  fadeIn(getOverlay(), 10);\n  show($modal);\n  addClass($modal, 'showSweetAlert');\n  removeClass($modal, 'hideSweetAlert');\n\n  window.previousActiveElement = document.activeElement;\n  var $okButton = $modal.querySelector('button.confirm');\n  $okButton.focus();\n\n  setTimeout(function () {\n    addClass($modal, 'visible');\n  }, 500);\n\n  var timer = $modal.getAttribute('data-timer');\n\n  if (timer !== 'null' && timer !== '') {\n    var timerCallback = callback;\n    $modal.timeout = setTimeout(function() {\n      var doneFunctionExists = ((timerCallback || null) && $modal.getAttribute('data-has-done-function') === 'true');\n      if (doneFunctionExists) { \n        timerCallback(null);\n      }\n      else {\n        sweetAlert.close();\n      }\n    }, timer);\n  }\n};\n\n/*\n * Reset the styling of the input\n * (for example if errors have been shown)\n */\nvar resetInput = function() {\n  var $modal = getModal();\n  var $input = getInput();\n\n  removeClass($modal, 'show-input');\n  $input.value = defaultParams.inputValue;\n  $input.setAttribute('type', defaultParams.inputType);\n  $input.setAttribute('placeholder', defaultParams.inputPlaceholder);\n\n  resetInputError();\n};\n\n\nvar resetInputError = function(event) {\n  // If press enter => ignore\n  if (event && event.keyCode === 13) {\n    return false;\n  }\n\n  var $modal = getModal();\n\n  var $errorIcon = $modal.querySelector('.sa-input-error');\n  removeClass($errorIcon, 'show');\n\n  var $errorContainer = $modal.querySelector('.sa-error-container');\n  removeClass($errorContainer, 'show');\n};\n\n\n/*\n * Set \"margin-top\"-property on modal based on its computed height\n */\nvar fixVerticalPosition = function() {\n  var $modal = getModal();\n  $modal.style.marginTop = getTopMargin(getModal());\n};\n\n\nexport { \n  sweetAlertInitialize,\n  getModal,\n  getOverlay,\n  getInput,\n  setFocusStyle,\n  openModal,\n  resetInput,\n  resetInputError,\n  fixVerticalPosition\n};\n","var injectedHTML = \n\n  // Dark overlay\n  `<div class=\"sweet-overlay\" tabIndex=\"-1\"></div>` +\n\n  // Modal\n  `<div class=\"sweet-alert\">` +\n\n    // Error icon\n    `<div class=\"sa-icon sa-error\">\n      <span class=\"sa-x-mark\">\n        <span class=\"sa-line sa-left\"></span>\n        <span class=\"sa-line sa-right\"></span>\n      </span>\n    </div>` +\n\n    // Warning icon\n    `<div class=\"sa-icon sa-warning\">\n      <span class=\"sa-body\"></span>\n      <span class=\"sa-dot\"></span>\n    </div>` +\n\n    // Info icon\n    `<div class=\"sa-icon sa-info\"></div>` +\n\n    // Success icon\n    `<div class=\"sa-icon sa-success\">\n      <span class=\"sa-line sa-tip\"></span>\n      <span class=\"sa-line sa-long\"></span>\n\n      <div class=\"sa-placeholder\"></div>\n      <div class=\"sa-fix\"></div>\n    </div>` +\n\n    `<div class=\"sa-icon sa-custom\"></div>` +\n\n    // Title, text and input\n    `<h2>Title</h2>\n    <p>Text</p>\n    <fieldset>\n      <input type=\"text\" tabIndex=\"3\" />\n      <div class=\"sa-input-error\"></div>\n    </fieldset>` +\n\n    // Input errors\n    `<div class=\"sa-error-container\">\n      <div class=\"icon\">!</div>\n      <p>Not valid!</p>\n    </div>` +\n\n    // Cancel and confirm buttons\n    `<div class=\"sa-button-container\">\n      <button class=\"cancel\" tabIndex=\"2\">Cancel</button>\n      <div class=\"sa-confirm-button-container\">\n        <button class=\"confirm\" tabIndex=\"1\">OK</button>` + \n\n        // Loading animation\n        `<div class=\"la-ball-fall\">\n          <div></div>\n          <div></div>\n          <div></div>\n        </div>\n      </div>\n    </div>` +\n\n  // End of modal\n  `</div>`;\n\nexport default injectedHTML;\n","var alertTypes = ['error', 'warning', 'info', 'success', 'input', 'prompt'];\n\nimport {\n  isIE8\n} from './utils';\n\nimport {\n  getModal,\n  getInput,\n  setFocusStyle\n} from './handle-swal-dom';\n\nimport {\n  hasClass, addClass, removeClass,\n  escapeHtml,\n  _show, show, _hide, hide\n} from './handle-dom';\n\n\n/*\n * Set type, text and actions on modal\n */\nvar setParameters = function(params) {\n  var modal = getModal();\n\n  var $title = modal.querySelector('h2');\n  var $text = modal.querySelector('p');\n  var $cancelBtn = modal.querySelector('button.cancel');\n  var $confirmBtn = modal.querySelector('button.confirm');\n\n  /*\n   * Title\n   */\n  $title.innerHTML = params.html ? params.title : escapeHtml(params.title).split('\\n').join('<br>');\n\n  /*\n   * Text\n   */\n  $text.innerHTML = params.html ? params.text : escapeHtml(params.text || '').split('\\n').join('<br>');\n  if (params.text) show($text);\n\n  /*\n   * Custom class\n   */\n  if (params.customClass) {\n    addClass(modal, params.customClass);\n    modal.setAttribute('data-custom-class', params.customClass);\n  } else {\n    // Find previously set classes and remove them\n    let customClass = modal.getAttribute('data-custom-class');\n    removeClass(modal, customClass);\n    modal.setAttribute('data-custom-class', '');\n  }\n\n  /*\n   * Icon\n   */\n  hide(modal.querySelectorAll('.sa-icon'));\n\n  if (params.type && !isIE8()) {\n\n    let validType = false;\n\n    for (let i = 0; i < alertTypes.length; i++) {\n      if (params.type === alertTypes[i]) {\n        validType = true;\n        break;\n      }\n    }\n\n    if (!validType) {\n      logStr('Unknown alert type: ' + params.type);\n      return false;\n    }\n\n    let typesWithIcons = ['success', 'error', 'warning', 'info'];\n    let $icon;\n\n    if (typesWithIcons.indexOf(params.type) !== -1) {\n      $icon = modal.querySelector('.sa-icon.' + 'sa-' + params.type);\n      show($icon);\n    }\n\n    let $input = getInput();\n\n    // Animate icon\n    switch (params.type) {\n\n      case 'success':\n        addClass($icon, 'animate');\n        addClass($icon.querySelector('.sa-tip'), 'animateSuccessTip');\n        addClass($icon.querySelector('.sa-long'), 'animateSuccessLong');\n        break;\n\n      case 'error':\n        addClass($icon, 'animateErrorIcon');\n        addClass($icon.querySelector('.sa-x-mark'), 'animateXMark');\n        break;\n\n      case 'warning':\n        addClass($icon, 'pulseWarning');\n        addClass($icon.querySelector('.sa-body'), 'pulseWarningIns');\n        addClass($icon.querySelector('.sa-dot'), 'pulseWarningIns');\n        break;\n\n      case 'input':\n      case 'prompt':\n        $input.setAttribute('type', params.inputType);\n        $input.value = params.inputValue;\n        $input.setAttribute('placeholder', params.inputPlaceholder);\n        addClass(modal, 'show-input');\n        setTimeout(function () {\n          $input.focus();\n          $input.addEventListener('keyup', swal.resetInputError);\n        }, 400);\n        break;\n    }\n  }\n\n  /*\n   * Custom image\n   */\n  if (params.imageUrl) {\n    let $customIcon = modal.querySelector('.sa-icon.sa-custom');\n\n    $customIcon.style.backgroundImage = 'url(' + params.imageUrl + ')';\n    show($customIcon);\n\n    let _imgWidth = 80;\n    let _imgHeight = 80;\n\n    if (params.imageSize) {\n      let dimensions = params.imageSize.toString().split('x');\n      let imgWidth = dimensions[0];\n      let imgHeight = dimensions[1];\n\n      if (!imgWidth || !imgHeight) {\n        logStr('Parameter imageSize expects value with format WIDTHxHEIGHT, got ' + params.imageSize);\n      } else {\n        _imgWidth = imgWidth;\n        _imgHeight = imgHeight;\n      }\n    }\n\n    $customIcon.setAttribute('style', $customIcon.getAttribute('style') + 'width:' + _imgWidth + 'px; height:' + _imgHeight + 'px');\n  }\n\n  /*\n   * Show cancel button?\n   */\n  modal.setAttribute('data-has-cancel-button', params.showCancelButton);\n  if (params.showCancelButton) {\n    $cancelBtn.style.display = 'inline-block';\n  } else {\n    hide($cancelBtn);\n  }\n\n  /*\n   * Show confirm button?\n   */\n  modal.setAttribute('data-has-confirm-button', params.showConfirmButton);\n  if (params.showConfirmButton) {\n    $confirmBtn.style.display = 'inline-block';\n  } else {\n    hide($confirmBtn);\n  }\n\n  /*\n   * Custom text on cancel/confirm buttons\n   */\n  if (params.cancelButtonText) {\n    $cancelBtn.innerHTML = escapeHtml(params.cancelButtonText);\n  }\n  if (params.confirmButtonText) {\n    $confirmBtn.innerHTML = escapeHtml(params.confirmButtonText);\n  }\n\n  /*\n   * Custom color on confirm button\n   */\n  if (params.confirmButtonColor) {\n    // Set confirm button to selected background color\n    $confirmBtn.style.backgroundColor = params.confirmButtonColor;\n\n    // Set the confirm button color to the loading ring\n    $confirmBtn.style.borderLeftColor = params.confirmLoadingButtonColor;\n    $confirmBtn.style.borderRightColor = params.confirmLoadingButtonColor;\n\n    // Set box-shadow to default focused button\n    setFocusStyle($confirmBtn, params.confirmButtonColor);\n  }\n\n  /*\n   * Allow outside click\n   */\n  modal.setAttribute('data-allow-outside-click', params.allowOutsideClick);\n\n  /*\n   * Callback function\n   */\n  var hasDoneFunction = params.doneFunction ? true : false;\n  modal.setAttribute('data-has-done-function', hasDoneFunction);\n\n  /*\n   * Animation\n   */\n  if (!params.animation) {\n    modal.setAttribute('data-animation', 'none');\n  } else if (typeof params.animation === 'string') {\n    modal.setAttribute('data-animation', params.animation); // Custom animation\n  } else {\n    modal.setAttribute('data-animation', 'pop');\n  }\n\n  /*\n   * Timer\n   */\n  modal.setAttribute('data-timer', params.timer);\n};\n\nexport default setParameters;\n","/*\n * Allow user to pass their own params\n */\nvar extend = function(a, b) {\n  for (var key in b) {\n    if (b.hasOwnProperty(key)) {\n      a[key] = b[key];\n    }\n  }\n  return a;\n};\n\n/*\n * Convert HEX codes to RGB values (#000000 -> rgb(0,0,0))\n */\nvar hexToRgb = function(hex) {\n  var result = /^#?([a-f\\d]{2})([a-f\\d]{2})([a-f\\d]{2})$/i.exec(hex);\n  return result ? parseInt(result[1], 16) + ', ' + parseInt(result[2], 16) + ', ' + parseInt(result[3], 16) : null;\n};\n\n/*\n * Check if the user is using Internet Explorer 8 (for fallbacks)\n */\nvar isIE8 = function() {\n  return (window.attachEvent && !window.addEventListener);\n};\n\n/*\n * IE compatible logging for developers\n */\nvar logStr = function(string) {\n  if (window.console) {\n    // IE...\n    window.console.log('SweetAlert: ' + string);\n  }\n};\n\n/*\n * Set hover, active and focus-states for buttons \n * (source: http://www.sitepoint.com/javascript-generate-lighter-darker-color)\n */\nvar colorLuminance = function(hex, lum) {\n  // Validate hex string\n  hex = String(hex).replace(/[^0-9a-f]/gi, '');\n  if (hex.length < 6) {\n    hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];\n  }\n  lum = lum || 0;\n\n  // Convert to decimal and change luminosity\n  var rgb = '#';\n  var c;\n  var i;\n\n  for (i = 0; i < 3; i++) {\n    c = parseInt(hex.substr(i * 2, 2), 16);\n    c = Math.round(Math.min(Math.max(0, c + c * lum), 255)).toString(16);\n    rgb += ('00' + c).substr(c.length);\n  }\n\n  return rgb;\n};\n\n\nexport {\n  extend,\n  hexToRgb,\n  isIE8,\n  logStr,\n  colorLuminance\n};\n"]} - - - /* - * Use SweetAlert with RequireJS - */ - - if (typeof define === 'function' && define.amd) { - define(function () { - return sweetAlert; - }); - } else if (typeof module !== 'undefined' && module.exports) { - module.exports = sweetAlert; - } - -})(window, document); \ No newline at end of file diff --git a/static/js/websockets.js b/static/js/websockets.js deleted file mode 100644 index 3c6950e..0000000 --- a/static/js/websockets.js +++ /dev/null @@ -1,99 +0,0 @@ -var selfDestruct = false; - -$(document).ready(function() { - var isTyping = false; - var typingTimer; //timer identifier - var updateInterval; - var uhohTimer; - var doneTypingInterval = 500; //time in ms, 5 second for example - var pollToGetNewestCopyInterval = 30000; - //on keyup, start the countdown - $('#emit').keyup(function() { - clearTimeout(typingTimer); - clearInterval(updateInterval); - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-remove"); - typingTimer = setTimeout(doneTyping, doneTypingInterval); - }); - - //on keydown, clear the countdown - $('#emit').keydown(function() { - clearTimeout(typingTimer); - clearInterval(updateInterval); - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-remove"); - document.title = '✗ ' + title_name; - }); - - //user is "finished typing," do something - function doneTyping() { - payload = JSON.stringify({ TextData: currentText(), Title: title_name, UpdateServer: true, UpdateClient: false }) - send(payload) - uhohTimer = setTimeout(uhoh, 30000); - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-open"); - console.log("Done typing") - updateInterval = setInterval(updateText, pollToGetNewestCopyInterval); - document.title = "✓ " + title_name; - if (currentText().indexOf("self-destruct\n") > -1 || currentText().indexOf("\nself-destruct") > -1) { - if (selfDestruct == false) { - selfDestruct = true; - swal({ title: "Info", text: "This page is primed to self-destruct.", timer: 1000, showConfirmButton: true }); - } - } else { - if (selfDestruct == true) { - selfDestruct = false; - swal({ title: "Info", text: "This page is no longer primed to self-destruct.", timer: 1000, showConfirmButton: true }); - } - } - } - - function uhoh() { - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-remove"); - setInterval(location.reload(), 1000); - } - - function updateText() { - console.log("Getting server's latest copy") - payload = JSON.stringify({ TextData: currentText(), Title: title_name, UpdateServer: false, UpdateClient: true }) - send(payload) - clearTimeout(uhohTimer); - } - - // websockets - url = socketType + '://'+external_ip+'/ws'; - c = new WebSocket(url); - - send = function(data){ - - console.log("Sending: " + data) - c.send(data) - } - - c.onmessage = function(msg){ - console.log(msg) - data = JSON.parse(msg.data); - if (data.UpdateClient == true) { - console.log("Updating...") - $('#emit_data').val(data.TextData) - document.title = " " + title_name; - } - console.log((data.TextData == "saved")) - console.log(data.TextData) - if (data.TextData == "saved") { - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-saved"); - clearTimeout(uhohTimer); - } - console.log(data) - } - - c.onopen = function(){ - // updateText(); - updateInterval = setInterval(updateText, pollToGetNewestCopyInterval); - } - - - $('.postselfdestruct').click(function(event) { - event.preventDefault(); - $('#emit_data').val("self-destruct\n\n"+currentText() + "\n\n"); - doneTyping(); - }); - -}); diff --git a/static/js/xml.js b/static/js/xml.js deleted file mode 100644 index f987a3a..0000000 --- a/static/js/xml.js +++ /dev/null @@ -1,394 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -var htmlConfig = { - autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true, - 'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true, - 'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true, - 'track': true, 'wbr': true, 'menuitem': true}, - implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true, - 'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true, - 'th': true, 'tr': true}, - contextGrabbers: { - 'dd': {'dd': true, 'dt': true}, - 'dt': {'dd': true, 'dt': true}, - 'li': {'li': true}, - 'option': {'option': true, 'optgroup': true}, - 'optgroup': {'optgroup': true}, - 'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true, - 'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true, - 'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true, - 'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true, - 'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true}, - 'rp': {'rp': true, 'rt': true}, - 'rt': {'rp': true, 'rt': true}, - 'tbody': {'tbody': true, 'tfoot': true}, - 'td': {'td': true, 'th': true}, - 'tfoot': {'tbody': true}, - 'th': {'td': true, 'th': true}, - 'thead': {'tbody': true, 'tfoot': true}, - 'tr': {'tr': true} - }, - doNotIndent: {"pre": true}, - allowUnquoted: true, - allowMissing: true, - caseFold: true -} - -var xmlConfig = { - autoSelfClosers: {}, - implicitlyClosed: {}, - contextGrabbers: {}, - doNotIndent: {}, - allowUnquoted: false, - allowMissing: false, - caseFold: false -} - -CodeMirror.defineMode("xml", function(editorConf, config_) { - var indentUnit = editorConf.indentUnit - var config = {} - var defaults = config_.htmlMode ? htmlConfig : xmlConfig - for (var prop in defaults) config[prop] = defaults[prop] - for (var prop in config_) config[prop] = config_[prop] - - // Return variables for tokenizers - var type, setStyle; - - function inText(stream, state) { - function chain(parser) { - state.tokenize = parser; - return parser(stream, state); - } - - var ch = stream.next(); - if (ch == "<") { - if (stream.eat("!")) { - if (stream.eat("[")) { - if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>")); - else return null; - } else if (stream.match("--")) { - return chain(inBlock("comment", "-->")); - } else if (stream.match("DOCTYPE", true, true)) { - stream.eatWhile(/[\w\._\-]/); - return chain(doctype(1)); - } else { - return null; - } - } else if (stream.eat("?")) { - stream.eatWhile(/[\w\._\-]/); - state.tokenize = inBlock("meta", "?>"); - return "meta"; - } else { - type = stream.eat("/") ? "closeTag" : "openTag"; - state.tokenize = inTag; - return "tag bracket"; - } - } else if (ch == "&") { - var ok; - if (stream.eat("#")) { - if (stream.eat("x")) { - ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";"); - } else { - ok = stream.eatWhile(/[\d]/) && stream.eat(";"); - } - } else { - ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";"); - } - return ok ? "atom" : "error"; - } else { - stream.eatWhile(/[^&<]/); - return null; - } - } - inText.isInText = true; - - function inTag(stream, state) { - var ch = stream.next(); - if (ch == ">" || (ch == "/" && stream.eat(">"))) { - state.tokenize = inText; - type = ch == ">" ? "endTag" : "selfcloseTag"; - return "tag bracket"; - } else if (ch == "=") { - type = "equals"; - return null; - } else if (ch == "<") { - state.tokenize = inText; - state.state = baseState; - state.tagName = state.tagStart = null; - var next = state.tokenize(stream, state); - return next ? next + " tag error" : "tag error"; - } else if (/[\'\"]/.test(ch)) { - state.tokenize = inAttribute(ch); - state.stringStartCol = stream.column(); - return state.tokenize(stream, state); - } else { - stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/); - return "word"; - } - } - - function inAttribute(quote) { - var closure = function(stream, state) { - while (!stream.eol()) { - if (stream.next() == quote) { - state.tokenize = inTag; - break; - } - } - return "string"; - }; - closure.isInAttribute = true; - return closure; - } - - function inBlock(style, terminator) { - return function(stream, state) { - while (!stream.eol()) { - if (stream.match(terminator)) { - state.tokenize = inText; - break; - } - stream.next(); - } - return style; - }; - } - function doctype(depth) { - return function(stream, state) { - var ch; - while ((ch = stream.next()) != null) { - if (ch == "<") { - state.tokenize = doctype(depth + 1); - return state.tokenize(stream, state); - } else if (ch == ">") { - if (depth == 1) { - state.tokenize = inText; - break; - } else { - state.tokenize = doctype(depth - 1); - return state.tokenize(stream, state); - } - } - } - return "meta"; - }; - } - - function Context(state, tagName, startOfLine) { - this.prev = state.context; - this.tagName = tagName; - this.indent = state.indented; - this.startOfLine = startOfLine; - if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent)) - this.noIndent = true; - } - function popContext(state) { - if (state.context) state.context = state.context.prev; - } - function maybePopContext(state, nextTagName) { - var parentTagName; - while (true) { - if (!state.context) { - return; - } - parentTagName = state.context.tagName; - if (!config.contextGrabbers.hasOwnProperty(parentTagName) || - !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) { - return; - } - popContext(state); - } - } - - function baseState(type, stream, state) { - if (type == "openTag") { - state.tagStart = stream.column(); - return tagNameState; - } else if (type == "closeTag") { - return closeTagNameState; - } else { - return baseState; - } - } - function tagNameState(type, stream, state) { - if (type == "word") { - state.tagName = stream.current(); - setStyle = "tag"; - return attrState; - } else { - setStyle = "error"; - return tagNameState; - } - } - function closeTagNameState(type, stream, state) { - if (type == "word") { - var tagName = stream.current(); - if (state.context && state.context.tagName != tagName && - config.implicitlyClosed.hasOwnProperty(state.context.tagName)) - popContext(state); - if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) { - setStyle = "tag"; - return closeState; - } else { - setStyle = "tag error"; - return closeStateErr; - } - } else { - setStyle = "error"; - return closeStateErr; - } - } - - function closeState(type, _stream, state) { - if (type != "endTag") { - setStyle = "error"; - return closeState; - } - popContext(state); - return baseState; - } - function closeStateErr(type, stream, state) { - setStyle = "error"; - return closeState(type, stream, state); - } - - function attrState(type, _stream, state) { - if (type == "word") { - setStyle = "attribute"; - return attrEqState; - } else if (type == "endTag" || type == "selfcloseTag") { - var tagName = state.tagName, tagStart = state.tagStart; - state.tagName = state.tagStart = null; - if (type == "selfcloseTag" || - config.autoSelfClosers.hasOwnProperty(tagName)) { - maybePopContext(state, tagName); - } else { - maybePopContext(state, tagName); - state.context = new Context(state, tagName, tagStart == state.indented); - } - return baseState; - } - setStyle = "error"; - return attrState; - } - function attrEqState(type, stream, state) { - if (type == "equals") return attrValueState; - if (!config.allowMissing) setStyle = "error"; - return attrState(type, stream, state); - } - function attrValueState(type, stream, state) { - if (type == "string") return attrContinuedState; - if (type == "word" && config.allowUnquoted) {setStyle = "string"; return attrState;} - setStyle = "error"; - return attrState(type, stream, state); - } - function attrContinuedState(type, stream, state) { - if (type == "string") return attrContinuedState; - return attrState(type, stream, state); - } - - return { - startState: function(baseIndent) { - var state = {tokenize: inText, - state: baseState, - indented: baseIndent || 0, - tagName: null, tagStart: null, - context: null} - if (baseIndent != null) state.baseIndent = baseIndent - return state - }, - - token: function(stream, state) { - if (!state.tagName && stream.sol()) - state.indented = stream.indentation(); - - if (stream.eatSpace()) return null; - type = null; - var style = state.tokenize(stream, state); - if ((style || type) && style != "comment") { - setStyle = null; - state.state = state.state(type || style, stream, state); - if (setStyle) - style = setStyle == "error" ? style + " error" : setStyle; - } - return style; - }, - - indent: function(state, textAfter, fullLine) { - var context = state.context; - // Indent multi-line strings (e.g. css). - if (state.tokenize.isInAttribute) { - if (state.tagStart == state.indented) - return state.stringStartCol + 1; - else - return state.indented + indentUnit; - } - if (context && context.noIndent) return CodeMirror.Pass; - if (state.tokenize != inTag && state.tokenize != inText) - return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0; - // Indent the starts of attribute names. - if (state.tagName) { - if (config.multilineTagIndentPastTag !== false) - return state.tagStart + state.tagName.length + 2; - else - return state.tagStart + indentUnit * (config.multilineTagIndentFactor || 1); - } - if (config.alignCDATA && /$/, - blockCommentStart: "", - - configuration: config.htmlMode ? "html" : "xml", - helperType: config.htmlMode ? "html" : "xml", - - skipAttribute: function(state) { - if (state.state == attrValueState) - state.state = attrState - } - }; -}); - -CodeMirror.defineMIME("text/xml", "xml"); -CodeMirror.defineMIME("application/xml", "xml"); -if (!CodeMirror.mimeModes.hasOwnProperty("text/html")) - CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true}); - -}); diff --git a/static/text/adjectives b/static/text/adjectives deleted file mode 100644 index 56f9661..0000000 --- a/static/text/adjectives +++ /dev/null @@ -1,16027 +0,0 @@ -abducent -adducent -nascent -emergent -dissilient -parturient -dying -moribund -last -abridged -cut -potted -unabridged -absolute -direct -implicit -infinite -living -relative -relational -absorbent -absorbefacient -assimilating -hygroscopic -receptive -spongy -thirsty -nonabsorbent -repellent -adsorbent -chemisorptive -nonadsorbent -absorbable -adsorbable -abstemious -abstinent -ascetic -gluttonous -crapulous -crapulent -edacious -greedy -hoggish -overgreedy -abstract -conceptional -conceptual -ideal -ideological -concrete -objective -real -abundant -abounding -ample -copious -easy -exuberant -thick -long -overabundant -plentiful -rampant -rank -superabundant -teeming -torrential -verdant -scarce -rare -tight -abused -battered -unabused -acceptable -bankable -unexceptionable -unobjectionable -unacceptable -exceptionable -accessible -approachable -handy -inaccessible -outback -pathless -unapproachable -accommodating -complaisant -unaccommodating -disobliging -accurate -close -surgical -straight -true -veracious -inaccurate -away -faulty -unfaithful -wide -accustomed -unaccustomed -new -unused -acidic -acid -alkaline -alkalescent -basic -saltlike -amphoteric -acidophilic -acknowledged -accepted -assumptive -declarable -given -putative -unacknowledged -unappreciated -unavowed -unconfessed -unrecognized -acquisitive -accumulative -avaricious -possessive -plundering -predaceous -rapacious -sordid -unacquisitive -acropetal -basipetal -active -about -acrobatic -agile -hot -hyperactive -sporty -inactive -abeyant -hypoactive -inert -sedentary -active -activated -inactive -off -retired -active -brisk -bustling -busy -open -springy -inactive -dark -dead -dull -idle -strikebound -active -progressive -inactive -flat -indolent -latent -quiescent -active -activist -proactive -passive -resistless -active -eruptive -dormant -quiescent -extinct -dead -active -alive -active -stative -active -passive -active -activated -counteractive -inactive -quiescent -active -quiet -actual -effective -potential -latent -acute -subacute -chronic -degenerative -virulent -deadly -avirulent -adaptive -accommodative -adaptational -adjustive -maladaptive -dysfunctional -maladjustive -addicted -alcoholic -dependent -unaddicted -clean -addictive -nonaddictive -additive -accumulative -addable -extra -complemental -incremental -intercalary -summational -supplementary -subtractive -ablative -reductive -addressed -unaddressed -adequate -competent -inadequate -deficient -incapable -adhesive -adherent -agglutinate -bondable -coherent -cohesive -gluey -gooey -gummed -pitchy -sticky -nonadhesive -nonglutinous -nonresinous -ungummed -adjective -substantive -adoptable -unadoptable -adorned -beady -bedaubed -bespectacled -brocaded -buttony -carbuncled -champleve -clinquant -crested -crested -crested -crocketed -feathery -frilled -fringed -inflamed -inlaid -inwrought -tessellated -mounted -paneled -studded -tapestried -tasseled -tufted -unadorned -plain -untufted -cholinergic -anticholinergic -adroit -clean -clever -coordinated -deft -handy -maladroit -bumbling -inept -uncoordinated -unmechanical -advantageous -beneficial -plus -discriminatory -disadvantageous -minus -adventurous -audacious -sporting -swaggering -unadventurous -safe -advisable -inadvisable -considered -aerobic -aerobiotic -oxidative -anaerobic -aerobic -anaerobic -aesthetic -artistic -cosmetic -painterly -sensuous -inaesthetic -inartistic -affected -smitten -subject -taken -unaffected -immune -unimpressed -uninfluenced -affected -agonistic -artificial -constrained -elocutionary -mannered -plummy -unaffected -lifelike -unmannered -unselfconscious -unstilted -affirmative -assentient -negative -dissentient -acceptive -accepting -rejective -dismissive -repudiative -agoraphobic -alarmed -algophobic -apprehensive -hangdog -claustrophobic -fearful -frightened -horrified -hunted -hydrophobic -mysophobic -panicky -numb -shitless -triskaidekaphobic -unnerved -xenophobic -unafraid -unapprehensive -unblinking -unfrightened -aggressive -battleful -competitive -hostile -obstreperous -predatory -pugnacious -scrappy -truculent -unaggressive -agitated -aroused -distraught -jolted -feverish -frantic -hysterical -psychedelic -unagitated -agitated -churning -churning -jolted -rippled -seething -stirred -unagitated -nonturbulent -unstirred -agreeable -disagreeable -annoying -harsh -unsweet -alert -fly -lidless -unalert -algorithmic -recursive -heuristic -alienable -appropriable -assignable -inalienable -absolute -nontransferable -alive -liveborn -viable -vital -dead -asleep -assassinated -bloodless -breathless -cold -d.o.a. -deathlike -defunct -doomed -executed -fallen -late -lifeless -murdered -nonviable -slain -stillborn -apocrine -eccrine -artesian -subartesian -live -living -dead -extinct -lifeless -alphabetic -abecedarian -alphabetized -analphabetic -altricial -precocial -altruistic -egoistic -ambiguous -enigmatic -multivalent -polysemous -uncertain -unambiguous -monosemous -ambitious -pushful -aspirant -compulsive -manque -overambitious -unambitious -shiftless -ametropic -emmetropic -ample -full -generous -wide -meager -bare -exiguous -hardscrabble -measly -anabolic -catabolic -anaclinal -cataclinal -anastigmatic -astigmatic -anticlinal -synclinal -anadromous -catadromous -diadromous -anabatic -katabatic -anal -oral -analogue -digital -analytic -synthetic -analytic -isolating -synthetic -agglutinative -analytic -synthetic -inflectional -derivational -apocarpous -syncarpous -angry -aggravated -angered -black -choleric -huffy -indignant -irate -livid -smoldering -wrathful -unangry -resentful -acrimonious -rancorous -unresentful -unbitter -sentient -sensate -insentient -unfeeling -animate -inanimate -nonconscious -animated -enlivened -reanimated -unanimated -lifeless -wan -enlivened -unenlivened -animate -inanimate -anonymous -nameless -onymous -binomial -pseudonymous -antemortem -postmortem -antecedent -anterior -anticipatory -preexistent -subsequent -attendant -later -antrorse -retrorse -decurved -aquatic -marine -semiaquatic -subaqueous -terrestrial -onshore -overland -amphibious -amphibiotic -preceding -above -foregoing -introductory -precedent -premedical -preparatory -previous -succeeding -ensuing -following -following -postmortem -precedented -unprecedented -new -prehensile -nonprehensile -prenatal -perinatal -postnatal -preprandial -postprandial -prewar -postwar -retrograde -anterograde -antemeridian -postmeridian -anterior -frontal -frontal -prefrontal -posterior -back -caudal -retral -dorsal -ventral -dorsoventral -appealable -unappealable -appendaged -unappendaged -appetizing -unappetizing -approachable -accessible -unapproachable -offish -appropriate -befitting -pat -proper -inappropriate -unbefitting -improper -due -callable -collect -collectible -delinquent -receivable -repayable -undue -due -undue -apropos -apposite -malapropos -inapposite -apteral -amphiprostylar -prostyle -peripteral -monopteral -peristylar -arbitrable -nonarbitrable -columned -amphistylar -columnar -columniform -colonnaded -pillared -noncolumned -astylar -unpillared -arboreal -nonarboreal -arenaceous -argillaceous -armed -equipped -militarized -unarmed -barehanded -clean -defenseless -weaponless -armored -bulletproof -scaled -unarmored -armed -barbed -bristlelike -brushlike -thistlelike -clawed -unarmed -thornless -armed -armlike -brachiate -armless -armored -scaly -unarmored -scaleless -artful -crafty -cute -designing -deep -elusive -manipulative -pawky -artless -careless -articulate -eloquent -inarticulate -aphasic -aphonic -dumb -dumb -incoherent -mute -speechless -unarticulated -speaking -tongued -nonspeaking -articulated -jointed -unarticulated -unjointed -ashamed -discredited -embarrassed -guilty -shamefaced -unashamed -audacious -shameless -unabashed -assertive -cocky -emphatic -unassertive -nonassertive -reticent -associative -associable -nonassociative -attached -bespoken -intended -involved -unattached -unengaged -affixed -appendant -basifixed -glued -mounted -unaffixed -sessile -pedunculate -sessile -vagile -attached -detached -freestanding -semidetached -stuck -cragfast -unstuck -attachable -bindable -detachable -clastic -wary -shy -unwary -gullible -unguarded -attentive -captive -advertent -observant -oversolicitous -solicitous -inattentive -absent -distracted -dreamy -drowsy -forgetful -attractive -bewitching -charismatic -cunning -dinky -engaging -fetching -glossy -hypnotic -irresistible -personable -photogenic -prepossessing -winsome -unattractive -homely -subfusc -unprepossessing -attractive -repulsive -appealing -attractive -unappealing -unattractive -attributable -ascribable -credited -traceable -unattributable -attributive -predicative -pregnant -big -nonpregnant -audible -clunky -sonic -sounding -inaudible -breathed -infrasonic -silent -silent -supersonic -unheard -sonic -subsonic -supersonic -auspicious -bright -fortunate -inauspicious -unpromising -propitious -golden -gracious -unpropitious -ill -thunderous -authorized -accredited -approved -canonized -empowered -unauthorized -unaccredited -constitutional -unconstitutional -autochthonous -allochthonous -autoecious -heteroecious -autogenous -heterogenous -automatic -autoloading -automated -semiautomatic -smart -manual -available -accessible -acquirable -addressable -easy -forthcoming -gettable -lendable -visible -open -purchasable -ready -unavailable -inaccessible -awake -astir -awakened -insomniac -unsleeping -waking -asleep -dormant -drowsy -hypnoid -sleepy -slumberous -unawakened -astringent -styptic -nonastringent -aware -alert -conscious -sensible -unaware -oblivious -unconscious -unsuspecting -witting -unwitting -alarming -appalling -atrocious -awful -baleful -bloodcurdling -chilling -creepy -formidable -ghastly -hairy -petrifying -stupefying -terrific -unalarming -anemophilous -entomophilous -reassuring -assuasive -assuring -comforting -unreassuring -back -backmost -rear -front -advance -foremost -frontal -leading -directing -guiding -following -pursuing -backed -hardbacked -razorback -backless -backward -backswept -cacuminal -converse -inverse -rearward -receding -reflexive -regardant -retracted -retral -retroflex -returning -forward -guardant -headfirst -forward -reverse -backward -bashful -forward -brash -bumptious -overfamiliar -fresh -assumptive -balconied -unbalconied -barreled -unbarreled -beaked -beaklike -billed -duckbill -rostrate -beakless -bedded -bedless -beneficed -unbeneficed -stratified -foliate -laminar -layered -sheetlike -unstratified -ferned -braky -fernlike -fernless -grassy -grasslike -rushlike -sedgy -grassless -gusseted -ungusseted -hairless -bald -balding -beardless -depilatory -depilous -glabrescent -glabrous -nonhairy -tonsured -hairy -canescent -comate -downy -floccose -furlike -furred -fuzzed -hispid -lanate -pappose -pilous -tomentose -wiry -wooly -awned -bearded -awnless -bearing -nonbearing -beautiful -beauteous -bonny -dishy -exquisite -glorious -gorgeous -lovely -picturesque -pretty -pulchritudinous -ravishing -scenic -stunning -ugly -disfigured -fugly -grotesque -hideous -scrofulous -unlovely -unsightly -bellied -bellyless -banded -unbanded -belted -banded -beltlike -unbelted -beneficent -benefic -maleficent -baleful -malefic -malicious -despiteful -leering -malevolent -bitchy -poisonous -venomed -vixenish -unmalicious -benign -kindly -malign -cancerous -best -champion -first -optimum -primo -superfine -unexcelled -unsurpassable -worst -bottom -last -pessimal -better -amended -finer -improved -worse -worsened -better -fitter -worse -bettering -ameliorating -amendatory -corrective -remedial -worsening -bicameral -unicameral -bidirectional -biface -duplex -unidirectional -simplex -unifacial -faced -featured -visaged -faceless -anonymous -bibbed -bibless -unilateral -multilateral -bilateral -bipartite -joint -multipartite -quadrilateral -quadripartite -tetramerous -trilateral -tripartite -bimodal -unimodal -binaural -stereophonic -monaural -mono -binucleate -mononuclear -trinucleate -bipedal -quadrupedal -black -colored -negro -negroid -white -Caucasian -blond -fair -flaxen -nordic -redheaded -brunet -adust -bronzed -brown -dark -grizzled -nutbrown -blemished -acned -blebbed -blotchy -flyblown -marred -pocked -unblemished -stainless -bloody -bloodstained -bloodsucking -bloodthirsty -crimson -homicidal -gory -internecine -bloodless -nonviolent -bold -audacious -daredevil -emboldened -foolhardy -heroic -nervy -overreaching -overvaliant -timid -bashful -coy -fearful -intimidated -mousy -bound -chained -fettered -furled -pinioned -tethered -trussed -wired -unbound -unchained -untethered -laced -unlaced -tied -knotted -untied -tangled -afoul -enmeshed -entangled -knotty -matted -rootbound -thrown -untangled -disentangled -bound -brassbound -cased -paperback -unbound -looseleaf -bordered -boxed -deckled -edged -fringed -lined -seagirt -unbordered -lotic -lentic -proletarian -propertyless -bourgeois -bourgeois -quality -propertied -u -tweedy -wellborn -brachycephalic -dolichocephalic -brave -desperate -gallant -game -lionhearted -stalwart -undaunted -valiant -cowardly -caitiff -chicken -craven -dastard -faint -funky -poltroon -pusillanimous -gutsy -gutless -nursed -breathing -breathless -asphyxiating -smothering -blown -crystalline -crystallized -microcrystalline -polycrystalline -noncrystalline -amorphous -landed -landless -light -ablaze -autofluorescent -bioluminescent -bright -candescent -floodlit -fluorescent -illuminated -incandescent -lamplit -livid -luminescent -phosphorescent -sunlit -white -dark -Acheronian -aphotic -black -caliginous -Cimmerian -crepuscular -darkened -darkening -darkling -darkling -dim -dusky -glooming -lightless -semidark -tenebrous -shaded -murky -shady -unshaded -unshadowed -shaded -hatched -unshaded -moonlit -moonless -bridgeable -unbridgeable -bright -agleam -aglow -aglitter -beady -beaming -blazing -brilliant -ardent -glimmery -glistening -iridescent -lurid -noctilucent -satiny -shimmery -silver -twinkling -dull -flat -lackluster -soft -dimmed -undimmed -prejudiced -homophobic -jaundiced -loaded -racist -sexist -unprejudiced -broad -catholic -dogmatic -illiberal -opinionated -petty -reconstructed -unreconstructed -broken -unbroken -broken -unbroken -broken -dashed -fitful -halting -unbroken -solid -uninterrupted -brotherly -sisterly -exergonic -endergonic -fraternal -identical -buried -belowground -unburied -busy -drudging -engaged -overbusy -idle -faineant -lackadaisical -leisured -unengaged -bony -bone -boned -bonelike -boneless -boned -buttoned -botonee -unbuttoned -capitalistic -bourgeois -competitive -individualistic -socialistic -collective -collectivist -cacophonous -cackly -croaky -grating -gruff -jangling -jarring -raucous -rending -euphonious -golden -silvern -calculable -computable -countable -incalculable -countless -incomputable -indeterminable -calm -placid -settled -windless -stormy -angry -billowy -blustering -boisterous -blowy -choppy -dirty -gusty -squally -thundery -camphorated -uncamphorated -capable -able -confident -resourceful -incapable -unable -capable -incapable -attended -neglected -untended -careful -certain -close -conscientious -detailed -minute -overcareful -particular -protective -studious -thorough -careless -casual -haphazard -heedless -incautious -offhand -carnivorous -piscivorous -predacious -herbivorous -anthophagous -baccivorous -carpophagous -saprophagous -saprophytic -omnivorous -insectivorous -apivorous -myrmecophagous -holozoic -holophytic -carpellate -acarpelous -carpeted -uncarpeted -carved -engraved -graven -lapidarian -sliced -uncarved -acatalectic -catalectic -hypercatalectic -cauline -radical -censored -expurgated -uncensored -unexpurgated -caudate -bobtail -caudal -tailed -acaudate -anurous -caulescent -acaulescent -causative -abortifacient -activating -anorectic -causal -conducive -errhine -fast -inductive -motivative -motive -precipitating -responsible -sternutatory -noncausative -cautious -cagey -fabian -gingerly -guarded -overcautious -incautious -hotheaded -cellular -cancellate -alveolate -multicellular -noncellular -coherent -incoherent -compartmented -compartmental -uncompartmented -porous -porose -nonporous -central -amidship -bicentric -bifocal -center -centered -centric -focal -median -middlemost -nuclear -peripheral -circumferential -fringy -encircling -centrifugal -centripetal -afferent -centripetal -corticoafferent -efferent -centrifugal -corticoefferent -neuromotor -centralizing -centripetal -consolidative -decentralizing -centrifugal -certain -definite -indisputable -uncertain -indefinite -certain -convinced -uncertain -ambivalent -doubtful -groping -convinced -unconvinced -dubious -confident -assured -cocksure -reassured -diffident -certain -bound -doomed -foreordained -uncertain -chancy -contingent -certified -certifiable -certificated -credentialled -uncertified -inevitable -fatal -ineluctable -necessary -evitable -preventable -unpreventable -changeable -adjustable -astatic -checkered -distortable -erratic -fluid -fluid -jittering -kaleidoscopic -mobile -reversible -volatile -unchangeable -changeless -confirmed -fixed -static -commutable -alterable -convertible -incommutable -inconvertible -unalterable -alterable -unalterable -incurable -final -modifiable -unmodifiable -adjusted -focused -weighted -unadjusted -maladjusted -adjusted -maladjusted -unadapted -altered -adjusted -changed -emended -paraphrastic -revised -unaltered -dateless -unedited -unreduced -unrevised -amended -revised -unamended -changed -denatured -exchanged -transformed -varied -unchanged -idempotent -same -isometric -isotonic -ionized -nonionized -mutable -immutable -characteristic -diagnostic -distinctive -peculiar -uncharacteristic -charged -hot -negative -positive -polar -uncharged -neutral -dead -charitable -beneficent -uncharitable -chartered -unchartered -owned -unowned -chaste -celibate -pure -unchaste -cyprian -easy -fallen -licentious -cheerful -beaming -beamish -blithe -buoyant -cheery -chipper -depressing -blue -somber -chlamydeous -achlamydeous -chondritic -achondritic -monoclinic -triclinic -monochromatic -polychromatic -chromatic -amber -amethyst -auburn -aureate -avocado -azure -beige -blae -blue -blushful -bronze -brown -buff -canary -caramel -carnation -chartreuse -chestnut -coppery -coral -creamy -dun -earthlike -fuscous -green -hazel -honey -jade -khaki -lavender -magenta -maroon -mauve -mousy -ocher -olive -orange -peachy -pink -purple -red -rose -russet -rust -sage -sapphire -snuff -sorrel -stone -straw -tan -tannish -tangerine -tawny -ultramarine -umber -vermilion -vinaceous -yellow -achromatic -argent -blackish -canescent -chalky -charcoal -ebon -grey -hueless -pearly -sable -whitish -black -white -albescent -saturated -intense -unsaturated -dull -color -colored -crimson -bay -bicolor -black -ginger -indigo -monochromatic -motley -polychromatic -roan -trichromatic -uncolored -achromatous -achromic -stained -unstained -untreated -colorful -ablaze -bright -changeable -deep -fluorescent -prismatic -psychedelic -shrill -vibrant -colorless -ashen -bleached -drab -dulled -etiolate -lurid -pale -pasty -prefaded -waxen -white -colorful -brave -flashy -noisy -picturesque -colorless -neutral -pale -light -pale -palish -pastel -powdery -dark -darkish -chromatic -diatonic -cismontane -cisalpine -tramontane -transalpine -christian -christianly -christlike -unchristian -christless -unchristianly -civilized -advanced -civil -humane -noncivilized -barbarian -barbarous -preliterate -primitive -classical -classical -neoclassic -nonclassical -modern -popular -classified -categorized -grouped -unclassified -uncategorized -classified -confidential -restricted -secret -sensitive -unclassified -declassified -nonsensitive -analyzed -unanalyzed -crude -clean -cleanable -cleanly -fresh -immaculate -pristine -scrubbed -unsoiled -unsullied -washed -dirty -Augean -bedraggled -befouled -begrimed -black -buggy -cobwebby -feculent -filthy -flyblown -greasy -lousy -maculate -mucky -ratty -scummy -smudgy -snotty -sooty -uncleanly -unswept -unwashed -clean -antiseptic -dirty -bawdy -blasphemous -cruddy -lewd -scabrous -scatological -clean -dirty -radioactive -hot -nonradioactive -clean -halal -kosher -unclean -nonkosher -untouchable -clear -broad -limpid -unmistakable -vivid -unclear -blurred -confusing -obscure -clear -crystalline -hyaline -liquid -translucent -unclouded -unfrosted -opaque -cloudy -fogged -frosted -glaucous -lightproof -milky -semiopaque -solid -radiolucent -radiopaque -clearheaded -clear -unclouded -confused -addlebrained -addled -befogged -clouded -dazed -dazzled -trancelike -clement -lenient -inclement -unsparing -clement -balmy -inclement -smart -astute -cagey -streetwise -stupid -anserine -blockheaded -cloddish -dense -gaumless -lumpish -nitwitted -weak -clockwise -dextrorotary -counterclockwise -levorotary -far -cold -distant -distant -faraway -farther -farthermost -further -outlying -near -adjacent -nearby -warm -hot -distant -deep -extreme -nonadjacent -yonder -close -adjacent -ambient -appressed -approximate -contiguous -encompassing -enveloping -juxtaposed -nestled -proximate -scalelike -distant -faraway -removed -ulterior -close -approximate -boon -chummy -confidential -cozy -dear -familiar -intimate -cousinly -uncousinly -clothed -appareled -arrayed -breeched -caparisoned -cassocked -coated -costumed -cowled -dighted -dressed -gowned -habited -overdressed -petticoated -suited -surpliced -togged -tuxedoed -underdressed -uniformed -vestmented -unclothed -bare -bareheaded -barelegged -bottomless -clothesless -exposed -seminude -starkers -stripped -unappareled -saddled -unsaddled -bareback -clear -cloudless -fair -serene -cloudy -brumous -fogbound -cloudlike -dull -heavy -miasmal -smoggy -coastal -coastwise -inshore -maritime -seaward -inland -interior -landlocked -inshore -offshore -coherent -seamless -incoherent -confused -fuzzy -collapsible -foldable -telescopic -noncollapsible -nontelescopic -crannied -uncrannied -collective -agglomerate -aggregate -collectivized -knockdown -distributive -allocable -diffusing -immanent -permeant -separative -suffusive -publicized -advertised -heralded -promulgated -suppressed -burked -quelled -unreleased -published -unpublished -publishable -unpublishable -reported -according -notifiable -reportable -unreported -reportable -unreportable -combinative -combinatorial -combinable -noncombinative -noncombining -combustible -burnable -comburent -flammable -ignescent -incendiary -noncombustible -fireproof -flameproof -nonflammable -explosive -detonative -nonexplosive -lighted -ablaze -ignited -unlighted -unkindled -commodious -roomy -incommodious -cramped -comfortable -cozy -easy -homelike -soothing -uncomfortable -bad -comfortless -irritating -miserable -uneasy -warm -comfortable -comforted -uncomfortable -awkward -disquieting -commensurate -coextensive -commensurable -proportionate -incommensurate -disproportionate -incommensurable -proportionate -proportionable -proportional -proportional -disproportionate -commercial -commercialized -mercantile -mercantile -technical -noncommercial -nonprofit -uncommercial -uncommercialized -residential -nonresidential -commissioned -noncommissioned -common -average -democratic -demotic -frequent -general -grassroots -standard -uncommon -especial -rare -unusual -unwonted -usual -accustomed -chronic -regular -unusual -different -extraordinary -odd -peculiar -unaccustomed -unique -hydrophobic -hydrophilic -deliquescent -oleophilic -lipophilic -oleophobic -common -communal -public -individual -idiosyncratic -individualist -respective -singular -communicative -anecdotic -blabbermouthed -chatty -communicable -communicational -expansive -expressive -gesticulating -gestural -gestural -heraldic -narrative -nonverbal -nonverbal -openhearted -outspoken -verbal -uncommunicative -blank -close -deadpan -incommunicado -inexpressive -mum -unpronounceable -compact -clayey -consolidated -impacted -packed -serried -tight -loose -light -shifting -silty -unconsolidated -comparable -incomparable -incommensurable -matchless -alone -compassionate -caring -nurturant -tenderhearted -uncompassionate -hardhearted -compatible -congenial -congruous -harmonious -incompatible -antagonistic -clashing -contradictory -uncongenial -compatible -incompatible -miscible -compatible -immiscible -incompatible -competent -able -effective -workmanlike -incompetent -feckless -ineffective -unworkmanlike -competent -incompetent -competitive -agonistic -emulous -matched -noncompetitive -accommodative -monopolistic -uncompetitive -complaining -fretful -protestant -uncomplaining -compressible -compressed -incompressible -whole -entire -integral -livelong -undivided -fractional -aliquot -divisional -fragmental -half -halfway -whole -half -committed -pledged -uncommitted -floating -undecided -dedicated -devoted -devoted -sacred -undedicated -complete -absolute -accomplished -all -allover -clean -completed -dead -exhaustive -full -good -hearty -sound -incomplete -broken -half -neither -partial -rudimentary -sketchy -uncompleted -comprehensive -citywide -countywide -countrywide -cosmopolitan -encyclopedic -large -omnibus -plenary -spatiotemporal -schoolwide -statewide -super -umbrella -noncomprehensive -limited -composed -calm -imperturbable -collected -cool -unflurried -discomposed -abashed -blushful -bothered -discombobulated -flustered -unstrung -comprehensible -accessible -apprehensible -fathomable -incomprehensible -dark -enigmatic -unfathomable -impenetrable -indecipherable -lost -opaque -concave -acetabular -biconcave -bursiform -cuplike -cupular -dished -planoconcave -recessed -umbilicate -convex -biconvex -gibbous -planoconvex -umbellate -concentrated -bunchy -thick -cumulous -single -thickset -distributed -apportioned -broken -diffuse -diffused -dispensed -dispersed -divided -encyclical -fanned -rationed -scattered -separated -sparse -splashed -straggly -unfocused -concentric -coaxial -eccentric -acentric -concerned -afraid -afraid -haunted -solicitous -unconcerned -blase -blithe -casual -degage -indifferent -concise -aphoristic -brief -compendious -crisp -cryptic -elliptic -pithy -telegraphic -prolix -diffuse -verbal -pleonastic -conclusive -definitive -inconclusive -equivocal -indeterminate -nisi -consummated -completed -fulfilled -unconsummated -coordinating -subordinating -accordant -according -agreeable -concordant -consensual -consentaneous -discordant -dissentious -contracted -contractile -expanded -atrophied -hypertrophied -conditional -counterfactual -contingent -dependent -probationary -provisory -unconditional -blunt -vested -enforceable -unenforceable -enforced -unenforced -conductive -semiconducting -nonconductive -confined -claustrophobic -close -homebound -pent -snowbound -stormbound -unconfined -crowded -huddled -jammed -thronged -uncrowded -congenial -sociable -uncongenial -disagreeable -congruent -coincident -identical -incongruent -congruous -harmonious -incongruous -discrepant -inappropriate -inharmonious -ironic -conjunctive -copulative -connective -disjunctive -adversative -alternative -contrastive -divisional -partitive -separative -conjunct -disjunct -connected -adjacent -adjunctive -affined -conterminous -coupled -engaged -unconnected -apart -asternal -detached -disjoined -exploded -unattached -uncoupled -conquerable -beatable -subduable -unconquerable -impregnable -indomitable -insuperable -invincible -conscious -semiconscious -sentient -unconscious -cold -comatose -innocent -insensible -nonconscious -semicomatose -subconscious -consecrated -ordained -votive -desecrated -deconsecrated -profaned -priestly -unpriestly -conservative -blimpish -fusty -hidebound -ultraconservative -liberal -liberalistic -neoliberal -progressive -socialized -welfarist -consistent -accordant -pursuant -reconciled -unchanging -inconsistent -discrepant -spotty -unconformable -unreconciled -conspicuous -big -bold -crying -featured -marked -outstanding -inconspicuous -obscure -discernible -indiscernible -distinguishable -differentiable -discriminable -indistinguishable -constant -steadfast -unfailing -inconstant -false -fickle -constructive -creative -formative -formative -inferential -reconstructive -structural -destructive -annihilative -blasting -cataclysmal -caustic -crushing -damaging -erosive -iconoclastic -ravaging -wasteful -contented -complacent -satisfied -smug -discontented -disaffected -disgruntled -restless -contestable -challengeable -debatable -shakable -incontestable -demonstrable -demonstrated -inarguable -unassailable -unanswerable -continent -incontinent -leaky -continual -insistent -running -perennial -persistent -recurring -sporadic -fitful -intermittent -periodic -irregular -isolated -continuous -ceaseless -continual -dogging -endless -straight -sustained -discontinuous -disrupted -disjunct -continuous -discontinuous -continued -continuing -discontinued -interrupted -controlled -contained -disciplined -dominated -harnessed -obsessed -regimented -uncontrolled -anarchic -errant -irrepressible -loose -lordless -rampant -runaway -torrential -undisciplined -wild -controversial -arguable -contentious -disputed -polemic -uncontroversial -unchallengeable -undisputed -argumentative -quarrelsome -contentious -eristic -unargumentative -noncontentious -convenient -handy -favorable -inconvenient -awkward -conventional -received -customary -formulaic -stodgy -unconventional -bohemian -irregular -conventional -square -stereotyped -unconventional -alternative -bizarre -funky -conformist -nonconformist -nuclear -thermonuclear -conventional -traditional -conventional -traditionalistic -nontraditional -convergent -confluent -focused -divergent -branching -radiating -branchy -arboreal -brachiate -branched -bushy -maplelike -branchless -palmlike -unbranched -convincing -credible -disenchanting -unconvincing -unpersuasive -cooked -baked -barbecued -boiled -braised -broiled -burned -done -fried -lyonnaise -medium -overdone -parched -roast -saute -seared -steamed -toasted -raw -rare -uncooked -untoasted -cooperative -collaborative -synergetic -uncooperative -corrupt -corrupted -corruptible -depraved -dirty -Praetorian -putrid -incorrupt -antiseptic -incorruptible -uncorrupted -uncorrupted -synergistic -antagonistic -antacid -antiphlogistic -considerable -appreciable -goodly -significant -inconsiderable -substantial -insubstantial -aeriform -shadowy -stringy -material -physical -physical -immaterial -intangible -bodied -incarnate -unbodied -bodiless -formless -brainwashed -unbrainwashed -corporeal -bodily -bodied -reincarnate -incorporeal -discorporate -spiritual -correct -accurate -straight -incorrect -erroneous -fallacious -false -right -wrong -wrongheaded -corrected -aplanatic -apochromatic -rectified -uncorrected -unremedied -corrigible -amendable -improvable -redeemable -incorrigible -unreformable -uncontrollable -cosmopolitan -traveled -provincial -bumpkinly -insular -jerkwater -costive -laxative -aperient -cathartic -constipated -bound -unconstipated -diarrheal -lax -considerate -thoughtful -inconsiderate -thoughtless -courteous -chivalrous -discourteous -abrupt -brusque -caddish -unceremonious -polite -mannerly -courteous -impolite -bratty -discourteous -unparliamentary -civil -uncivil -civil -sidereal -creative -fanciful -fictive -imaginative -yeasty -uncreative -sterile -credible -likely -presumptive -incredible -astounding -fabulous -improbable -undreamed -credulous -credible -overcredulous -unquestioning -incredulous -disbelieving -critical -captious -censorious -deprecative -hypercritical -searing -scathing -uncritical -judgmental -faultfinding -nonjudgmental -critical -appraising -discriminative -uncritical -critical -acute -dangerous -desperate -noncritical -acritical -critical -supercritical -noncritical -crossed -crosstown -decussate -uncrossed -crossed -uncrossed -walleyed -crowned -capped -chapleted -comate -royal -uncrowned -crowned -capped -uncrowned -uncapped -crucial -critical -pivotal -noncrucial -crystallized -uncrystallized -cubic -blockish -boxlike -cubelike -isometric -solid -linear -collinear -lineal -linelike -rectilinear -planar -coplanar -flat -placoid -planate -tabular -unidimensional -multidimensional -dimensional -cut -chopped -incised -perforated -pierced -severed -split -uncut -imperforate -unpierced -cut -uncut -cut -hewn -sheared -slashed -uncut -unsheared -curious -inquisitive -nosy -overcurious -incurious -uninterested -uninquiring -current -actual -afoot -circulating -contemporary -incumbent -live -live -occurrent -ongoing -topical -noncurrent -back -dead -disused -outdated -obsolescent -cursed -accursed -blasted -damn -damnable -blessed -fortunate -endowed -dowered -unendowed -dowerless -unblessed -curtained -draped -curtainless -bespoke -made -prefab -handmade -handsewn -overhand -homemade -homespun -boughten -manufactured -cyclic -alternate -alternate -circular -noncyclic -cyclic -bicyclic -heterocyclic -homocyclic -acyclic -aliphatic -cyclic -verticillate -acyclic -annual -biennial -perennial -diurnal -nocturnal -damaged -battered -bedraggled -bent -broken -hurt -riddled -undamaged -intact -datable -undatable -dateless -dateless -deaf -deafened -hearing -decent -indecent -crude -Hollywood -indelicate -obscene -suggestive -decisive -deciding -fateful -peremptory -indecisive -decisive -unhesitating -indecisive -hesitant -suspensive -declarative -interrogative -declared -alleged -announced -asserted -avowed -professed -undeclared -unacknowledged -unavowed -decorous -sedate -indecorous -deductible -allowable -nondeductible -deep -abysmal -bottomless -profound -shallow -fordable -neritic -reefy -deep -heavy -profound -shallow -light -defeasible -indefeasible -unforfeitable -defeated -licked -subjugated -undefeated -triumphant -unbeaten -unbowed -defiant -insubordinate -obstreperous -recalcitrant -compliant -amenable -lamblike -nonresistant -defined -undefined -indefinable -derived -derivable -derivative -plagiaristic -underived -original -primary -inflected -uninflected -inflected -modulated -uninflected -definite -certain -decisive -distinct -indefinite -coy -indecisive -nebulous -noncommittal -one -dehiscent -indehiscent -dejected -amort -chapfallen -gloomy -glum -lonely -elated -exultant -gladdened -high -sublime -uplifted -delicate -dainty -ethereal -fragile -overdelicate -pastel -tender -rugged -knockabout -sturdy -breakable -brittle -crumbly -short -delicate -frangible -splintery -unbreakable -infrangible -shatterproof -demanding -exigent -needy -rigorous -stern -undemanding -lenient -easygoing -light -unexacting -imperative -adjuratory -clamant -peremptory -desperate -pressing -strident -beseeching -adjuratory -importunate -mendicant -petitionary -precatory -suppliant -democratic -antiauthoritarian -classless -parliamentary -parliamentary -participatory -popular -representative -republican -undemocratic -authoritarian -despotic -monarchal -totalitarian -arbitrary -absolute -capricious -discretionary -nonarbitrary -prescribed -demonstrative -effusive -epideictic -undemonstrative -restrained -deniable -disavowable -questionable -undeniable -incontestable -incontrovertible -denotative -appellative -designative -extensional -referent -referential -connotative -connotational -implicative -inferential -intensional -reliable -certain -tested -undeviating -unreliable -erratic -uncertain -unsound -dependent -babelike -helpless -interdependent -myrmecophilous -parasitic -reliant -symbiotic -underage -independent -autarkic -autonomous -autonomous -breakaway -commutative -indie -individual -unaffiliated -unconditional -independent -dependent -partisan -tendentious -nonpartisan -bipartisan -independent -unbiased -aligned -allied -nonaligned -neutral -descriptive -prescriptive -descriptive -undescriptive -desirable -coveted -delectable -enviable -plummy -preferable -undesirable -unenviable -destroyed -annihilated -blighted -broken -burned -demolished -despoiled -extinguished -fallen -finished -scorched -shattered -totaled -wrecked -preserved -conserved -preservable -protected -retained -destructible -abolishable -destroyable -indestructible -undestroyable -determinable -ascertainable -definable -judicable -indeterminable -indeterminate -unascertainable -unpredictable -determinate -fixed -indeterminate -determinate -cymose -indeterminate -racemose -developed -formulated -mature -undeveloped -budding -vestigial -dextral -dexter -dextrorse -sinistral -sinister -sinistrorse -diabatic -adiabatic -differentiated -undifferentiated -dedifferentiated -difficult -ambitious -arduous -awkward -baffling -catchy -delicate -fractious -herculean -nasty -rocky -rugged -serious -tall -thorny -troublesome -trying -vexed -easy -casual -clean -cushy -elementary -painless -simplified -smooth -digitigrade -plantigrade -dignified -courtly -distinguished -undignified -demeaning -pathetic -statesmanlike -unstatesmanlike -presidential -unpresidential -dicotyledonous -monocotyledonous -diligent -assiduous -hardworking -negligent -derelict -lax -inattentive -diluted -cut -watery -white -undiluted -black -concentrated -neat -saturated -unsaturated -monounsaturated -polyunsaturated -saturated -supersaturated -unsaturated -diplomatic -politic -tactful -undiplomatic -conciliatory -appeasing -pacific -propitiative -soft -antagonistic -alienating -direct -nonstop -straightforward -undeviating -through -indirect -askance -devious -diversionary -meandering -direct -alternating -direct -bluff -blunt -brutal -plain -pointed -square -upfront -indirect -allusive -backhanded -circuitous -circumlocutious -devious -digressive -hearsay -mealymouthed -tortuous -direct -inverse -reciprocal -direct -retrograde -immediate -direct -mediate -indirect -mediated -discerning -clear -prescient -undiscerning -obtuse -uncomprehending -discreet -indiscreet -bigmouthed -imprudent -discriminate -indiscriminate -promiscuous -sweeping -discriminating -appreciative -diacritic -discerning -discriminative -eclectic -good -selective -undiscriminating -indiscriminate -scattershot -unperceptive -unselective -disposable -throwaway -nondisposable -returnable -revertible -nonreturnable -disposable -available -expendable -fluid -nondisposable -frozen -distal -proximal -distal -lateral -mesial -medial -sagittal -distinct -chiseled -clear -crisp -crystalline -defined -knifelike -indistinct -bedimmed -bleary -cloudy -dim -faint -veiled -focused -unfocused -diversified -varied -undiversified -general -monolithic -solid -undistributed -divisible -cleavable -dissociable -dissociative -dividable -partible -indivisible -indiscrete -undividable -inseparable -documented -referenced -registered -undocumented -unregistered -domineering -authoritarian -autocratic -blustery -cavalier -oppressive -submissive -abject -bowed -meek -cringing -dominated -servile -bootlicking -obsequious -slavish -slavelike -unservile -dominant -ascendant -controlling -governing -overriding -possessive -sovereign -superior -subordinate -adjunct -associate -secondary -under -dominant -recessive -dramatic -melodramatic -spectacular -hammy -undramatic -unspectacular -actable -unactable -theatrical -histrionic -showy -stagy -untheatrical -drinkable -undrinkable -intoxicated -bacchanalian -beery -besotted -potty -bibulous -doped -high -sober -dry -uninebriated -dull -blunt -blunted -edgeless -unsharpened -sharp -carnassial -edged -incisive -keen -knifelike -penetrative -sharpened -sharp -acute -cutting -fulgurating -salt -dull -deadened -eventful -lively -uneventful -lively -alive -bouncing -breezy -bubbly -bubbling -burbling -live -warm -dull -arid -bovine -drab -heavy -humdrum -lackluster -dynamic -changing -driving -energizing -projectile -propellant -slashing -undynamic -backward -stagnant -eager -anxious -hot -impatient -overeager -uneager -reluctant -eared -auriculate -earless -early -aboriginal -advance -archean -archeozoic -azoic -earlier -earlyish -premature -previous -proterozoic -proto -wee -middle -intervening -mid -late -advanced -latish -posthumous -early -archaic -new -crude -embryonic -incipient -precocious -late -advanced -tardive -early -Old -middle -late -Modern -New -earned -attained -unearned -honorary -easy -uneasy -apprehensive -precarious -east -eastbound -easterly -easterly -eastern -easternmost -eastside -west -westbound -western -westerly -westernmost -westside -western -occidental -eastern -oriental -western -southwestern -midwestern -northwestern -eastern -northeastern -southeastern -ectomorphic -asthenic -endomorphic -mesomorphic -athletic -edible -killable -nonpoisonous -pareve -inedible -poisonous -educated -knowing -literate -semiliterate -uneducated -ignorant -ignorant -undereducated -unschooled -unstudied -numerate -innumerate -operative -operant -effective -operational -working -inoperative -down -dead -defunct -effective -impelling -impressive -ineffective -toothless -unproductive -effortful -arduous -dragging -exhausting -heavy -leaden -Sisyphean -arduous -effortless -facile -unforced -efficacious -effective -inefficacious -efficient -businesslike -economic -expeditious -streamlined -inefficient -uneconomical -forceful -bruising -drastic -emphatic -firm -forcible -impellent -impetuous -sharp -forceless -wimpish -elastic -bouncy -chewy -elasticized -expandable -fictile -flexible -rubbery -springlike -stretch -stretchable -viscoelastic -inelastic -dead -nonresilient -springless -elective -electoral -nonappointive -appointive -nominated -nonelective -assigned -allotted -appointed -unassigned -optional -elective -facultative -nonmandatory -obligatory -bounden -compulsory -imposed -indispensable -prerequisite -elegant -dandified -deluxe -fine -exquisite -neat -ritzy -soigne -inelegant -gauche -homely -eligible -bailable -desirable -entitled -legal -pensionable -ineligible -disqualified -disqualified -undesirable -unentitled -emotional -affectional -bathetic -cathartic -charged -funky -little -lyric -moody -overemotional -soulful -unemotional -chilly -dry -impassive -philosophical -phlegmatic -stoic -unblinking -empirical -confirmable -experiential -experimental -experimental -semiempirical -theoretical -abstractive -conjectural -notional -metaphysical -theoretical -abstract -academic -pure -applied -forensic -practical -salaried -freelance -employed -engaged -hired -working -unemployed -discharged -idle -employable -unemployable -enchanted -beguiled -bewitched -fascinated -disenchanted -disabused -disillusioned -encouraging -exhortative -heartening -promotive -rallying -discouraging -daunting -demoralizing -frustrating -unencouraging -encumbered -burdened -clogged -involved -mortgaged -unencumbered -burdenless -clear -burdened -laden -saddled -unburdened -unencumbered -endocentric -exocentric -endogamous -exogamous -autogamous -endogamous -exogamous -endoergic -exoergic -endothermic -decalescent -exothermic -endogenous -exogenous -energetic -physical -alert -canty -driving -indefatigable -strenuous -vigorous -lethargic -dazed -dreamy -listless -enfranchised -disenfranchised -exportable -marketable -unexportable -exploratory -alpha -beta -preliminary -searching -wildcat -nonexploratory -inquiring -inquisitive -inquisitorial -inquisitorial -inquisitory -uninquiring -increased -accrued -augmented -enhanced -hyperbolic -exaggerated -multiplied -raised -redoubled -decreased -ablated -attenuate -attenuated -bated -belittled -cut -diminished -minimized -remittent -shriveled -reducible -irreducible -enlightened -edified -unenlightened -benighted -enterprising -energetic -entrepreneurial -unenterprising -slowgoing -enthusiastic -ardent -avid -crazy -evangelical -glowing -overenthusiastic -unenthusiastic -cold -halfhearted -desirous -appetent -athirst -avid -covetous -nostalgic -homesick -undesirous -entozoic -epizoic -equal -equivalent -close -coequal -coordinate -equidistant -equilateral -even -isochronal -isoclinal -isometric -isothermal -quits -tied -unequal -anisometric -mismatched -nonequivalent -unbalanced -unequalized -balanced -counterbalanced -harmonious -poised -stable -unbalanced -labile -isotonic -hypertonic -hypotonic -equivocal -double -evasive -indeterminate -unequivocal -absolute -straightforward -unquestionable -eradicable -delible -effaceable -exterminable -obliterable -ineradicable -indelible -inexpungible -inexterminable -esoteric -abstruse -arcane -cabalistic -mysterious -exoteric -essential -basal -biogenic -constituent -must -staple -substantial -virtual -vital -inessential -accessorial -adscititious -incidental -dispensable -indispensable -critical -estimable -admirable -contemptible -abject -bastardly -pathetic -ethical -unethical -complimentary -encomiastic -laudatory -uncomplimentary -belittling -derogative -dyslogistic -supercilious -flattering -adulatory -becoming -ingratiating -unflattering -euphemistic -dysphemistic -euphoric -euphoriant -expansive -dysphoric -even -flat -flatbottom -flush -justified -level -true -uneven -crinkled -irregular -jagged -lumpy -patchy -ragged -unparallel -even -odd -evergreen -coniferous -deciduous -broadleaf -exact -direct -literal -mathematical -perfect -photographic -rigorous -inexact -approximate -free -odd -round -convertible -cashable -inconvertible -irredeemable -exchangeable -commutable -fungible -transposable -vicarious -unexchangeable -incommutable -excitable -quick -skittish -unexcitable -steady -excited -aflutter -agog -crazy -fevered -intoxicated -overexcited -stimulated -teased -thrilled -thrillful -unexcited -exciting -breathless -elating -electric -electrifying -glamorous -heady -titillating -tickling -unexciting -commonplace -uninspired -tame -exculpatory -absolvitory -extenuating -justificative -inculpatory -accusative -comminatory -condemnatory -criminative -damnatory -recriminative -exhaustible -depletable -inexhaustible -renewable -unfailing -exhausted -unexhausted -leftover -unconsumed -unspent -existent -active -nonexistent -lacking -barren -nonextant -vanished -extant -living -surviving -extinct -dead -expected -anticipated -due -expectable -unexpected -unannounced -unanticipated -unhoped -upset -expedient -advantageous -opportunist -carpetbag -inexpedient -inadvisable -expendable -consumable -sacrificeable -unexpendable -expensive -costly -overpriced -cheap -catchpenny -sixpenny -experienced -intimate -old -practiced -seasoned -inexperienced -fledgling -raw -uninitiate -unpracticed -unseasoned -expired -invalid -terminated -unexpired -valid -explicable -explainable -inexplicable -cryptic -paradoxical -unaccountable -unexplained -explicit -declared -definitive -express -graphic -implicit -silent -unexpressed -exploited -employed -unexploited -fallow -untapped -expressible -describable -representable -speakable -inexpressible -indefinable -extensile -protractile -protrusile -nonextensile -extricable -inextricable -unresolvable -bowed -arco -plucked -pizzicato -fingered -digitate -fingerless -expansive -distensible -erectile -expandable -inflatable -unexpansive -extinguishable -inextinguishable -external -outer -outside -internal -inner -interior -internecine -intrinsic -outer -out -outermost -outside -satellite -inner -inmost -inside -outward -external -outer -inward -indwelling -inmost -inner -secret -exterior -out -outside -interior -indoor -inside -eyed -eyelike -popeyed -eyeless -playable -unplayable -fair -foul -fair -antimonopoly -clean -unfair -cheating -raw -equitable -honest -evenhanded -inequitable -faithful -firm -true -unfaithful -apostate -punic -untrue -faithful -unfaithful -adulterous -loyal -allegiant -doglike -leal -liege -disloyal -faithless -insurgent -mutinous -rebellious -recreant -fallible -errant -erring -undependable -weak -infallible -foolproof -inerrable -familiar -acquainted -beaten -old -unfamiliar -strange -unacquainted -strange -antic -crazy -curious -eerie -exotic -freaky -gothic -oddish -other -quaint -quaint -weird -familiar -common -everyday -fashionable -latest -cool -dapper -faddish -groovy -in -mod -swank -trendsetting -trendy -unfashionable -antique -dated -dowdy -fogyish -out -prehistoric -stylish -chic -chichi -classy -snazzy -styleless -dowdy -fast -accelerated -alacritous -blistering -express -fleet -hurrying -immediate -instantaneous -meteoric -quick -rapid -rapid -smart -winged -windy -slow -dilatory -lazy -sluggish -fast -allegro -allegretto -andantino -presto -prestissimo -vivace -slow -adagio -andante -lento -lentissimo -largo -larghetto -larghissimo -moderato -fast -slow -fastidious -choosy -dainty -finical -meticulous -pernickety -unfastidious -fastidious -unfastidious -fat -abdominous -blubbery -chubby -buxom -corpulent -dumpy -fattish -fleshy -gross -portly -thin -anorexic -bony -gangling -lank -rawboned -reedy -twiggy -scarecrowish -scraggy -shriveled -slender -spare -stringy -wisplike -fatty -adipose -buttery -greasy -suety -superfatted -nonfat -light -skim -fatal -deadly -deadly -terminal -nonfatal -nonlethal -curable -incurable -fathomable -unfathomable -unsoundable -favorable -following -unfavorable -adverse -favorable -approving -indulgent -unfavorable -admonitory -adverse -disapproving -discriminatory -feathered -aftershafted -feathery -featherlike -fledged -flighted -pennate -plumaged -plumate -plumed -plumelike -unfeathered -plucked -unfledged -felicitous -congratulatory -happy -infelicitous -awkward -unfortunate -fertile -conceptive -fecund -fertilizable -rank -sterile -barren -sterilized -unfertilized -finished -complete -done -up -unfinished -incomplete -pending -undone -unended -finished -dressed -fattened -fattening -unfinished -raw -roughhewn -undressed -unfattened -unhewn -finite -bounded -exhaustible -impermanent -limited -infinite -boundless -dateless -endless -inexhaustible -finite -tensed -infinite -opening -beginning -inaugural -introductory -starting -closing -concluding -terminative -first -archetypal -basic -initial -firstborn -freshman -original -premier -premier -prime -last -senior -sunset -ultimate -intermediate -grey -halfway -junior -penultimate -sophomore -subterminal -antepenultimate -terminal -first -second -fissile -nonfissile -fissionable -nonfissionable -fit -able -conditioned -unfit -afflicted -apractic -bandy -crippled -crookback -disabled -gammy -soft -spavined -dipped -maimed -fit -acceptable -suitable -worthy -unfit -subhuman -unsuitable -flat -contrasty -flexible -bendable -limber -limber -spinnable -stretched -inflexible -rigid -semirigid -flexible -limber -negotiable -inflexible -adamant -fossilized -ironclad -uncompromising -compromising -yielding -rigid -semirigid -nonrigid -adaptable -adjustable -convertible -elastic -filmable -universal -variable -unadaptable -inflexible -campylotropous -orthotropous -anatropous -amphitropous -curly -curled -crisp -permed -ringleted -wavy -straight -uncurled -unpermed -footed -pedate -footless -apodal -toed -toeless -splayfooted -splay -fore -foremost -aft -after -aftermost -forehand -backhand -native -connatural -adopted -foreign -adventive -alien -nonnative -established -imported -tramontane -unnaturalized -native -autochthonal -domestic -homegrown -native -nonnative -foreign -abroad -external -domestic -home -municipal -domestic -domesticated -housewifely -husbandly -undomestic -undomesticated -forgettable -unmemorable -unforgettable -haunting -memorable -forgiving -kind -unvindictive -unforgiving -revengeful -formal -ceremonial -ceremonious -dress -nominal -positive -semiformal -starchy -informal -casual -folksy -unceremonious -formal -literary -informal -colloquial -common -epistolary -slangy -subliterary -unliterary -former -latter -fortunate -felicitous -fortuitous -good -lucky -unfortunate -abject -black -dispossessed -hapless -doomed -downtrodden -infelicitous -regrettable -fragrant -aromatic -odoriferous -perfumed -musky -malodorous -bilgy -fetid -fusty -gamey -miasmic -niffy -odoriferous -reeking -sour -odorous -alliaceous -redolent -scented -odorless -scentless -scented -scentless -free -liberated -unbound -bound -conjugate -conjugate -fixed -fast -geostationary -geosynchronous -leaded -stationary -taped -unadjustable -unfixed -detached -floating -unfirm -free -autonomous -available -aweigh -clear -emancipated -footloose -unconfined -unconstrained -unhampered -unrestricted -unfree -adscript -apprenticed -captive -entangled -nonautonomous -prisonlike -serflike -free -freeborn -unfree -servile -slaveholding -frequent -prevailing -regular -infrequent -occasional -rare -fresh -caller -crisp -good -hot -strong -stale -addled -bad -cold -hard -flyblown -limp -moldy -rancid -rotten -corrupt -putrid -putrescent -fresh -unprocessed -preserved -aged -candied -canned -corned -cured -dried -lyophilized -pickled -potted -salted -smoked -fresh -salty -brackish -saliferous -saline -saltish -friendly -affable -chummy -companionate -comradely -couthie -cozy -neighborly -social -unfriendly -chilly -uncordial -unneighborly -friendly -hostile -friendly -unfriendly -frozen -frostbitten -glaciated -icebound -icy -sleety -unthawed -unfrozen -liquescent -slushy -thawed -fruitful -berried -bountiful -breeding -fat -generative -prolific -unfruitful -abortive -acarpous -childless -full -afloat -brimful -chockablock -congested -filled -fraught -glutted -heavy -instinct -laden -overladen -riddled -stuffed -stuffed -untouched -empty -bare -blank -glassy -lifeless -looted -vacant -vacant -vacuous -void -drained -empty -exhausted -undrained -regular -irregular -underemployed -functional -structural -utilitarian -nonfunctional -nonstructural -cosmetic -functioning -running -up -malfunctioning -amiss -bad -functional -organic -rigged -lateen -outrigged -unrigged -equipped -accoutered -armored -helmeted -outfitted -prepared -transistorized -visored -unequipped -fledged -fledgling -unfledged -unfeathered -framed -unframed -furnished -appointed -stocked -volumed -unfurnished -funded -unfunded -fueled -unfueled -unfed -specified -mere -nominative -specific -unspecified -geared -engaged -ungeared -general -broad -generic -gross -overall -pandemic -universal -widespread -specific -circumstantial -limited -particular -particular -particularized -proper -unique -specific -nonspecific -national -federal -local -cosmopolitan -endemic -branchiate -abranchiate -federal -unitary -centralized -decentralized -localized -redistributed -suburbanized -technical -nontechnical -nonproprietary -generic -unpatented -proprietary -branded -copyrighted -patented -trademarked -generous -benevolent -big -lavish -unselfish -stingy -beggarly -cheap -cheeseparing -closefisted -grudging -mean -parsimonious -generous -big -ungrudging -ungenerous -genuine -authentic -attested -good -counterfeit -assumed -bad -base -bogus -inauthentic -mock -ostensible -pinchbeck -pseudo -synthetic -geocentric -Ptolemaic -heliocentric -Copernican -talented -untalented -glazed -glassy -glossy -icy -unglazed -unvitrified -glazed -unglazed -glorious -bright -celebrated -divine -empyreal -illustrious -incandescent -lustrous -inglorious -obscure -go -good -goodish -hot -redeeming -satisfactory -solid -superb -bad -atrocious -corked -deplorable -fearful -hard -hopeless -horrid -icky -ill -incompetent -mediocre -naughty -negative -poor -pretty -rubber -severe -swingeing -uncool -unfavorable -unsuitable -good -angelic -redemptive -white -evil -atrocious -bad -black -corruptive -demonic -despicable -devilish -amiable -equable -atrabilious -bristly -cantankerous -choleric -churlish -crabbed -cranky -crusty -currish -dark -disagreeable -huffish -misanthropic -misogynous -shirty -shrewish -snappish -spoiled -surly -vinegary -graceful -elegant -fluent -gainly -gracile -lissome -awkward -gawky -graceless -labored -wooden -gracious -elegant -merciful -ungracious -churlish -graceless -gradual -gradational -sudden -abrupt -choppy -emergent -explosive -fulminant -sharp -gradual -easy -sloping -steep -abrupt -bluff -heavy -perpendicular -steepish -grammatical -ungrammatical -incorrect -grateful -appreciative -glad -ungrateful -unappreciative -haploid -diploid -polyploid -triploid -happy -blessed -blissful -bright -golden -laughing -unhappy -lovesick -miserable -regretful -unregretful -hard -adamantine -corneous -tumid -firm -granitic -hardened -woody -petrous -semihard -steely -unyielding -soft -brushed -cheeselike -compressible -cottony -cushioned -demulcent -downy -flaccid -flocculent -yielding -mushy -overstuffed -softish -spongy -velvet -hard -calculating -steely -soft -mellow -hard -velar -soft -fricative -palatal -hard -soft -hardhearted -flinty -softhearted -alcoholic -dry -hard -intoxicant -spirituous -wet -nonalcoholic -harmless -innocent -harmful -abusive -bad -bruising -deleterious -calumniatory -catastrophic -counterproductive -damaging -ill -insidious -mischievous -nocent -stabbing -harmonious -consonant -harmonic -pure -symphonic -inharmonious -discordant -false -unresolved -healthful -anthelmintic -antimicrobial -carminative -cathartic -curative -drugless -good -medicative -organic -orthomolecular -preventive -recuperative -unhealthful -crippling -cytopathogenic -infective -unmedicinal -unhealthy -medical -surgical -preoperative -postoperative -operable -inoperable -pyretic -antipyretic -healthy -flushed -bouncing -firm -good -hale -hearty -hearty -anicteric -rubicund -wholesome -unhealthy -angry -arthritic -asthmatic -bad -blebby -puffy -bloodshot -cankerous -carbuncled -carious -caseous -chilblained -colicky -cytomegalic -dehydrated -diseased -edematous -enlarged -foaming -gangrenous -inflamed -inflammatory -ingrowing -jaundiced -membranous -mental -proinflammatory -sallow -sunburned -varicose -windburned -dry -phlegmy -heavenly -ambrosial -celestial -divine -divine -paradisiacal -providential -translunar -earthly -earthborn -earthbound -earthlike -mundane -sublunar -temporal -digestible -assimilable -light -predigested -indigestible -flatulent -heavy -nondigestible -undigested -stodgy -headed -bicephalous -headlike -headless -acephalous -beheaded -headed -unheaded -heavy -dense -doughy -hefty -massive -ponderous -light -lightweight -airy -buoyant -weighty -weightless -light -heavy -industrial -heavy -burdensome -distressing -leaden -oppressive -weighty -light -fooling -heavy -harsh -light -heavy -light -heavy -big -light -easy -light -heavy -light -heavy -heedless -careless -deaf -heedful -enabling -facultative -sanctionative -disabling -helpful -accommodating -adjuvant -assistive -facilitative -facilitatory -implemental -laborsaving -ministrant -reformative -stabilizing -steadying -unhelpful -unaccommodating -unconstructive -heterodactyl -zygodactyl -heterogeneous -assorted -disparate -inhomogeneous -homogeneous -consistent -solid -solid -homogenized -homozygous -heterozygous -heterosexual -straight -homosexual -butch -gay -homoerotic -lesbian -pederastic -transgender -transsexual -transvestic -tribadistic -bisexual -hierarchical -gradable -graded -vertical -nonhierarchical -ungraded -high -altitudinous -commanding -eminent -steep -upper -low -deep -lowset -nether -squat -raised -elevated -up -upraised -lowered -down -advanced -necked -decollete -necklike -throated -neckless -ceilinged -raftered -floored -high -advanced -broad -graduate -higher -higher -last -soaring -low -debased -depressed -reduced -high -adenoidal -altissimo -alto -countertenor -falsetto -peaky -shrill -screaky -soprano -sopranino -tenor -tenor -low -alto -baritone -bass -contrabass -throaty -imitative -apish -mimetic -mimic -parrotlike -simulated -nonimitative -echoic -nonechoic -multistory -storied -upland -alpestrine -alpine -mountainous -lowland -home -away -homologous -heterologous -autologous -homologous -homologic -heterologous -analogous -gabled -hipped -mansard -hipped -hipless -honest -downright -dishonest -ambidextrous -beguiling -deceitful -deceptive -false -picaresque -rascally -thieving -truthful -honest -veracious -untruthful -mendacious -honorable -august -laureate -dishonorable -black -debasing -shabby -unprincipled -yellow -hopeful -anticipant -hopeless -abject -black -despairing -despondent -forlorn -futureless -helpless -insoluble -institutionalized -noninstitutionalized -institutional -institutionalized -uninteresting -noninstitutional -iodinating -consolable -inconsolable -desolate -horizontal -crosswise -flat -level -naiant -vertical -plumb -upended -upright -inclined -atilt -aslant -monoclinal -pitched -salient -sidelong -skew -erect -erectile -fastigiate -orthostatic -passant -rampant -standing -statant -straight -unerect -accumbent -bended -cernuous -couchant -dormant -flat -hunched -procumbent -prone -supine -standing -seated -standing -running -running -gushing -jetting -standing -dead -slack -still -running -passing -hospitable -kind -inhospitable -bare -godforsaken -hostile -windswept -hospitable -welcoming -inhospitable -hostile -aggressive -antagonistic -bitter -dirty -ill -opponent -unfriendly -amicable -friendly -hot -baking -blistering -calefacient -calefactory -calorifacient -calorific -fervent -fiery -heatable -heated -hottish -overheated -scorching -sizzling -sultry -sweltering -thermal -torrid -tropical -white -cold -acold -algid -arctic -bleak -chilly -crisp -frigorific -frore -frosty -heatless -refrigerant -refrigerated -shivery -unheated -vernal -summery -aestival -autumnal -wintry -brumal -hot -fiery -heated -sensual -torrid -cold -emotionless -frigid -human -anthropoid -anthropomorphic -earthborn -fallible -hominal -hominian -hominine -nonhuman -anthropoid -bloodless -dehumanized -inhuman -superhuman -divine -herculean -subhuman -infrahuman -humane -inhumane -barbarous -beastly -cannibalic -cold -pitiless -humorous -bantering -buffoonish -amusing -droll -dry -farcical -Gilbertian -hilarious -jesting -killing -seriocomic -slapstick -tragicomic -waggish -witty -humorless -sobersided -unfunny -hungry -empty -famished -peckish -supperless -thirsty -hurried -flying -hasty -hasty -rush -unhurried -careful -easy -identifiable -acknowledgeable -classifiable -diagnosable -recognizable -specifiable -unidentifiable -elusive -intangible -unclassifiable -undiagnosable -unrecognizable -immanent -transeunt -impaired -anosmic -broken -dicky -diminished -dysfunctional -dyslectic -unimpaired -important -alpha -beta -big -burning -cardinal -chief -consequential -Copernican -distinguished -grand -grave -great -historic -measurable -serious -strategic -unimportant -inconsequent -immaterial -fiddling -lightweight -potty -impressive -amazing -arresting -astonishing -baronial -dazzling -dramatic -expansive -formidable -gallant -brilliant -grandiose -palatial -signal -thundering -unimpressive -unimposing -noticeable -broad -detectable -discernible -marked -noted -unnoticeable -insignificant -improved -built -developed -landscaped -unimproved -dirt -scrub -cleared -improved -uncleared -unimproved -inaugural -exaugural -valedictory -inboard -outboard -portable -inbred -interbred -outbred -inclined -apt -fond -prone -disinclined -afraid -antipathetic -reluctant -incoming -outgoing -incoming -inbound -designate -elect -future -in -inflowing -inpouring -outgoing -outbound -effluent -out -past -inductive -deductive -deducible -illative -illative -inferential -indulgent -decadent -dissipated -epicurean -gay -hedonic -intemperate -overindulgent -pampering -nonindulgent -austere -blue -corrective -monkish -renunciant -severe -industrial -developed -industrialized -postindustrial -nonindustrial -developing -unindustrialized -infectious -catching -contagious -corrupting -noninfectious -noncommunicable -infernal -chthonian -Hadean -Stygian -supernal -informative -advisory -exemplifying -newsy -revealing -uninformative -newsless -gnostic -agnostic -nescient -informed -abreast -advised -conversant -educated -hep -knowing -knowledgeable -privy -uninformed -clueless -ignorant -innocent -newsless -unadvised -uninstructed -unread -ingenuous -candid -undistorted -disingenuous -distorted -inhabited -colonized -haunted -occupied -peopled -populated -populous -underpopulated -uninhabited -abandoned -depopulated -unoccupied -unpeopled -lonely -unsettled -inheritable -ancestral -familial -monogenic -polygenic -inheriting -nee -noninheritable -acquired -congenital -nonhereditary -nurtural -inhibited -smothered -uninhibited -abandoned -earthy -unrepressed -unsuppressed -injectable -uninjectable -injured -disjointed -eviscerate -hurt -lacerate -raw -uninjured -intact -uncut -unharmed -unwounded -innocent -absolved -acquitted -blameless -guilty -blameworthy -bloodguilty -chargeable -criminal -delinquent -finable -punishable -inspiring -ennobling -uninspiring -instructive -clarifying -demonstrative -didactic -doctrinaire -educative -educational -explanatory -expository -interpretative -ostensive -preachy -uninstructive -edifying -unedifying -enlightening -unenlightening -integrated -desegrated -interracial -mainstreamed -segregated -isolated -separate -sequestered -white -integrated -coordinated -embedded -incorporated -introjected -nonintegrated -blended -alloyed -homogenized -unblended -unhomogenized -combined -compounded -conglomerate -occluded -one -uncombined -uncompounded -integrative -combinative -compositional -consolidative -endogenic -disintegrative -clastic -decompositional -intellectual -highbrow -rational -reflective -good -sophisticated -nonintellectual -lowbrow -mindless -intelligent -agile -apt -brainy -bright -natural -quick -prehensile -scintillating -searching -unintelligent -brainless -intelligible -unintelligible -slurred -intended -conscious -deliberate -intentional -unintended -accidental -causeless -unintentional -designed -fashioned -undesigned -intensifying -aggravating -augmentative -deepening -heightening -moderating -alleviative -analgesic -tempering -weakening -interspecies -intraspecies -interested -curious -uninterested -apathetic -blase -dismissive -dulled -interesting -absorbing -entertaining -amusing -intriguing -newsworthy -uninteresting -boring -insipid -narcotic -pedestrian -ponderous -putdownable -intramural -internal -extramural -intercollegiate -intermural -interscholastic -outside -intrinsic -inner -extrinsic -adventitious -adscititious -alien -external -extraneous -introspective -extrospective -introversive -introvertish -extroversive -extrovert -extrovertish -ambiversive -intrusive -encroaching -interfering -unintrusive -intrusive -intruding -protrusive -beetle -bellied -obtrusive -jutting -overshot -starting -underhung -ventricose -igneous -aqueous -intrusive -irruptive -extrusive -volcanic -invasive -aggressive -confined -invasive -noninvasive -invigorating -animating -bracing -corroborant -exhilarating -renewing -debilitating -debilitative -draining -inviting -invitatory -tantalizing -tantalizing -uninviting -unattractive -ironed -pressed -smoothed -unironed -roughdried -unpressed -wrinkled -unsmoothed -unwrinkled -isotropic -identical -anisotropic -aeolotropic -glad -gladsome -sad -bittersweet -doleful -heavyhearted -melancholy -pensive -tragic -tragicomic -joyful -beatific -overjoyed -sorrowful -anguished -bereaved -bitter -brokenhearted -dolorous -elegiac -grievous -lamenting -lugubrious -mournful -sad -woebegone -joyous -ecstatic -elated -gay -gay -joyless -funereal -mirthless -unsmiling -juicy -lush -sappy -juiceless -sapless -just -conscionable -fitting -retributive -rightful -unjust -actionable -wrongful -merited -condign -unmerited -gratuitous -undeserved -keyed -keyless -kind -benignant -benign -charitable -gentle -kindhearted -unkind -cutting -harsh -hurtful -unkindly -knowable -unknowable -transcendent -known -celebrated -identified -legendary -proverbial -unknown -chartless -unbeknown -undiagnosed -undiscovered -unidentified -understood -appreciated -interpreted -ununderstood -misunderstood -uncomprehended -undigested -ungrasped -labeled -unlabeled -lamented -unlamented -aerial -marine -oceangoing -oceanic -offshore -oversea -suboceanic -laureled -unlaureled -large -ample -astronomic -bigger -biggish -bouffant -broad -bulky -capacious -colossal -deep -double -enormous -cosmic -elephantine -epic -extensive -gigantic -great -grand -huge -hulking -humongous -macroscopic -macro -massive -massive -monstrous -mountainous -outsize -overlarge -plumping -rangy -super -titanic -volumed -voluminous -whacking -small -atomic -subatomic -bantam -bitty -dinky -dwarfish -elfin -gnomish -infinitesimal -lesser -microscopic -micro -miniature -minuscule -puny -slender -smaller -smallish -undersize -greater -lesser -lawful -unlawful -lawless -wrongful -leaded -antiknock -unleaded -leaky -drafty -drippy -oozing -holey -tight -airtight -dripless -hermetic -leakproof -rainproof -snug -watertight -caulked -chinked -uncaulked -leavened -unleavened -leeward -downwind -windward -upwind -legal -judicial -jural -lawful -ratified -statutory -illegal -amerciable -banned -bootleg -criminal -dirty -embezzled -extrajudicial -extralegal -hot -illegitimate -ineligible -misbranded -penal -unratified -legible -clean -clear -illegible -dirty -indecipherable -deciphered -undeciphered -biological -begotten -natural -adoptive -foster -legitimate -morganatic -true -illegitimate -adulterine -base -bastardly -fatherless -unlawful -leptorrhine -catarrhine -platyrrhine -leptosporangiate -eusporangiate -like -suchlike -unlike -alike -unalike -like -unlike -likely -apt -probable -promising -unlikely -farfetched -last -outside -probable -equiprobable -presumptive -verisimilar -improbable -supposed -limbed -boughed -limbless -boughless -limited -minor -narrow -unlimited -bottomless -oceanic -untrammeled -lineal -matrilineal -patrilineal -unilateral -collateral -linear -bilinear -nonlinear -lined -unlined -listed -unlisted -literal -denotative -figurative -analogical -extended -metaphorical -metonymic -poetic -synecdochic -tropical -literate -belletristic -literary -illiterate -literate -illiterate -analphabetic -preliterate -semiliterate -semiliterate -live -unfilmed -recorded -canned -filmed -prerecorded -taped -livable -habitable -unlivable -uninhabitable -liveried -unliveried -loaded -live -undischarged -unloaded -blank -dud -loamy -loamless -local -localized -topical -general -systemic -epidemic -epiphytotic -epizootic -pandemic -pestilent -ecdemic -endemic -enzootic -gloved -gauntleted -gloveless -hatted -turbaned -hatless -guided -unguided -legged -leglike -legless -logical -dianoetic -formal -ratiocinative -illogical -absurd -inconsequential -intuitive -extended -outspread -outstretched -sprawly -stretched -unextended -mini -midi -maxi -lossy -lossless -long -elongate -elongated -extendible -far -lank -oblong -polysyllabic -stretch -short -abbreviated -close -curtal -shortish -snub -stubby -telescoped -truncate -long -agelong -bimestrial -chronic -daylong -durable -endless -hourlong -lifelong -longish -longitudinal -longstanding -monthlong -nightlong -perennial -weeklong -yearlong -short -abbreviated -brief -clipped -fleeting -long -short -long -short -lengthwise -axial -linear -longitudinal -crosswise -cross -lidded -lidless -loose -baggy -flyaway -tight -choky -clenched -close -skintight -viselike -constricted -narrowed -pinched -stenosed -unconstricted -open -lost -mislaid -gone -missing -squandered -stray -straying -found -recovered -lost -cursed -destroyed -saved -blessed -ransomed -rescued -ransomed -salvageable -lost -confiscate -won -loud -big -blaring -clarion -deafening -earthshaking -shattering -shouted -vocal -soft -dull -euphonious -gentle -hushed -little -low -murmuring -murmurous -full -booming -grumbling -plangent -rich -orotund -heavy -sounding -thin -pale -piano -pianissimo -forte -fortemente -fortissimo -hardened -soft -lovable -adorable -angelic -cuddlesome -hateful -abominable -unlovable -liked -likable -disliked -dislikable -unlikable -loved -admired -adored -beloved -cherished -favored -unloved -alienated -bereft -despised -disinherited -jilted -loveless -loving -adoring -affectionate -amative -amatory -attached -captivated -enamored -idolatrous -loverlike -overfond -tenderhearted -uxorious -unloving -cold -loveless -detached -unromantic -lowercase -little -uppercase -capital -lucky -apotropaic -hot -serendipitous -unlucky -hexed -lyric -dramatic -made -unmade -magnetic -attractable -antimagnetic -magnetic -geographic -true -magnetic -nonmagnetic -major -better -minor -major -minor -major -minor -major -minor -major -minor -major -leading -minor -insignificant -secondary -major -minor -majuscule -majuscular -minuscule -manageable -administrable -controllable -directed -steerable -unmanageable -indocile -uncheckable -manly -unmanly -effeminate -womanish -male -male -antheral -phallic -priapic -female -female -pistillate -androgynous -bisexual -gynandromorphic -hermaphroditic -intersexual -pseudohermaphroditic -unisex -manned -unmanned -pilotless -marked -asterisked -barred -scarred -masked -unmarked -unasterisked -branded -unbranded -married -joined -mated -ringed -wed -unmarried -divorced -mateless -unwed -widowed -mated -paired -unmated -mateless -masculine -butch -male -mannish -feminine -fair -female -maidenlike -womanly -matronly -womanlike -unwomanly -hoydenish -mannish -unfeminine -masculine -feminine -neuter -matched -coordinated -duplicate -mated -mismatched -odd -material -crucial -immaterial -mature -adult -abloom -fruiting -headed -marriageable -overblown -prime -immature -adolescent -embryonic -inchoative -larval -prepubescent -prepupal -pubescent -pupal -underdeveloped -mature -autumnal -mellow -ripe -immature -adolescent -babyish -childish -ripe -aged -mellow -overripe -green -unaged -seasonal -seasonable -unseasonable -seasoned -cured -unseasoned -uncured -premature -maximal -supreme -minimal -borderline -negligible -nominal -stripped -meaningful -meaty -meaning -purposeful -meaningless -empty -insignificant -mindless -nonsense -measurable -immeasurable -abysmal -illimitable -meaty -meatless -mechanical -automatic -mechanic -mechanistic -mechanized -windup -nonmechanical -nonmechanistic -unmechanized -melodious -ariose -canorous -cantabile -dulcet -lyrical -unmelodious -tuneful -tuneless -membered -memberless -mined -unmined -musical -chanted -liquid -singable -unmusical -musical -philharmonic -unmusical -melted -dissolved -fusible -molten -thawed -unmelted -frozen -undissolved -merciful -merciless -cutthroat -mortal -pitiless -tigerish -metabolic -ametabolic -mild -gentle -moderate -intense -aggravated -bad -brutal -cold -concentrated -consuming -deep -exquisite -extreme -fierce -intensified -intensive -main -profound -raging -screaming -severe -smart -strong -terrific -thick -unabated -violent -intensive -extensive -involved -active -concerned -embroiled -engaged -implicated -uninvolved -unconcerned -military -expeditionary -martial -combatant -noncombatant -civilian -civil -noncombatant -military -militaristic -soldierly -warlike -unmilitary -unsoldierly -mitigated -alleviated -lessened -quenched -unmitigated -arrant -bally -bodacious -undiminished -tempered -untempered -unmoderated -tempered -curable -sunbaked -untempered -brittle -mobile -airborne -ambulant -floating -maneuverable -mechanized -motile -movable -perambulating -racy -raisable -rangy -rotatable -seaborne -transplantable -versatile -waterborne -immobile -immovable -nonmotile -stiff -portable -movable -takeout -unportable -removable -dismissible -extractable -irremovable -tenured -metallic -aluminiferous -antimonial -argentiferous -auriferous -bimetal -bronze -gold -metallike -silver -tinny -nonmetallic -metalloid -metamorphic -epimorphic -hemimetabolous -heterometabolous -holometabolic -metamorphous -changed -nonmetamorphic -ametabolic -moderate -average -cautious -fair -indifferent -limited -minimalist -modest -immoderate -abnormal -exaggerated -excessive -exorbitant -extraordinary -extreme -extreme -extremist -far -stark -modern -contemporary -neo -ultramodern -moderne -nonmodern -antebellum -medieval -Victorian -modest -coy -decent -decent -shamefaced -immodest -indecent -modest -retiring -immodest -important -overweening -modified -adapted -restricted -unmodified -unadapted -unrestricted -modulated -softened -unmodulated -flat -molar -molecular -monoclinous -hermaphroditic -diclinous -monoecious -autoicous -heteroicous -synoicous -paroicous -dioecious -monophonic -homophonic -monodic -polyphonic -monogamous -monandrous -monogynous -polygamous -bigamous -polyandrous -polygynous -monolingual -multilingual -bilingual -polyglot -trilingual -monovalent -polyvalent -univalent -bivalent -multivalent -monotonic -nonmonotonic -monovalent -polyvalent -moral -chaste -clean -moralistic -righteous -incorrupt -immoral -debauched -disgraceful -scrofulous -licit -illicit -adulterous -unlawful -principled -unprincipled -many -galore -numerous -some -umpteen -few -much -overmuch -some -such -untold -little -small -more -less -most -least -more -fewer -less -most -fewest -mortal -earthborn -immortal -amaranthine -deathless -deific -motivated -actuated -driven -unmotivated -causeless -motiveless -motorized -bimotored -trimotored -unmotorized -moved -sick -unmoved -moving -affecting -haunting -heartwarming -stirring -unmoving -unaffecting -moving -afoot -ahorse -oncoming -automotive -awheel -blown -aflare -kinetic -mobile -restless -wiggly -vibratory -nonmoving -inactive -becalmed -fixed -frozen -inert -sitting -stationary -moving -animated -still -mown -unmown -seamanlike -unseamanlike -lubberly -continental -transcontinental -intercontinental -worldwide -national -nationalist -international -global -internationalist -multinational -supranational -interstate -intrastate -natural -earthy -unnatural -violent -natural -unbleached -artificial -arranged -bionic -bleached -cardboard -celluloid -conventionalized -dummy -ersatz -factitious -fake -near -painted -natural -physical -supernatural -apparitional -eerie -eldritch -elfin -charming -marvelous -metaphysical -necromantic -nonnatural -talismanic -transmundane -witchlike -natural -sharp -flat -ultimate -crowning -eventual -final -supreme -proximate -immediate -necessary -essential -incumbent -needed -obligatory -unnecessary -excess -gratuitous -inessential -spare -net -clear -gross -overall -neurotic -abulic -compulsive -delusional -disturbed -hypochondriac -hysteric -megalomaniacal -monomaniacal -nymphomaniacal -obsessional -pathological -phobic -psychosomatic -schizoid -unneurotic -together -nice -good -pleasant -nasty -dirty -grotty -hateful -nidicolous -nidifugous -noble -dignifying -exalted -greathearted -ignoble -base -currish -noble -aristocratic -august -coroneted -imperial -kingly -monarchal -princely -queenly -royal -lowborn -base -common -ignoble -normal -average -median -modal -natural -regular -typical -abnormal -aberrant -anomalous -antidromic -atypical -brachydactylic -defective -freakish -kinky -subnormal -supernormal -vicarious -normal -abnormal -exceptional -hypertensive -hypotensive -normotensive -normal -paranormal -parapsychological -psychic -psychokinetic -supernormal -north -northbound -northerly -northerly -northernmost -northeastern -northeasterly -northeastward -northwestern -northwesterly -northwestward -south -southbound -southerly -southerly -southernmost -southeast -southeasterly -southeastward -southwest -southwesterly -southwestward -northern -boreal -septrional -southern -austral -meridional -northern -blue -Union -Yankee -southern -Confederate -grey -nosed -noseless -noticed -detected -unnoticed -disregarded -ignored -overlooked -unobserved -unperceived -detected -perceived -sensed -heard -undetected -undiscovered -unobserved -determined -ascertained -undetermined -unexplained -noxious -baneful -corrupting -vesicatory -innocuous -innoxious -obedient -acquiescent -conformable -dutiful -disobedient -contrary -fractious -froward -recusant -obtrusive -unobtrusive -objective -clinical -impersonal -verifiable -subjective -personal -prejudiced -unobjective -obligated -beholden -indebted -indebted -supposed -tributary -unobligated -unbeholden -obligate -facultative -obvious -apparent -axiomatic -demonstrable -frank -transparent -unobvious -unapparent -unprovable -obstructed -barricaded -blocked -choked -deadlocked -impeded -occluded -stopped -stuffy -thrombosed -unobstructed -clear -patent -unimpeded -unclogged -occupied -busy -filled -unoccupied -free -spare -occupied -unoccupied -relinquished -offensive -abhorrent -charnel -creepy -disgusting -ghoulish -hideous -objectionable -rank -scrimy -verminous -inoffensive -innocuous -savory -unsavory -odoriferous -offensive -abusive -inoffensive -offenseless -offensive -antipersonnel -assaultive -incursive -marauding -defensive -antiaircraft -antisubmarine -antitank -defending -offending -sinning -offensive -unoffending -apologetic -defensive -unapologetic -official -authoritative -formal -formalized -semiofficial -unofficial -drumhead -informal -unauthorized -unsanctioned -confirmed -official -unconfirmed -unofficial -established -entrenched -grooved -legitimate -official -recognized -unestablished -unrecognized -conditioned -unconditioned -naive -offstage -onstage -old -antediluvian -antique -auld -hoary -immemorial -longtime -patched -secondhand -sunset -yellow -new -fresh -hot -newborn -newfound -novel -parvenu -recent -revolutionary -rising -sunrise -untested -unused -virgin -young -old -aged -aged -aging -ancient -anile -centenarian -darkened -doddering -emeritus -grey -nonagenarian -octogenarian -oldish -overage -sexagenarian -venerable -young -adolescent -infantile -boyish -childlike -early -girlish -junior -little -newborn -preteen -puppyish -tender -youngish -youthful -on -connected -off -disconnected -on -off -onside -offside -open -ajar -shut -open -opened -unstoppered -yawning -closed -blocked -drawn -stoppered -nonopening -open -agape -agaze -yawning -closed -blinking -compressed -squinched -spaced -leaded -unspaced -unleaded -enclosed -basined -besieged -boxed -capsulate -clathrate -closed -coarctate -embedded -fencelike -included -involved -surrounded -unenclosed -hypaethral -open -unfenced -tanned -untanned -tapped -abroach -untapped -open -closed -operational -active -effective -nonoperational -opportune -good -timely -inopportune -inconvenient -opposable -unopposable -opposed -conflicting -unopposed -opposite -alternate -optimistic -bullish -cheerful -sanguine -pessimistic -bearish -demoralized -oral -buccal -buccal -aboral -actinal -abactinal -orderly -disorderly -boisterous -mobbish -raucous -ordered -consecutive -progressive -disordered -organized -methodical -disorganized -broken -chaotic -scrambled -unmethodical -unstuck -organized -arranged -configured -corporate -reorganized -unorganized -uncoordinated -unformed -unincorporated -structured -unstructured -ambiguous -unregulated -ordinary -average -banausic -characterless -common -commonplace -everyday -indifferent -extraordinary -bonzer -exceeding -extraordinaire -fantastic -phenomenal -frightful -great -one -preternatural -pyrotechnic -rare -remarkable -some -special -wonderworking -organic -inorganic -organic -integrated -nonsynthetic -inorganic -amorphous -artificial -mineral -holistic -atomistic -arranged -laid -placed -disarranged -disarrayed -disturbed -misplaced -oriented -adjusted -bound -directed -headed -homeward -minded -unoriented -alienated -confused -orienting -aligning -dimensioning -familiarizing -homing -disorienting -confusing -estranging -stunning -stupefying -original -freehand -fresh -germinal -innovative -newfangled -underivative -unoriginal -banal -bromidic -cliched -cold -slavish -orthodox -antiheretical -canonic -conforming -conventional -traditional -unreformed -unorthodox -dissentient -dissident -iconoclastic -nonconforming -Reformed -outdoor -alfresco -outdoorsy -indoor -outside -extracurricular -extracurricular -right -inside -wrong -covered -ariled -awninged -beaded -blanketed -canopied -cloaked -crusted -dabbled -drenched -dusty -muffled -peritrichous -plastered -overgrown -sealed -smothered -splashy -thickspread -tiled -white -bare -bald -naked -undraped -unroofed -coated -backed -glazed -oily -uncoated -roofed -roofless -leafy -bifoliate -bowery -foliaceous -foliate -foliolate -ivied -leafed -leaflike -petallike -unifoliate -leafless -aphyllous -defoliate -scapose -lipped -bilabiate -labiate -lipless -overt -bald -naked -undisguised -visible -covert -backstair -black -clandestine -secret -collusive -cloaked -secret -subterranean -undisclosed -paid -cashed -compensable -compensated -mercenary -postpaid -square -unpaid -buckshee -complimentary -outstanding -uncompensated -painful -aching -agonized -agonizing -biting -chafed -poignant -itchy -racking -sensitive -traumatic -painless -painted -finished -stained -whitewashed -unpainted -bare -unoiled -unstained -painted -rouged -unpainted -unrouged -delineated -depicted -described -diagrammatic -undelineated -undepicted -undrawn -paintable -unpaintable -palatable -unpalatable -brackish -distasteful -palpable -perceptible -impalpable -elusive -parallel -antiparallel -collateral -nonconvergent -oblique -bias -catacorner -crabwise -diagonal -nonparallel -perpendicular -normal -orthogonal -right -pardonable -excusable -expiable -minor -unpardonable -deadly -inexcusable -inexpiable -excusable -justifiable -inexcusable -indefensible -parental -filial -daughterly -partial -biased -impartial -disinterested -dispassionate -indifferent -indifferent -particulate -nonparticulate -passable -navigable -negotiable -surmountable -traversable -impassable -unsurmountable -unnavigable -untraversable -passionate -ablaze -ardent -choleric -fanatic -lustful -wild -passionless -platonic -unimpassioned -past -ago -ancient -bygone -chivalric -early -erstwhile -former -historic -last -late -olden -other -prehistoric -then -ultimo -present -existing -immediate -instant -future -approaching -early -emerging -proximo -born -hatched -unborn -unhatched -parented -unparented -orphaned -fatherless -motherless -paternal -fatherly -paternalistic -maternal -maternalistic -motherlike -motherly -wifely -husbandly -patient -diligent -enduring -forbearing -tolerant -unhurried -impatient -restive -unforbearing -patriarchal -patriarchic -patricentric -matriarchal -matriarchic -matricentric -patronized -unpatronized -briefless -packaged -prepackaged -unpackaged -loose -paved -sealed -unpaved -patriotic -chauvinistic -unpatriotic -peaceful -halcyon -irenic -nonbelligerent -pacific -pacifist -peaceable -unpeaceful -belligerent -militant -stormy -unpeaceable -penitent -contrite -penitential -impenitent -perceptive -acute -apprehensive -apperceptive -insightful -observant -subtle -understanding -unperceptive -blind -unobservant -perceptible -detectable -discernible -faint -palpable -perceivable -recognizable -sensible -imperceptible -impalpable -incognizable -indiscernible -subliminal -unobservable -perfect -clean -clear -cold -complete -down -errorless -faultless -flawless -ideal -idealized -idyllic -mint -perfectible -pluperfect -uncorrupted -imperfect -blemished -broken -corrupt -defective -imperfectible -irregular -perishable -biodegradable -decayable -imperishable -durable -imputrescible -permanent -abiding -ageless -indissoluble -standing -impermanent -acting -ephemeral -episodic -evanescent -improvised -interim -shipboard -temporal -terminable -working -persistent -caducous -deciduous -reversible -correctable -rechargeable -irreversible -permanent -reversible -nonreversible -revocable -rescindable -reversible -irrevocable -sealed -permissible -impermissible -forbidden -unmentionable -untouchable -admissible -admittable -allowable -permissible -inadmissible -impermissible -permissive -indulgent -unpermissive -permissive -bailable -preventive -blockading -clogging -deterrent -frustrating -precautionary -preclusive -preemptive -prohibitive -perplexed -baffled -metagrobolized -questioning -stuck -unperplexed -unbaffled -personal -individual -individualized -own -personalized -private -impersonal -nonpersonal -persuasive -coaxing -cogent -compelling -glib -dissuasive -admonitory -discouraging -penetrable -impenetrable -dense -permeable -porous -semipermeable -impermeable -retentive -pervious -receptive -impervious -fast -colorfast -greaseproof -mothproof -proof -resistant -runproof -soundproof -petalous -gamopetalous -polypetalous -salverform -apetalous -puncturable -punctureless -psychoactive -hallucinogenic -psychedelic -nonpsychoactive -physical -animal -bodily -material -personal -physiologic -somatogenic -mental -intellectual -moral -psychic -psychogenic -psychological -monotheistic -polytheistic -pious -devotional -godly -prayerful -impious -godless -secular -religious -religious -churchgoing -churchly -devout -interfaith -irreligious -atheistic -heathen -lapsed -nonobservant -placable -appeasable -mitigable -implacable -grim -unmitigable -plain -patterned -banded -blotched -brindled -burled -checked -dappled -dotted -figured -floral -freckled -laced -marbled -moire -patched -pointillist -pinstriped -ringed -slashed -sprigged -streaked -striped -tessellated -veined -plain -austere -bare -chaste -dry -dry -featureless -homely -inelaborate -literal -simple -tailored -vanilla -fancy -aureate -baroque -busy -dressy -crackle -damascene -damask -elaborate -embattled -fanciful -fantastic -lacy -puff -rococo -vermicular -planned -contrived -preset -unplanned -casual -casual -unpremeditated -studied -unstudied -candid -plausible -arguable -glib -implausible -improbable -pleasant -beautiful -dulcet -enjoyable -grateful -idyllic -unpleasant -acerb -beastly -dour -dreadful -embarrassing -harsh -harsh -hot -afflictive -rebarbative -sharp -ungrateful -unhappy -pleased -amused -chuffed -delighted -gratified -displeased -annoyed -exasperated -disgusted -frowning -offended -pleasing -admirable -charming -delightful -easy -fabulous -good -gratifying -ingratiating -sweet -displeasing -disconcerting -exasperating -pointed -acanthoid -acuate -barreled -fusiform -nibbed -peaked -pyramidal -sharpened -spiked -spikelike -pointless -blunt -acute -obtuse -polished -bright -finished -unpolished -raw -rough -unburnished -politic -expedient -sagacious -impolitic -inexpedient -political -governmental -semipolitical -nonpolitical -apolitical -ponderable -assessable -imponderable -popular -fashionable -favorite -hot -touristed -unpopular -pro -anti -positive -affirmative -constructive -negative -antagonistic -perverse -neutral -neutralized -viewless -plus -nonnegative -positive -minus -negative -positive -negative -positive -negative -possible -accomplishable -affirmable -attainable -contingent -feasible -mathematical -impossible -hopeless -impracticable -out -unachievable -potent -equipotent -multipotent -impotent -ineffective -impuissant -potent -impotent -powerful -almighty -coercive -compelling -mighty -muscular -potent -puissant -regent -regnant -powerless -feeble -helpless -weak -powered -supercharged -unpowered -influential -authoritative -potent -prestigious -uninfluential -placental -transplacental -aplacental -planted -cropped -naturalized -potbound -quickset -seeded -unplanted -uncropped -unseeded -plowed -tilled -unplowed -fallow -untilled -cultivated -uncultivated -uncultivable -potted -unpotted -practical -applicative -functional -interoperable -operable -serviceable -unimaginative -working -impractical -crazy -meshugge -quixotic -unfunctional -unwieldy -precise -dead -fine -finespun -meticulous -microscopic -nice -very -imprecise -general -precocious -advanced -retarded -backward -imbecile -moronic -cretinous -delayed -predictable -foreseeable -inevitable -unpredictable -aleatory -capricious -episodic -unforeseeable -premeditated -aforethought -unpremeditated -impulsive -prepared -braced -embattled -equipped -preconditioned -precooked -processed -ready -spread -up -unprepared -prescription -nonprescription -present -attendant -existing -here -omnipresent -absent -away -introuvable -truant -ostentatious -flaunty -flamboyant -unostentatious -quiet -pretentious -arty -grandiloquent -grandiose -sententious -sesquipedalian -unpretentious -honest -modest -unpompous -primary -capital -direct -firsthand -original -particular -secondary -alternate -auxiliary -collateral -indirect -secondhand -standby -thirdhand -tributary -utility -vicarious -basic -basal -elementary -fundamental -grassroots -radical -incidental -omissible -parenthetic -peripheral -secondary -private -clannish -cloistered -close -confidential -confidential -insular -nonpublic -offstage -privy -semiprivate -public -national -open -semipublic -unexclusive -exclusive -alone -inner -inside -selective -inclusive -comprehensive -privileged -sweetheart -underprivileged -deprived -underclass -productive -amentiferous -arable -fecund -rich -unproductive -bootless -dry -nonproductive -generative -consumptive -exploitative -reproducible -duplicable -unreproducible -inimitable -unrepeatable -professional -nonrecreational -professed -nonprofessional -amateur -lay -professional -unprofessional -amateurish -profitable -bankable -fat -gainful -economic -lucrative -unprofitable -dead -lean -marginal -unremunerative -profound -deep -thoughtful -superficial -apparent -dilettante -facile -glib -looking -shallow -prognathous -opisthognathous -chinless -progressive -advanced -advancing -modernized -regressive -atavistic -retrograde -returning -unmodernized -progressive -degressive -regressive -pronounceable -rolled -unpronounceable -proper -becoming -correct -correct -fitting -halal -kosher -priggish -improper -indecent -wrong -prophetic -adumbrative -apocalyptic -clairvoyant -Delphic -divinatory -fateful -precursory -predictive -unprophetic -nonprognosticative -unpredictive -prospective -likely -future -retrospective -protected -bastioned -battlemented -burglarproof -covert -moated -shielded -snug -stormproof -weatherproof -unprotected -exposed -naked -unshielded -protective -cautionary -contraceptive -custodial -evasive -overprotective -preservative -protecting -restrictive -unprotective -proud -arrogant -beaming -big -bigheaded -boastful -dignified -disdainful -conceited -overproud -pleased -humble -broken -meek -proved -established -evidenced -tested -verified -unproved -unverified -provident -careful -farseeing -forehanded -forethoughtful -improvident -short -thriftless -unforethoughtful -provocative -agitative -challenging -charged -incendiary -rousing -unprovocative -disarming -noninflammatory -prudent -circumspect -judicious -provident -prudential -imprudent -injudicious -rash -punctual -prompt -timely -unpunctual -behindhand -belated -benighted -punished -unpunished -uncorrected -punitive -correctional -penal -penitentiary -retaliatory -rehabilitative -purebred -pedigree -crossbred -bigeneric -hybrid -underbred -pure -immaculate -white -impure -defiled -pure -axenic -clean -clean -fine -native -plain -pristine -sublimate -unadulterated -unalloyed -uncontaminated -virginal -impure -adulterate -alloyed -bastardized -contaminated -dirty -unpurified -contaminated -uncontaminated -purposeful -businesslike -purposeless -adrift -desultory -qualified -unqualified -quack -trained -disciplined -drilled -housebroken -untrained -primitive -undisciplined -qualified -conditional -hedged -limited -unqualified -categoric -clean -cool -outright -qualitative -soft -quantitative -decimal -duodecimal -numeric -quantifiable -valued -vicenary -questionable -alleged -apocryphal -debatable -doubtful -equivocal -fishy -impugnable -unquestionable -acknowledged -mathematical -unimpeachable -quiet -noiseless -silent -stilly -tiptoe -noisy -blatant -abuzz -clangorous -clanking -clattery -creaky -rackety -reedy -stertorous -swishy -thundering -whirring -restful -slumberous -restless -quiet -quiescent -untroubled -unquiet -disruptive -squally -random -ergodic -haphazard -stochastic -nonrandom -purposive -rational -coherent -demythologized -intelligent -reasonable -irrational -blind -reasonless -nonrational -superstitious -emotional -cerebral -racial -biracial -interracial -multiracial -racist -nonracial -reactive -activated -labile -oxidizable -thermolabile -unstable -unreactive -inactive -inert -noble -stable -ready -fit -prompt -ripe -waiting -unready -napping -unripe -real -actual -actual -objective -historical -unreal -dreamed -envisioned -fabled -fabricated -fabulous -fanciful -fantastic -hallucinatory -illusional -illusive -real -proper -true -unreal -deceptive -dreamlike -phantom -real -nominal -realistic -hardheaded -graphic -living -veridical -virtual -unrealistic -chimerical -delusive -fantastic -kafkaesque -phantasmagoric -reasonable -commonsense -healthy -tenable -unreasonable -counterintuitive -indefensible -mindless -undue -reciprocal -bilateral -trilateral -correlative -interactional -reciprocative -reciprocative -nonreciprocal -nonreciprocating -unanswered -refined -civilized -couth -dainty -debonair -finespun -gentlemanlike -ladylike -patrician -overrefined -unrefined -agrestic -artless -boorish -coarse -crass -low -robust -rough -ungentlemanly -unladylike -processed -cured -milled -unprocessed -natural -streaming -unvulcanized -refined -unrefined -treated -activated -aerated -burned -doped -fumed -proofed -untreated -raw -oiled -unoiled -treated -bandaged -dosed -dressed -untreated -recoverable -redeemable -retrievable -unrecoverable -irretrievable -lost -regenerate -reformed -unregenerate -cussed -impenitent -unconverted -registered -certified -recorded -unregistered -unlisted -registered -unregistered -regular -lawful -official -standard -timed -uniform -weak -irregular -asymmetrical -casual -improper -randomized -strong -regular -irregular -regulated -unregulated -remediable -irremediable -renewable -unrenewable -rentable -unrentable -reparable -maintainable -irreparable -repeatable -unrepeatable -repetitive -iterative -nonrepetitive -printable -unprintable -requested -unrequested -unasked -rhymed -alliterative -assonant -unrhymed -uniform -single -multiform -polymorphic -periodic -cyclic -oscillatory -diurnal -daily -nightly -weekly -semiweekly -hourly -fortnightly -annual -semiannual -biennial -triennial -monthly -bimonthly -semimonthly -semestral -midweekly -aperiodic -noncyclic -nonoscillatory -regular -standing -irregular -related -affinal -agnate -akin -allied -descendant -enate -kindred -unrelated -unconnected -related -affiliated -cognate -connate -coreferent -correlative -corresponding -unrelated -misrelated -orthogonal -uncorrelated -relevant -applicable -germane -pertinent -irrelevant -digressive -extraneous -inapplicable -moot -mindful -careful -evocative -unmindful -amnesic -replaceable -exchangeable -irreplaceable -representational -delineative -eidetic -figural -mimetic -naturalistic -nonrepresentational -abstract -conventional -geometric -hieratic -protogeometric -semiabstract -representative -allegorical -emblematic -nonrepresentative -reputable -esteemed -estimable -redoubtable -respected -disreputable -discreditable -discredited -louche -seamy -receptive -acceptive -admissive -assimilative -hospitable -unreceptive -closed -reconcilable -harmonizable -resolvable -irreconcilable -hostile -inconsistent -reserved -aloof -diffident -indrawn -unreserved -reserved -booked -bookable -unreserved -unbooked -resistible -irresistible -overpowering -resolute -bent -determined -desperate -firm -foursquare -spartan -stalwart -undaunted -undeterred -irresolute -discouraged -infirm -unstable -vacillant -respectable -decent -presentable -upstanding -unrespectable -respectful -deferent -honorific -disrespectful -annihilating -contemptuous -contumelious -derisive -impious -impudent -undeferential -responsible -accountable -answerable -amenable -liable -trustworthy -irresponsible -carefree -feckless -idle -unaccountable -unreliable -responsive -answering -unresponsive -refractory -restrained -close -unexpansive -unrestrained -excessive -freewheeling -highflying -unbridled -unbuttoned -unhampered -restricted -circumscribed -closed -unrestricted -discretionary -open -restrictive -confining -inhibitory -limiting -regulative -sumptuary -suppressive -unrestrictive -emancipative -nonrestrictive -retentive -unretentive -reticulate -cancellate -crisscross -fretted -interconnected -lacy -meshed -networklike -nonreticulate -retractile -retractable -nonretractile -reflective -mirrorlike -reflecting -nonreflective -echoless -reflected -echoic -mirrored -unreflected -absorbed -reverberant -bright -clinking -echoing -hollow -jingling -live -resonant -tinkling -vibrant -unreverberant -anechoic -dead -dull -reverent -adoring -awed -respectful -irreverent -blasphemous -aweless -revived -recrudescent -redux -renewed -resurgent -resuscitated -revitalized -unrevived -awakened -aroused -unawakened -awed -overawed -unawed -aweless -revolutionary -counterrevolutionary -rewarding -bountied -rewardful -unrewarding -thankless -profitless -rhetorical -bombastic -flowery -empurpled -forensic -grandiloquent -oratorical -poetic -stylistic -unrhetorical -plainspoken -rhythmical -Adonic -cadenced -danceable -jazzy -lilting -measured -Sapphic -chantlike -syncopated -throbbing -unrhythmical -arrhythmic -nonrhythmic -unmeasured -ribbed -costate -riblike -ribless -rich -affluent -comfortable -poor -broke -destitute -moneyless -rich -poor -resourceless -rich -deluxe -lavish -poor -beggarly -slummy -moneyed -moneyless -solvent -insolvent -bankrupt -rich -lean -rimmed -rimless -handed -handless -handled -handleless -dextral -right -left -sinistral -ambidextrous -equipoised -right -conservative -oldline -reactionary -rightish -rightist -left -leftish -leftist -liberal -center -centrist -right -far -rightmost -starboard -left -leftmost -near -port -horned -antlered -bicorn -horny -hornless -right -ethical -wrong -condemnable -base -misguided -righteous -good -sound -unrighteous -sinful -robust -beefy -hardy -hardy -vigorous -frail -decrepit -round -bulblike -capitate -coccoid -cumuliform -discoid -moonlike -nutlike -ringlike -roundish -square -quadrate -squared -squarish -rounded -allantoid -annular -aspheric -auriform -bowfront -crescent -cycloid -cylindrical -disciform -domed -ellipsoid -hyperboloidal -lingulate -olivelike -parabolic -paraboloidal -pineal -plumlike -rotund -terete -umbrellalike -angular -angled -asteroid -bicuspid -cuspate -equiangular -isogonic -rectangular -triangular -tricuspid -unicuspid -oblate -prolate -rural -agrarian -agrestic -arcadian -campestral -countrified -hobnailed -urban -citified -urbanized -rusted -rusty -rustless -rustproof -undercoated -holy -beatified -Blessed -consecrated -hallowed -unholy -profane -sacred -divine -ineffable -inspirational -inviolable -numinous -religious -reverend -sacral -taboo -profane -laic -profanatory -sadistic -masochistic -safe -dangerous -breakneck -chancy -desperate -hazardous -insidious -mordacious -parlous -treacherous -safe -out -down -salable -marketable -marketable -unsalable -unmarketable -unmarketable -same -assonant -comparable -duplicate -homophonic -identical -one -synoptic -different -antithetic -assorted -contrary -contrasting -diametric -divergent -disparate -distinct -diverse -divers -opposite -several -variant -same -aforesaid -identical -other -different -another -different -new -opposite -opposite -opposite -otherwise -similar -akin -analogous -confusable -connatural -corresponding -quasi -sympathetic -dissimilar -sane -lucid -insane -amuck -balmy -brainsick -certifiable -crackbrained -crazed -fey -hebephrenic -lunatic -maniacal -maniclike -paranoid -psychopathic -psychotic -schizophrenic -satiate -jaded -satiable -insatiate -quenchless -unsated -unsatisfiable -sarcastic -barbed -black -corrosive -sardonic -satirical -saturnine -unsarcastic -satisfactory -adequate -alright -comforting -copacetic -passing -right -unsatisfactory -disappointing -failing -off -unacceptable -scalable -ascendable -unscalable -scholarly -academic -bookish -erudite -unscholarly -unlearned -unstudious -scientific -technological -unscientific -pseudoscientific -scrupulous -religious -unscrupulous -conscientious -unconscientious -conscienceless -sealed -unopened -unsealed -open -sealed -unsealed -wrapped -unwrapped -seaworthy -unseaworthy -airworthy -unairworthy -concealed -bushwhacking -dark -furtive -hidden -hidden -incognito -sealed -secret -sneaking -unconcealed -blatant -exhibitionistic -concealing -revealing -indicative -sectarian -denominational -nonsectarian -ecumenic -interchurch -nondenominational -undenominational -secure -insecure -overanxious -unassured -secure -assured -firm -sure -insecure -precarious -unguaranteed -secure -steady -tight -insecure -fastened -unfastened -unbarred -undone -insured -insurable -uninsured -uninsurable -seductive -alluring -corrupting -insidious -teasing -unseductive -uninviting -selfish -egotistic -unselfish -sharing -senior -elder -major -precedential -ranking -junior -minor -younger -sensational -lurid -scandalmongering -screaming -unsensational -sensible -insensible -anesthetic -asleep -sensitive -delicate -erogenous -excitable -irritable -radiosensitive -nociceptive -reactive -insensitive -dead -unreactive -sensitive -alive -huffy -oversensitive -insensitive -callous -dead -dull -insensible -soulless -sensitizing -desensitizing -numbing -sensory -extrasensory -clairvoyant -telegnostic -telepathic -sent -unsent -separate -apart -asunder -detached -discrete -disjoint -disjunct -isolable -unaccompanied -joint -clannish -concerted -conjoined -corporate -cosignatory -sanitary -hygienic -unsanitary -unhygienic -septic -abscessed -dirty -contaminative -purulent -infectious -putrefactive -septicemic -antiseptic -aseptic -bactericidal -cleansing -nonpurulent -uninfected -germfree -axenic -germy -unsterilized -adulterating -extraneous -purifying -ablutionary -antiseptic -detergent -serious -earnest -grave -overserious -real -thoughtful -sobering -solid -frivolous -airheaded -flighty -flippant -idle -light -trivial -playful -coltish -devilish -elfin -arch -kittenish -mocking -unplayful -selected -elect -unselected -serviceable -durable -functional -unserviceable -inoperable -unrepaired -resident -nonresident -settled -based -located -nonnomadic -relocated -unsettled -aimless -erratic -homeless -migrant -mobile -peripatetic -itinerant -rootless -unlocated -migratory -nonmigratory -settled -accomplished -appointed -determined -deterministic -firm -preconcerted -unsettled -doubtful -open -sexy -aroused -autoerotic -coquettish -erotic -blue -hot -intimate -juicy -lascivious -lecherous -leering -lubricious -orgiastic -oversexed -pornographic -provocative -raunchy -sexed -unsexy -sexless -sexless -undersexed -sexual -intersexual -sexed -unisexual -asexual -agamic -fissiparous -neuter -vegetal -castrated -altered -cut -spayed -uncastrated -entire -aphrodisiac -anaphrodisiac -estrous -monestrous -polyestrous -anestrous -diestrous -shapely -bosomy -callipygian -Junoesque -modeled -retrousse -unshapely -acromegalic -chunky -clubfooted -deformed -knobby -nodular -nodulose -shapeless -torulose -breasted -bosomed -breastless -formed -ductile -bacillar -biform -botuliform -catenulate -navicular -perfected -phylliform -precast -shaped -vermiform -unformed -amorphous -unshaped -shared -common -joint -unshared -exclusive -individual -undivided -shaven -beardless -unshaven -bearded -bestubbled -goateed -mustachioed -sheared -unsheared -sheathed -cased -clad -ironclad -podlike -unsheathed -shockable -unshockable -shod -booted -ironshod -roughshod -sandaled -slippered -unshod -barefoot -stockinged -calced -discalced -nearsighted -farsighted -hyperopic -telescopic -shrinkable -unshrinkable -sighted -seeing -blind -blinded -blindfold -dazzled -deuteranopic -eyeless -protanopic -tritanopic -signed -autographed -subscribed -unsigned -significant -momentous -epochal -earthshaking -evidential -fundamental -large -monumental -noteworthy -probative -operative -portentous -insignificant -flimsy -inappreciable -light -superficial -significant -nonsignificant -silenced -suppressed -unsilenced -simple -acerate -acuminate -apiculate -caudate -cordate -cuneate -deltoid -dolabriform -elliptic -ensiform -hastate -lanceolate -linear -lyrate -needled -obtuse -oblanceolate -oblong -obovate -orbiculate -ovate -pandurate -peltate -perfoliate -reniform -sagittate -spatulate -unlobed -compound -bilobate -binate -bipartite -bipinnate -bipinnatifid -cleft -conjugate -decompound -incised -lobed -palmate -palmatifid -parted -pedate -pinnate -pinnatifid -pinnatisect -quinquefoliate -radiate -ternate -trifoliate -trilobate -tripinnate -tripinnatifid -simple -simplex -simplistic -unanalyzable -uncomplicated -complex -analyzable -Byzantine -colonial -complicated -composite -compound -daedal -Gordian -interlacing -intricate -labyrinthine -multifactorial -multiplex -thickening -sincere -cordial -dear -honest -genuine -insincere -bootlicking -buttery -dissimulative -false -feigned -gilded -hypocritical -plausible -singular -plural -dual -singular -plural -cardinal -zero -one -two -three -four -five -six -seven -eight -nine -ten -eleven -twelve -thirteen -fourteen -fifteen -sixteen -seventeen -eighteen -nineteen -twenty -thirty -forty -fifty -sixty -seventy -eighty -ninety -hundred -thousand -million -billion -billion -trillion -trillion -zillion -ordinal -zero -zeroth -first -second -third -fourth -fifth -sixth -seventh -eighth -ninth -tenth -eleventh -twelfth -thirteenth -fourteenth -fifteenth -sixteenth -seventeenth -eighteenth -nineteenth -umpteenth -twentieth -thirtieth -fortieth -fiftieth -sixtieth -seventieth -eightieth -ninetieth -hundredth -thousandth -millionth -billionth -trillionth -quadrillionth -quintillionth -nth -scripted -unscripted -sinkable -unsinkable -single -azygous -lone -singular -unary -uninominal -multiple -aggregate -bigeminal -binary -double -double -double -duplex -manifold -ternary -treble -triune -quadruple -quadruple -quaternate -quintuple -sextuple -septuple -octuple -nonuple -tenfold -double -single -multilane -divided -sized -eightpenny -fourpenny -ninepenny -size -sorted -threepenny -unsized -unsorted -sized -unsized -skilled -accomplished -adept -arch -consummate -delicate -hot -mean -technical -versatile -unskilled -artless -botchy -bungled -bungling -crude -hopeless -humble -lubberly -semiskilled -weak -verbal -numerical -coarse -farinaceous -granulated -plushy -loose -fine -close -dustlike -floury -nongranular -powdered -small -superfine -smoky -blackened -smoking -smokeless -slippery -lubricious -nonstick -slick -sliding -slimed -slipping -slithery -nonslippery -nonskid -nonslip -lubricated -unlubricated -smooth -creaseless -fast -glassy -seamless -streamlined -velvet -rough -abrasive -alligatored -barky -broken -bullate -bumpy -chapped -corded -costate -cragged -crushed -homespun -imbricate -lepidote -squamulose -lined -pocked -rocky -gravelly -roughish -rugose -sandpapery -scabby -shagged -textured -verrucose -smooth -rough -furrowed -canaliculate -corrugated -rutted -unfurrowed -smooth -entire -repand -sinuate -undulate -unnotched -rough -bidentate -biserrate -ciliate -crenate -crenulate -crispate -dentate -denticulate -emarginate -erose -fimbriate -fringed -lacerate -pectinate -rimose -runcinate -serrate -serrulate -spinose -rifled -unrifled -social -cultural -gregarious -interpersonal -multiethnic -unsocial -alone -antisocial -asocial -lone -recluse -accompanied -unaccompanied -alone -isolated -tod -unattended -accompanied -unaccompanied -solo -gregarious -social -ungregarious -nongregarious -gregarious -clustered -ungregarious -caespitose -seamed -seamy -sewed -seamless -broadloom -unseamed -seeded -unseeded -seedy -seeded -seeded -seedless -seeded -stoneless -shuttered -closed -unshuttered -sleeved -sleeveless -sociable -clubbable -clubbish -companionable -convivial -extroverted -social -unsociable -antisocial -ungregarious -sold -oversubscribed -unsold -soled -soleless -solid -coagulated -concrete -congealed -dry -semisolid -liquid -fluid -liquefiable -liquefied -semiliquid -watery -gaseous -aeriform -aerosolized -evaporated -gasified -gassy -vaporific -solid -massive -hollow -cavernous -fistular -tubular -soluble -dissolvable -meltable -insoluble -soluble -answerable -solvable -insoluble -insolvable -solved -unsolved -some -any -both -several -no -nary -none -zero -all -each -every -every -sophisticated -blase -intelligent -polished -naive -childlike -credulous -fleeceable -innocent -unsophisticated -sound -dependable -healthy -solid -stable -unsound -bad -long -wildcat -sound -solid -unsound -corroded -decayed -effervescent -bubbling -aerated -fizzing -carbonated -noneffervescent -flat -noncarbonated -sparkling -still -specialized -differentiated -special -specialistic -unspecialized -generalized -spinous -spineless -spirited -boisterous -dashing -ebullient -feisty -impertinent -lively -mettlesome -resilient -snappy -sprightly -vibrant -zestful -spiritless -apathetic -bloodless -dispirited -heartless -thin -spontaneous -impulsive -intuitive -natural -induced -elicited -iatrogenic -spoken -expressed -oral -verbal -written -backhand -cursive -engrossed -graphic -handwritten -holographic -inscribed -longhand -scrivened -shorthand -voiced -unvoiced -whispered -written -codified -unwritten -vocalic -vowellike -consonantal -stoppable -abatable -unstoppable -unbeatable -syllabic -nonsyllabic -syllabic -disyllabic -monosyllabic -octosyllabic -pentasyllabic -polysyllabic -decasyllabic -syllabled -nonsyllabic -unsyllabled -syllabic -accentual -quantitative -stable -firm -lasting -stabile -stabilized -unstable -coseismic -crank -explosive -rickety -rocky -seismic -tipsy -tottering -volcanic -staccato -abrupt -legato -staged -unstaged -unperformed -standard -authoritative -basic -casebook -criterial -nonstandard -standard -modular -regular -regulation -standardized -stock -nonstandard -deficient -nonnormative -standard -acceptable -classical -nonstandard -bad -unacceptable -starchy -starchlike -starchless -starry -sparkling -starlike -starlit -starless -nourished -full -overfed -malnourished -foodless -starved -unfed -unnourished -steady -dependable -even -firm -level -steadied -sure -surefooted -unsteady -arrhythmic -convulsive -faltering -flickering -fluctuating -palpitant -shaky -quavering -shifting -shuddering -tottering -uneven -wobbling -stemmed -stemless -stemmed -stimulating -challenging -exciting -piquant -rousing -thrilling -unstimulating -bland -dry -vapid -depressant -ataractic -narcotic -relaxant -soporific -stimulative -adrenocorticotropic -analeptic -excitant -irritating -stimulant -stomatous -mouthlike -astomatous -straight -aligned -unbent -untwisted -crooked -akimbo -anfractuous -aquiline -askew -contorted -deflective -geniculate -gnarled -malposed -reflexed -squiggly -tortuous -warped -windblown -wry -zigzag -straight -trabeated -uncurved -curved -arced -curvilineal -eellike -falcate -curvy -flexuous -hooklike -incurvate -recurved -semicircular -serpentine -sinuate -sinusoidal -upcurved -coiled -coiling -convolute -involute -involute -wound -uncoiled -uncurled -straight -aboveboard -guileless -straightarrow -crooked -sneaky -stressed -emphatic -masculine -unstressed -feminine -unaccented -unemphatic -tonic -atonic -strong -beardown -brawny -bullnecked -bullocky -fortified -hard -ironlike -noticeable -reinforced -robust -stiff -vehement -virile -weak -anemic -adynamic -faint -feeble -flimsy -pale -puny -vulnerable -weakened -stubborn -bolshy -bullheaded -dogged -contrarious -determined -hardheaded -docile -meek -sheeplike -yielding -subordinate -feudatory -ruled -subject -subservient -insubordinate -contumacious -disobedient -mutinous -rebellious -successful -boffo -booming -in -made -productive -victorious -unsuccessful -attempted -defeated -hitless -out -scoreless -unfulfilled -unplaced -winless -sufficient -adequate -comfortable -insufficient -depleted -inadequate -lean -light -shy -sugary -candied -honeyed -honeylike -sugared -sugarless -unsugared -unsweetened -superior -arch -eminent -leading -majestic -superordinate -upper -inferior -humble -indifferent -outclassed -superior -ace -banner -boss -brilliant -capital -choice -excellent -greatest -outstanding -premium -pukka -shining -spiffing -supreme -transcendent -inferior -bad -base -bum -cheapjack -coarse -coarsened -commercial -deplorable -less -mediocre -ropey -scrawny -utility -superior -inferior -superjacent -incumbent -overlying -superincumbent -subjacent -underlying -superscript -subscript -adscript -supervised -unsupervised -unattended -supported -based -braced -gimbaled -pendent -supernatant -suspended -underhung -underslung -unsupported -strapless -unbraced -supported -subsidized -unsupported -baseless -uncorroborated -assisted -unassisted -naked -unaided -supportive -accessory -accessary -certificatory -collateral -encouraging -unsupportive -confounding -disconfirming -surmountable -conquerable -insurmountable -insuperable -surprised -amazed -dumbfounded -gobsmacked -jiggered -startled -unsurprised -surprising -amazing -startling -stunning -unsurprising -susceptible -allergic -amenable -capable -convincible -fictile -liable -predisposed -amenable -suggestible -temptable -unvaccinated -vulnerable -unsusceptible -immune -immunized -immunogenic -incapable -unpersuadable -unresponsive -impressionable -easy -spinnable -plastic -susceptible -unimpressionable -exempt -excused -immune -privileged -nonexempt -liable -taxpaying -unexcused -scheduled -regular -unscheduled -extra -forced -sweet -dry -brut -sec -sweet -cloying -sweetish -sour -acerb -acetose -acidic -lemony -subacid -soured -off -unsoured -fresh -suspected -unsuspected -unknown -swept -sweptback -sweptwing -unswept -sworn -bound -unsworn -symmetrical -bilateral -biradial -cruciate -even -interchangeable -isosceles -radial -rhombohedral -asymmetrical -lopsided -noninterchangeable -unsymmetric -actinomorphic -actinoid -zygomorphic -sympathetic -commiserative -condolent -empathic -unsympathetic -unsympathizing -sympathetic -unsympathetic -sympatric -allopatric -synchronic -diachronic -synchronous -coetaneous -coexistent -coincident -contemporaneous -parallel -synchronic -synchronized -asynchronous -allochronic -anachronic -nonsynchronous -serial -synchronous -asynchronous -syndetic -asyndetic -synonymous -similar -substitutable -antonymous -complementary -contradictory -contrary -contrastive -converse -systematic -unsystematic -taciturn -reticent -voluble -chatty -tactful -discerning -tactless -tall -gangling -leggy -leggy -long -stately -tallish -short -chunky -compact -squab -tame -broken -cultivated -docile -domestic -tamed -wild -feral -unbroken -undomesticated -tame -subdued -wild -chaotic -delirious -frenzied -unsubdued -tangible -tactile -intangible -tangible -real -realizable -intangible -tasteful -aesthetic -understated -tasteless -barbaric -brassy -Brummagem -camp -indelicate -ostentatious -tasty -ambrosial -bitter -bitterish -bittersweet -choice -dainty -delectable -flavorful -fruity -peppery -gingery -hot -grapey -nippy -nutty -piquant -pungent -salty -smoky -sour -winy -tasteless -bland -unflavored -unsalted -taxable -assessable -dutiable -ratable -nontaxable -unratable -temperate -abstemious -moderate -intemperate -big -temperate -equable -intemperate -tense -overstrung -taut -lax -drooping -limp -floppy -loose -tensionless -tense -constricted -lax -tense -aroused -taut -antsy -edgy -electric -isotonic -nervous -strained -unrelaxed -relaxed -degage -unstrained -hypertonic -hypotonic -territorial -jurisdictional -regional -sectional -extraterritorial -territorial -nonterritorial -thermoplastic -thermosetting -thick -deep -fat -heavy -heavy -quilted -thickened -thin -bladed -capillary -compressed -depressed -diaphanous -filamentous -fine -light -hyperfine -papery -ribbonlike -sleazy -slender -tenuous -thick -clogged -coagulable -coagulate -creamy -dense -gelatinous -ropy -soupy -syrupy -thickened -thin -tenuous -rare -thinkable -cogitable -conceivable -presumable -unthinkable -impossible -thoughtful -bemused -brooding -cogitative -deliberative -excogitative -thoughtless -inconsiderate -unreflective -thrifty -economical -saving -wasteful -extravagant -uneconomical -tidy -neat -neat -ruly -shipshape -straight -uncluttered -untidy -blowsy -cluttered -disheveled -disorderly -frowsy -messy -scraggly -sloppy -slouchy -sprawling -unkempt -groomed -brushed -kempt -plastered -pomaded -sleek -ungroomed -bushy -unbrushed -combed -uncombed -uncombable -unkempt -timbered -untimbered -toned -toneless -tongued -tonguelike -tongueless -tipped -untipped -tired -aweary -bleary -bored -careworn -drooping -exhausted -footsore -jaded -knackered -ragged -unrefreshed -whacked -rested -fresh -untired -tolerable -bearable -tolerant -intolerable -bitter -impossible -unsupportable -tolerant -unbigoted -intolerant -bigoted -rigid -tonal -keyed -diatonic -polytonal -toned -tonic -atonal -toothed -cogged -toothlike -toothy -tusked -toothless -edental -edentulous -top -apical -crowning -topmost -upper -bottom -bottommost -inferior -nether -side -broadside -lateral -topped -lidded -topless -lidless -bottomed -bottomless -equatorial -pantropical -tropical -polar -circumpolar -testate -intestate -touched -brushed -grazed -untouched -tough -cartilaginous -chewy -coriaceous -fibrous -hempen -tender -chewable -crisp -flaky -tenderized -tough -calloused -enured -tender -delicate -tough -tender -protective -sentimental -toxic -cyanogenetic -deadly -hepatotoxic -nephrotoxic -ototoxic -poisonous -nontoxic -antitoxic -nonpoisonous -nonvenomous -tractable -ductile -docile -tamable -intractable -balking -refractory -uncontrollable -unmalleable -traceable -untraceable -tracked -trackless -traveled -untraveled -untraversed -trimmed -clipped -untrimmed -unclipped -troubled -annoyed -anxious -buffeted -careful -clouded -disquieted -distressed -fraught -haunted -mothy -stressed -struggling -suffering -troublous -untroubled -carefree -clear -dreamless -unconcerned -undisturbed -unmolested -true -actual -apodictic -truthful -sure -false -mendacious -specious -untrue -trustful -confiding -unsuspecting -distrustful -cynical -doubting -jealous -leery -misogynic -oversuspicious -trustworthy -authentic -creditworthy -dependable -fiducial -sure -untrustworthy -devious -slippery -tubed -tubeless -tucked -untucked -turned -inverted -overturned -reversed -rotated -unturned -typical -emblematic -representative -regular -true -atypical -unrepresentative -underhand -overhand -surface -aboveground -opencast -subsurface -belowground -submarine -submerged -subterranean -overhead -submersible -nonsubmersible -tearful -liquid -teary -sniffly -weepy -tearless -dry -union -closed -organized -nonunion -open -unorganized -uniparous -multiparous -biparous -unipolar -bipolar -united -agreed -allied -amalgamate -coalescent -cohesive -conjugate -conjunct -federate -incorporate -one -suprasegmental -tied -undivided -unpartitioned -unsegmented -divided -bicameral -bifid -bifurcate -bifurcated -bilocular -chambered -cloven -dichotomous -disconnected -disjointed -disjunct -episodic -metameric -mullioned -pentamerous -pronged -sectional -segmental -torn -trifid -adnate -connate -univalve -bivalve -lamellibranch -ascending -acclivitous -ascendant -assurgent -assurgent -scandent -highflying -up -descending -declivitous -degressive -descendant -down -drizzling -dropping -raining -rising -improving -falling -down -soft -climactic -anticlimactic -upmarket -upscale -downmarket -downscale -transitive -intransitive -translatable -untranslatable -ungulate -unguiculate -clawed -clawlike -up -ahead -aweigh -dormie -heavenward -risen -sprouted -upbound -upfield -upward -down -behind -downbound -downcast -downfield -downward -fallen -set -thrown -weak -upstage -downstage -upstairs -downstairs -upstream -downstream -uptown -downtown -used -utilized -misused -abused -exploited -useful -multipurpose -reclaimable -serviceable -useable -utilitarian -utilizable -useless -futile -inutile -unserviceable -utopian -airy -dystopian -valid -binding -legal -legitimate -reasoned -validated -invalid -bad -fallacious -false -invalidated -null -sophistic -valuable -invaluable -precious -rich -semiprecious -worth -worthless -chaffy -manky -negligible -nugatory -otiose -rubbishy -tinpot -valueless -variable -changeable -covariant -multivariate -protean -shifting -variant -versatile -invariable -changeless -invariant -varied -omnifarious -varicolored -variform -varying -versatile -unvaried -veiled -unveiled -disclosed -undraped -ventilated -aired -louvered -vented -unventilated -airless -fuggy -unaerated -unvented -vertebrate -invertebrate -violable -inviolable -unassailable -violent -convulsive -ferocious -hot -lashing -lurid -rampageous -ruffianly -nonviolent -passive -virtuous -impeccable -impeccant -wicked -evil -heavy -flagitious -iniquitous -irreclaimable -nefarious -peccable -visible -circumpolar -ocular -macroscopic -megascopic -microscopic -subgross -panoptic -telescopic -viewable -invisible -camouflaged -concealed -infrared -lightless -nonvisual -occult -ultraviolet -undetectable -unseeyn -viviparous -oviparous -broody -ovoviviparous -volatile -evaporable -nonvolatile -voluntary -willful -freewill -uncoerced -unpaid -involuntary -driven -forced -unconscious -unwilled -unwilling -voluntary -involuntary -automatic -autonomic -vegetative -vulnerable -assailable -compromising -defenseless -endangered -indefensible -insecure -penetrable -threatened -unguarded -invulnerable -airtight -bombproof -defendable -entrenched -impregnable -tight -sheltered -untouchable -wanted -craved -hot -sought -unwanted -abdicable -friendless -outcaste -unclaimed -undesired -unwelcome -warm -lukewarm -warmed -warming -cool -caller -precooled -warm -cordial -hearty -cool -unresponsive -warm -hot -cool -cold -homoiothermic -poikilothermic -warmhearted -coldhearted -brittle -washable -nonwashable -waxed -unwaxed -waxing -waning -increasing -accelerative -accretionary -accretive -augmentative -incorporative -maximizing -multiplicative -progressive -raising -decreasing -depreciating -detractive -diminishing -dwindling -falling -increasing -accelerando -crescendo -decreasing -allargando -calando -decrescendo -rallentando -inflationary -deflationary -weaned -unweaned -wearable -unwearable -weedy -weedless -welcome -unwelcome -uninvited -well -asymptomatic -cured -ill -afflicted -aguish -ailing -airsick -autistic -bedfast -bilious -bronchitic -consumptive -convalescent -delirious -diabetic -dizzy -dyspeptic -faint -feverish -funny -gouty -green -nauseated -palsied -paralytic -paraplegic -rickety -scrofulous -sneezy -spastic -tubercular -unhealed -upset -wet -bedewed -besprent -boggy -clammy -damp -sodden -drippy -humid -misty -muggy -reeking -rheumy -sloppy -showery -steaming -sticky -tacky -undried -washed -watery -dry -adust -arid -desiccated -dried -rainless -semiarid -thirsty -wet -fresh -dry -milkless -wet -dry -wet -dry -hydrous -anhydrous -wheeled -wheelless -clerical -professional -industrial -manual -wholesome -alimentary -healthy -hearty -organic -salubrious -unwholesome -insalubrious -insubstantial -morbid -nauseating -rich -wide -beamy -deep -fanlike -sweeping -narrow -constricting -narrowed -slender -strait -straplike -tapered -wide -comfortable -narrow -bare -wieldy -unwieldy -awkward -cumbersome -wigged -peruked -toupeed -wigless -willing -consenting -disposed -glad -ready -volitional -unwilling -grudging -loath -unintentional -winged -alar -alate -batwing -brachypterous -pinioned -volant -winglike -wingless -apterous -flightless -wired -bugged -connected -wireless -wise -perspicacious -owlish -sapiential -sage -foolish -absurd -asinine -cockamamie -fond -harebrained -rattlebrained -unwise -wooded -arboraceous -bosky -braky -forested -jungly -overgrown -rushy -scrabbly -sylvan -timbered -woodsy -unwooded -unforested -untimbered -woody -ashen -beechen -birch -cedarn -ligneous -oaken -suffrutescent -wooden -nonwoody -herbaceous -pulpy -worldly -economic -material -materialistic -mundane -unworldly -anchoritic -cloistered -spiritual -unmercenary -woven -braided -unwoven -felted -knitted -worn -aged -attrited -battered -creaky -eroded -frayed -mangy -ragged -raddled -scruffy -shopworn -tattered -threadbare -thumbed -vermiculate -waterworn -new -unweathered -worthy -applaudable -creditable -deserving -exemplary -meritorious -noteworthy -quotable -sacred -valued -valuable -worthwhile -unworthy -undeserving -unmerited -unmeritorious -xeric -xerophytic -hydric -hydrophytic -hygrophytic -mesic -mesophytic -zonal -azonal -azonic -acrocarpous -pleurocarpous -cursorial -fossorial -homocercal -heterocercal -webbed -palmate -unwebbed -faceted -unfaceted -ipsilateral -contralateral -salient -proactive -retroactive -categorematic -autosemantic -syncategorematic -synsemantic -idiographic -nomothetic -baptized -unbaptized -benign -malignant -cancerous -calcicolous -calcifugous -invertible -immunocompetent -immunodeficient -allogeneic -xenogeneic -shelled -unshelled -jawed -jawless -skinned -skinless -flowering -flowerless -vegetal -asphaltic -abasic -abbatial -abdominovesical -Aberdonian -Abkhaz -Abnaki -Aboriginal -abient -abiogenetic -academic -acanthotic -acapnic -acervate -acetonic -acetylenic -acetylic -Achaean -Aeolian -achenial -achlorhydric -achondritic -aciculate -acidimetric -acidotic -acinar -acinar -acneiform -adolescent -acrogenic -actinometric -actinomycetal -actinomycotic -aculeate -adactylous -adamantine -adenocarcinomatous -adenoid -adenoidal -adient -adjudicative -adnexal -Adonic -adrenal -adrenal -adrenergic -agnostic -Aleutian -ancestral -antheridial -antiadrenergic -antiapartheid -antidotal -antiferromagnetic -antipollution -antisatellite -antiviral -adrenocortical -advective -adventitial -adventuristic -aecial -Aeolian -aeriferous -aerological -aerolitic -aeromechanic -aeromedical -aeronautical -aesculapian -affine -affixal -agential -agonal -agonistic -agranulocytic -agraphic -agrobiologic -agrologic -agronomic -agrypnotic -alabaster -Alaskan -Albigensian -Albanian -albinal -albitic -albuminous -albuminuric -alchemic -alchemistic -aldehydic -aleuronic -algoid -algolagnic -algometric -Algonquian -alimentative -alkahestic -alkaloidal -alkalotic -alkylic -allantoic -allelic -allergenic -allergic -Allied -Allied -allogamous -allographic -allomerous -allometric -allomorphic -allophonic -allotropic -allylic -alopecic -alphabetic -analphabetic -alphanumeric -Altaic -altitudinal -alular -aluminous -alveolar -alveolar -amalgamative -amaranthine -amaurotic -amblyopic -Ambrosian -ambulacral -ambulatory -ameboid -amenorrheic -amethystine -Amharic -amino -amitotic -ammino -ammoniac -ammonitic -amnestic -amniotic -amoristic -amphitheatric -amphoric -ampullar -amygdaline -amylolytic -anabiotic -anabolic -anaclitic -anacoluthic -anaglyphic -anagogic -anagrammatic -anal -analytic -anamnestic -anamorphic -anamorphic -anaphasic -anaplastic -anarchistic -anasarcous -anastigmatic -Andalusian -androgenetic -androgenic -androgynous -anemographic -anemometric -anencephalic -anestrous -anginal -angiocarpic -angiomatous -angiospermous -Anglophilic -Anglophobic -anguine -anicteric -animalistic -animatistic -animist -aniseikonic -anisogamic -anisogametic -anisometropic -ankylotic -annalistic -Bayesian -Arminian -Armenian -Biedermeier -annelid -annexational -hermeneutic -annunciatory -alliaceous -anodic -cathodic -anoperineal -anopheline -anorectal -anorthitic -anosmic -anoxemic -anoxic -anserine -antecubital -antennal -anthracitic -anthropic -anthropogenetic -anthropometric -anthropophagous -antibiotic -anticancer -anticlimactic -anticoagulative -anticyclonic -antigenic -antimonic -antinomian -antiphonary -antipodal -antistrophic -antitypic -anuran -anuretic -anxiolytic -aoristic -aortal -aphaeretic -aphakic -aphanitic -aphasic -aphetic -apian -apiarian -apicultural -aplitic -apneic -apocalyptic -Apocryphal -apocynaceous -apogamic -apogean -apomictic -aponeurotic -apophatic -apophyseal -apoplectic -apoplectiform -aposiopetic -apostrophic -apothecial -apothegmatic -Appalachian -appellative -appendicular -appointive -appositional -appropriative -apsidal -aptitudinal -aqueous -aquatic -aquiferous -arachnoid -Aramaic -Aramean -araneidal -Arawakan -arbitral -arbitrative -arborical -archaeological -archaistic -archangelic -arched -archdiocesan -archducal -archegonial -archesporial -archidiaconal -archiepiscopal -archipelagic -archival -archosaurian -areal -arenicolous -areolar -argentic -argentous -armillary -aroid -aromatic -arsenical -arsenious -arterial -venous -arteriovenous -arthralgic -arthromeric -arthropodal -arthrosporic -Arthurian -articular -articulatory -artiodactyl -arundinaceous -ascensional -ascetic -ascitic -asclepiadaceous -ascocarpous -ascosporic -associational -asteriated -asterismal -stoloniferous -stomatal -stomatal -astomatal -astragalar -astrocytic -astronautic -astronomic -asynergic -ataxic -atherosclerotic -atonalistic -atonic -atrial -atrioventricular -attentional -attitudinal -attritional -audiometric -audiovisual -augitic -aural -aural -auricular -auricular -autoimmune -biauricular -auroral -auroral -aurous -auscultatory -austenitic -Australasian -australopithecine -autacoidal -autarchic -authorial -autobiographical -autobiographical -autocatalytic -autogenetic -autographic -autolytic -autoplastic -autoradiographic -autotelic -autotomic -autotrophic -heterotrophic -autotypic -auxetic -auxinic -axiomatic -axiomatic -avellan -avian -avifaunal -avionic -avitaminotic -avocational -avuncular -avuncular -axial -axile -axillary -axiological -axonal -Azerbaijani -azido -azimuthal -azo -diazo -zoic -azotemic -baboonish -Babylonian -baccate -bacchantic -bacillar -bacteremic -bacteriolytic -bacteriophagic -bacteriostatic -bacteroidal -Bahai -balletic -ballistic -balsamic -baric -barographic -barometric -barytic -basaltic -basidial -basidiomycetous -basidiosporous -basilar -basilican -basinal -batholithic -bathymetric -bauxitic -behavioristic -Belarusian -belemnitic -benedictory -beneficiary -benevolent -benthic -bentonitic -benzenoid -benzoic -benzylic -betulaceous -biaxial -bibliographic -bibliolatrous -bibliomaniacal -bibliophilic -bibliopolic -bibliothecal -bibliotic -bicapsular -bichromated -bicipital -bignoniaceous -biliary -bilious -billiard -bimetallistic -bimillenial -binary -biocatalytic -biochemical -bioclimatic -biogenetic -biogenous -biogenic -biogeographic -biological -biologistic -sociobiologic -neurobiological -bionic -biosynthetic -biosystematic -biotitic -biotypic -blastogenetic -bodily -Bohemian -bolographic -bolometric -Boolean -borated -boronic -boskopoid -botanic -botryoid -Botswanan -boustrophedonic -brachial -brachiopod -brachyurous -bracteal -bracteate -bracteolate -brahminic -branchial -branchiopod -brassy -bregmatic -brimless -brisant -broadband -broadband -Brobdingnagian -bromic -bromidic -buccal -bulimic -burrlike -bursal -buteonine -butyraceous -butyric -cachectic -cacodemonic -cacodylic -cadastral -cadaverous -caducean -caecilian -caesural -caffeinic -cairned -calcaneal -calcareous -calceolate -calcic -calciferous -calcitic -calculous -calendric -calico -calisthenic -callithumpian -caloric -noncaloric -calorimetric -calyceal -calycular -calyculate -calyptrate -calyptrate -cambial -campanulate -camphoraceous -camphoric -canalicular -cancroid -canicular -canicular -canine -canine -capacitive -Capetian -capitular -Cappadocian -caprine -capsular -capsular -carangid -carbocyclic -carbolated -carbonyl -carboxyl -carcinogenic -carcinomatous -cardiographic -cardiopulmonary -carinal -carnivorous -Caroline -Carolingian -carotid -carpellary -carpetbag -carposporic -carposporous -cartilaginous -cartographic -Carthusian -caruncular -carunculate -caryophyllaceous -catabolic -catachrestic -catalatic -cataphatic -cataplastic -catapultic -catarrhal -categorial -categorical -cathectic -cathedral -catkinate -catoptric -cecal -celebratory -celestial -celestial -cellular -extracellular -integral -integumentary -intercellular -intracellular -cellulosid -cementitious -cenobitic -eremitic -cenogenetic -Cenozoic -palingenetic -censorial -centesimal -centigrade -centralist -centroidal -centrosomic -cephalopod -cercarial -cereal -cerebellar -cerebral -cerebrospinal -cerebrovascular -cervical -ceric -cerous -ceruminous -cervine -cetacean -chaetal -chaetognathan -chaffy -Chaldean -chalybeate -chancroidal -chancrous -chaotic -charitable -chartaceous -chauvinistic -Chechen -chelate -cheliferous -chelate -cheliceral -chelicerous -chelonian -chemical -photochemical -chemical -physicochemical -chemiluminescent -chemoreceptive -chemotherapeutic -cherty -Chian -chiasmal -childbearing -chimeric -Chippendale -chirpy -chitinous -chlamydial -chlorophyllose -chlorotic -choleraic -choragic -chordal -chordate -Christological -chromatinic -Churchillian -Wilsonian -achromatinic -cinematic -civil -civil -civic -municipal -clamatorial -cleistogamous -clerical -clerical -classical -clonal -cloze -coastal -coccal -coccygeal -collagenous -collarless -collegiate -collegial -colonial -colonial -colonic -colorectal -colorimetric -commensal -communal -composite -conceptualistic -concretistic -condylar -configurational -confrontational -congregational -conjunctival -consonantal -constitutional -consubstantial -contractual -cosmic -cosmologic -cosmologic -cordless -coreferential -cormous -corneal -Cornish -correlational -corymbose -corinthian -costal -intercostal -intertidal -covalent -croupy -crural -crustal -crustaceous -crustaceous -crustose -cryogenic -cryonic -cryptanalytic -cryptogamic -cryptobiotic -ctenoid -cubital -cucurbitaceous -culinary -cuneiform -cupric -curricular -cyclic -cytoarchitectural -cytolytic -cytophotometric -cytoplasmic -cytoplastic -bicylindrical -cystic -cystic -cytogenetic -cytokinetic -cytological -cytotoxic -czarist -deductive -deliverable -Democratic -Demotic -denominational -denominational -dental -dental -despotic -diagonalizable -diamagnetic -diamantine -diametral -diaphoretic -diastolic -dicarboxylic -Dickensian -dictatorial -differentiable -differential -digital -digital -dimorphic -Dionysian -diplomatic -dipterous -directional -omnidirectional -directional -discomycetous -distributional -dithyrambic -dramatic -drupaceous -dumpy -dural -dynastic -dysgenic -dysplastic -Ephesian -Eucharistic -eugenic -Eurocentric -eutrophic -Ebionite -ebracteate -economic -economic -socioeconomic -ectopic -editorial -editorial -electoral -electrocardiographic -electrochemical -electroencephalographic -electrolytic -electrolytic -electromechanical -electromotive -electronic -electronic -electrophoretic -electrostatic -elegiac -elemental -elemental -elementary -elfin -empyrean -emulous -eonian -epenthetic -epidural -epigastric -epigastric -epilithic -episcopal -equestrian -equestrian -equine -equine -equinoctial -equinoctial -ergonomic -ergotic -ergotropic -eruptive -erythematous -erythroid -erythropoietic -eschatological -esophageal -Essene -essential -Estonian -estrogenic -estuarine -ethical -evidentiary -excrescent -excretory -exegetic -exilic -existential -existential -existentialist -extropic -facial -factorial -facultative -Fahrenheit -fanged -federal -femoral -fenestral -fenestral -fermentable -ferric -feudal -febrile -afebrile -fibrillose -fibrinous -fibrocartilaginous -fictile -fictional -nonfictional -filar -bifilar -unifilar -filarial -filariid -fisheye -fishy -fistulous -flaky -fleshy -flinty -floricultural -flowery -fluvial -foliate -foliaceous -forcipate -formalistic -formic -formic -formulary -fossil -fossiliferous -fourhanded -Frankish -fraternal -fretted -unfretted -frictional -frictionless -Frisian -Galilean -Galilean -Gallican -garlicky -gastric -gastroduodenal -gastroesophageal -pneumogastric -gemmiferous -generational -generic -genetic -genetic -genic -genial -mental -gentile -geometric -geophytic -geostrategic -geothermal -gingival -glabellar -glacial -glial -gluteal -glycogenic -granuliferous -granulomatous -grapelike -graphic -graphic -gravitational -grubby -guttural -harmonic -nonharmonic -harmonic -harmonic -Hasidic -Hawaiian -heathlike -Hebridean -heliacal -hematopoietic -hemodynamic -hemispherical -hemorrhagic -hepatic -heroic -heterodyne -heterosporous -Hollywood -homeostatic -homonymic -homosporous -homostylous -hexadecimal -hexangular -hidrotic -hieratic -hieroglyphic -hieroglyphic -hircine -home -hooflike -horary -human -human -humanist -humanistic -humanist -humic -humified -hyaloplasmic -hydrocephalic -hydrographic -hydrolyzable -hydroxy -hymenopterous -hypnotic -ideal -ideographic -ideological -idiopathic -immune -immunochemical -immunocompromised -immunological -immunosuppressed -immunosuppressive -immunotherapeutic -imperial -imperial -imperial -impetiginous -impressionist -impressionistic -Incan -incendiary -incestuous -incestuous -inductive -indusial -industrial -inertial -infantile -inferential -informational -inguinal -inhalant -inscriptive -insecticidal -institutional -interlinear -intracerebral -intracranial -intraventricular -intervertebral -insular -intuitionist -ionic -Ionic -Ionic -Ionian -nonionic -iridaceous -iritic -ischemic -isentropic -Ismaili -isthmian -Jamesian -Jamesian -Jeffersonian -jihadi -jittery -judicial -judicial -jumentous -Jurassic -juridical -jurisprudential -leaden -legal -legal -labial -labial -lactogenic -lathery -leguminous -leonine -Levitical -lexicalized -liliaceous -limacine -limnological -living -lobeliaceous -local -logogrammatic -loopy -lucifugous -lunar -sublunar -translunar -lunisolar -lupine -luteal -macaronic -macroeconomic -Mandaean -mandibulate -Manichaean -manual -Maoist -maternal -matutinal -paternal -patriarchal -mealy -mecopterous -medical -biomedical -premedical -medicolegal -medullary -medullary -medullary -medusoid -meningeal -menopausal -Merovingian -Prakritic -Procrustean -provencal -prejudicial -premenopausal -presocratic -postdiluvian -postdoctoral -postexilic -postglacial -postmenopausal -postpositive -pouched -pteridological -meiotic -mercuric -meretricious -meridional -metrological -micaceous -microeconomic -military -paramilitary -minimalist -ministerial -ministerial -minty -Mishnaic -omissive -miotic -missionary -monocarboxylic -monoclonal -Monophysite -monotypic -moraceous -morbilliform -motivational -mousy -myalgic -myelinated -unmyelinated -myopathic -narcoleptic -nasopharyngeal -natal -natal -natriuretic -naval -Nazarene -Nazarene -neonatal -neoplastic -neotenic -Nestorian -Noachian -nominal -nominal -nominalistic -nominative -nosocomial -numeral -numerological -Numidian -numinous -oleaceous -olfactory -oligarchic -oneiric -onomastic -oral -oropharyngeal -Orphic -Orwellian -pachydermatous -packable -palatoglossal -paleontological -Palladian -palmar -palpatory -palpebrate -panicled -papilliform -paradigmatic -paramedical -paranasal -parhelic -parliamentary -parous -parotid -paroxysmal -paschal -passerine -nonpasserine -Pauline -peacekeeping -peaty -perigonal -perithelial -monetary -pedal -pectineal -pemphigous -petaloid -phagocytic -phalangeal -Pharaonic -Phoenician -phonogramic -phonological -photomechanical -photometric -photosynthetic -nonphotosynthetic -phreatic -phrenological -pictographic -plagioclastic -pilar -pilosebaceous -planetal -planktonic -planographic -plantar -interplanetary -penal -penumbral -physical -planetary -extraterrestrial -Platonistic -Platonic -pleomorphic -plumbaginaceous -plumbic -plutocratic -polarographic -polemoniaceous -polydactyl -polyhedral -polymeric -pompous -popliteal -positionable -positional -positivist -pragmatic -prandial -preanal -preclinical -precancerous -precordial -predestinarian -prelapsarian -premenstrual -presentational -pressor -prodromal -professorial -prolusory -propagative -prostate -prosthetic -prosthetic -prosthodontic -proteinaceous -provincial -pubertal -pupillary -Puranic -putrid -rabid -radiological -radiotelephonic -rationalistic -ratty -realistic -recoilless -recombinant -recreational -refractive -republican -resinlike -revenant -Rhodesian -Romansh -romantic -ropy -royal -royal -ruminant -nonruminant -agricultural -aquicultural -rural -Ruritanian -Sabine -saccadic -sacculated -sadomasochistic -Sadducean -Saharan -sapiens -sarcolemmic -sartorial -sartorial -scalene -scalene -scapular -scapulohumeral -scenic -scholastic -scholastic -scientific -sclerotic -sclerotic -scurfy -Scythian -secular -secretarial -secretory -sectarian -sectorial -self -semiautobiographical -seminal -seminiferous -semiotic -semiparasitic -senatorial -sensational -sepaloid -septal -sepulchral -serial -serial -sidereal -Sikh -siliceous -Siouan -Sisyphean -social -social -solar -sociopathic -solanaceous -Solomonic -somatosensory -soteriological -squinty -specialistic -spectral -spectrographic -spermicidal -spermous -spherical -nonspherical -sphingine -splashy -splenic -splintery -sporogenous -sportive -sporting -spousal -stagflationary -stainable -Stalinist -stannic -staphylococcal -statutory -stellar -interstellar -stemmatic -stenographic -steroidal -nonsteroidal -stoichiometric -stovepiped -subarctic -subcortical -subdural -sublingual -suburban -suctorial -Sufi -sulfurous -Sumerian -superficial -suppurative -nonsuppurative -supraorbital -surficial -sustainable -sustentacular -syllabic -syllabic -symbolic -symbolic -symptomatic -syncretic -syncretic -synesthetic -synoptic -synovial -syntagmatic -tangential -Tasmanian -taurine -technical -technophilic -technophobic -technical -telemetered -tellurian -semiterrestrial -telluric -temperamental -temporal -temporal -spatiotemporal -tendinous -tensile -tensional -tentacular -tentacled -teratogenic -terminal -terminal -territorial -testaceous -testamentary -testimonial -testimonial -theatrical -Theban -Theban -thematic -unthematic -thematic -thenal -thermal -thermal -nonthermal -thermoelectric -threaded -tibial -tidal -tiered -Timorese -tinny -titular -titular -titular -titular -tonic -tonic -clonic -topical -topological -toroidal -torrential -tortious -totalitarian -totipotent -tubercular -tubercular -tubercular -tuberculate -tuberculoid -turbinate -umbelliform -umbelliferous -uncial -Uniate -unicellular -uniovular -unitary -unitary -unpigmented -urban -urceolate -urethral -urogenital -usufructuary -uveal -vacuolate -vagal -valedictory -apopemptic -valent -valetudinarian -valved -vanilla -variolar -Vedic -ventilatory -ventricular -verbal -verbal -vertical -viatical -vibrational -vicarial -vicennial -vigesimal -virginal -vitreous -vitreous -vocal -vocal -instrumental -vocalic -volcanic -atheist -electrical -electric -voltaic -photoconductive -photoemissive -photovoltaic -photoelectric -hydroelectric -hydrostatic -hydrokinetic -interlocutory -interstitial -isomeric -isometric -isomorphous -isotonic -lapidary -legislative -legislative -leprous -lingual -Linnaean -longitudinal -literary -critical -lithic -lithic -lymphatic -lymphocytic -lymphoid -lysogenic -lysogenic -magisterial -atmospheric -amphibious -insectan -mammalian -piscine -reptilian -algal -fungal -fungicidal -fungoid -infectious -plantal -vegetative -bacterial -parasitic -antibacterial -cyanobacterial -moneran -triangulate -quadrangular -tetragonal -tetrametric -pentangular -octangular -neoclassicist -expressionist -postmodernist -revolutionary -residual -relativistic -relativistic -raptorial -radical -radial -radial -radial -ulnar -radiographic -birefringent -bisectional -bismuthal -bismuthic -bisontine -bistered -bistroic -polar -bipolar -bipolar -transpolar -photographic -photic -pneumatic -pneumococcal -phallic -feminist -professional -professional -vulpine -wolflike -vulvar -clitoral -vocational -ungual -succinic -umbilical -spatial -nonspatial -sigmoid -sigmoid -sciatic -sciatic -semantic -bovine -crinoid -linguistic -nonlinguistic -intralinguistic -sociolinguistic -linguistic -bridal -bridal -cardiac -caudal -Caucasian -cephalic -cranial -craniometric -comatose -conic -corinthian -corvine -ciliary -ciliary -ciliary -counterinsurgent -counterrevolutionary -counterterror -cyprinid -dietary -diluvian -antediluvian -dominical -dominical -Donatist -Dorian -doric -floral -floral -fiscal -nonfinancial -fiducial -fiduciary -funicular -lactic -lacteal -galactic -extragalactic -intergalactic -gnomic -Gnostic -gymnastic -gyral -alvine -epistemic -hemal -hemic -hemiparasitic -haemophilic -humoral -chylaceous -chylific -chyliferous -iconic -ichorous -icosahedral -icterogenic -ictal -igneous -iridic -iridic -jugular -marital -resinated -sulphuretted -mastoid -mastoid -phocine -saurian -stearic -vinous -tegular -dyadic -algebraic -biblical -biblical -postbiblical -Koranic -polymorphic -polymorphous -polyphonic -contrapuntal -polyphonic -lyric -lyric -perianal -pericardial -perineal -peroneal -poetic -poetic -political -political -phonetic -phonetic -phonemic -philosophic -Rousseauan -personal -personal -intensive -infernal -litigious -acronymic -apostolic -phenomenal -eudemonic -eukaryotic -prokaryotic -pectoral -pastoral -particularistic -parturient -patellar -pathological -palatine -palatine -pictorial -optical -objective -possessive -nuclear -nuclear -nucleated -visceral -narcotic -mystic -mystic -carbonaceous -Melanesian -melodic -monumental -modal -modal -millenary -millennial -millenarian -metropolitan -meteoric -meteorologic -metaphysical -metastable -meridian -mercurial -Mercurial -Mercurial -Mesoamerican -mesoblastic -Mesozoic -messianic -muciferous -mucosal -murine -musical -musicological -exteroceptive -proprioceptive -interoceptive -perceptive -acoustic -auditory -gustatory -haptic -ocellated -octal -ocular -ocular -orbital -suborbital -kinesthetic -angelic -seraphic -ethereal -firmamental -elysian -diocesan -eparchial -parochial -regional -vicinal -conjugal -binocular -cultural -cultural -sociocultural -multicultural -transcultural -transactinide -transcendental -transuranic -burlesque -vascular -avascular -cardiovascular -choral -choric -chorionic -communist -Marxist -Bolshevik -cutaneous -dermal -cuticular -ectodermal -encysted -endermic -endogenous -hypodermal -hypodermic -hypoglycemic -hypovolemic -intradermal -facial -mandibular -mandibulofacial -maxillary -maxillodental -maxillofacial -maxillomandibular -interfacial -lacrimal -lacrimal -lacrimatory -menstrual -mural -extralinguistic -papal -Peloponnesian -pubic -viral -grammatical -syntactic -glossopharyngeal -glottal -glottochronological -lexicostatistic -focal -genital -genitourinary -feline -laryngeal -laryngopharyngeal -zygotic -uninucleate -multinucleate -muscular -musculoskeletal -intramuscular -neuroendocrine -neurogenic -neuroglial -neuromatous -neuromuscular -nephritic -nephritic -neurotoxic -neurotropic -parental -filial -spinal -atomic -monatomic -diatomic -polyatomic -subatomic -clinical -subclinical -postal -continental -Continental -continental -lexical -nonlexical -lexical -psychosexual -sexagesimal -sexual -coital -marine -marine -multilevel -multiphase -littoral -sublittoral -surgical -nonsurgical -ophthalmic -ophthalmic -physiotherapeutic -nautical -thalassic -oceanic -transoceanic -ursine -intravenous -montane -mechanical -mechanical -zoological -zoological -protozoological -protozoal -rental -rental -rickettsial -ritual -ritual -fetal -juvenile -herbal -doctoral -pediatric -kinetic -mammary -neural -sensorineural -sensorimotor -occupational -pelvic -frontal -bucolic -Masonic -masonic -Masoretic -masted -migrational -mnemonic -parietal -statuary -tubal -velar -documentary -iambic -structural -structural -anatomic -anatomic -architectural -tectonic -organizational -cogitative -cognitive -mental -cultural -factual -achondroplastic -ateleiotic -ecclesiastical -priestly -sacerdotal -molar -molar -molal -molar -molecular -bimolecular -intramolecular -intermolecular -macerative -macrencephalic -macrocephalic -microcephalic -microelectronic -macromolecular -isotopic -isothermic -microcosmic -micrometeoric -micropylar -macrocosmic -mucinous -mucinoid -mucocutaneous -mucopurulent -mucous -mucoid -colloidal -administrative -managerial -supervisory -nervous -latinate -latitudinal -Florentine -earthen -earthy -monometallic -brazen -geological -psychological -psychogenetic -psychogenetic -sociological -demographic -ecological -ecological -theological -anthropological -paleoanthropological -computational -athletic -astrophysical -geopolitical -thermodynamic -geophysical -seismological -peptic -duodenal -neuropsychological -neurophysiological -navigational -differential -deconstructionist -rationalist -calligraphic -lexicographic -orthographic -telegraphic -typographic -astrological -syllogistic -necromantic -lithomantic -mechanistic -chiromantic -parametric -nonparametric -statistical -nihilistic -spiritualistic -supernaturalist -operationalist -operatic -trigonometric -pharmacological -toxicological -psychiatric -oncological -psychoanalytical -psychometric -psychomotor -psychotherapeutic -therapeutic -neuroanatomic -virological -bacteriological -cardiologic -endocrine -enolic -exocrine -endodontic -endoparasitic -orthodontic -periodontic -dermatologic -exodontic -geriatric -geriatric -gynecological -gymnosophical -gymnospermous -hematologic -obstetric -neurological -spectrometric -spectroscopic -microscopic -insurrectional -conspiratorial -domestic -econometric -criminological -classicistic -historical -ahistorical -ontological -pietistic -fascist -Catholic -Roman -Roman -Roman -Roman -Jewish -Judaic -evangelical -evangelical -evangelistic -Muslim -Hindu -Hmong -Buddhist -sculptural -evaporative -Confucian -Shinto -Kokka -Shuha -Rastafarian -Jain -Taoist -Taoist -textual -Tantric -magnetic -electromagnetic -Avestan -Zoroastrian -capillary -automotive -horticultural -cervical -American -American -Indian -Indian -asymptotic -subtropical -tropical -equatorial -equatorial -rational -irrational -anionic -cationic -Satanic -angular -rabbinical -arteriosclerotic -idolatrous -sacramental -theist -deist -pantheist -nocturnal -mensural -mensural -mensal -epicarpal -epithelial -epitheliod -pancreatic -ovarian -ovine -ovular -ovular -uterine -intrauterine -testicular -rectal -rectosigmoid -monozygotic -dizygotic -synaptic -dendritic -iliac -lobar -lobate -abdominal -hormonal -hemispheric -occipital -pneumonic -pneumonic -intrapulmonary -intestinal -skeletal -skinny -adjectival -adverbial -morphemic -bimorphemic -monomorphemic -polymorphemic -morphophonemic -clausal -phrasal -infinitival -pronominal -indexical -indexless -cruciferous -mathematical -choreographic -runic -scriptural -pentatonic -anaphoric -anapestic -rhetorical -tectonic -riparian -Martian -actuarial -psycholinguistic -robotic -rotatory -epicyclic -expansionist -experimental -expiatory -familial -etiological -etiological -exuvial -behavioral -African -phenotypical -genotypical -ontogenetic -phylogenetic -environmental -environmental -methodological -sectional -trabecular -tracheal -tractive -transdermal -transitional -traumatic -trophic -tympanic -tympanic -tympanitic -perceptual -libidinal -epileptic -developmental -pedagogical -educational -prehistoric -Atlantic -Pacific -transatlantic -synergistic -monistic -dualistic -pluralistic -pleural -hilar -labyrinthine -lobular -interlobular -intralobular -anastomotic -bronchial -arteriolar -bronchiolar -rhombic -trapezoidal -physiological -morphologic -geomorphologic -morphologic -occlusive -ohmic -mortuary -mortuary -funerary -strategic -tactical -cinerary -circulatory -veinal -circulative -euphonic -metamorphic -sedimentary -Christian -Protestant -universalistic -Calvinist -fundamentalist -Orthodox -Orthodox -radio -dipolar -deformational -totemic -Anglican -Baptistic -Congregational -Episcopal -revivalistic -Lutheran -Methodist -Mormon -Unitarian -orchestral -orchestrated -communicative -autosomal -chromatic -chromosomal -chronological -Italian -Russian -German -Celtic -Britannic -Teutonic -French -Spanish -Iberian -Lusitanian -Portuguese -Sicilian -Soviet -Finnish -Swedish -Norwegian -Scandinavian -Danish -Belgian -Dutch -Luxembourgian -Swiss -Austrian -Polish -Polynesian -Hungarian -Czech -Yugoslavian -Romanian -Baltic -Baltic -Latvian -Lithuanian -Moldovan -Kyrgyzstani -Tajikistani -Turkmen -Ukrainian -Uzbekistani -Serbian -Croatian -Slovenian -Slovakian -Bosnian -Chinese -Sinitic -Japanese -exponential -paradigmatic -paradigmatic -Tibetan -Himalayan -Chilean -Peruvian -Ecuadorian -Panamanian -Venezuelan -Brazilian -Argentine -Paraguayan -Uruguayan -Bolivian -Colombian -Korean -European -Asian -Cambodian -Manchurian -Honduran -Salvadoran -Cuban -Bavarian -Byzantine -Byzantine -Ottoman -Seljuk -Neapolitan -Milanese -Tuscan -Venetian -Tyrolean -Viennese -Glaswegian -Egyptian -Hindustani -Nepalese -Indonesian -Alsatian -Athenian -Spartan -Thracian -Israeli -Genoese -tragic -comic -tragicomic -abyssal -neritic -baroque -bathyal -hadal -operculate -Palestinian -infernal -cortical -metabolic -metastatic -gonadal -agonadal -diagnostic -gastrointestinal -gastronomic -carnal -functional -neurotic -epidemiologic -qualitative -quantal -quantitative -Quebecois -Assamese -Austronesian -Algerian -Andorran -Monacan -Galwegian -Calcuttan -circadian -rhinal -perinasal -otic -retinal -orbital -suborbital -reductionist -maturational -dynamic -hydrodynamic -aerodynamic -rheologic -meteoritic -micrometeoritic -cometary -asteroidal -piezoelectric -thyroid -thyrotoxic -thyroid -antithyroid -congressional -instructional -catechismal -catechetical -catechistic -Canadian -necrotic -hypothalamic -thalamocortical -gestational -progestational -progestational -emotional -macrobiotic -biotic -gubernatorial -presidential -copular -coronary -corporate -corporatist -corpuscular -dimensional -volumed -volumetric -hypothermic -hyperthermal -yogistic -botulinal -logistic -organicistic -organismal -artifactual -mutafacient -mutagenic -mutational -mutative -mutant -incident -serologic -chromatographic -national -national -national -nativist -nativist -naturistic -congeneric -specific -conspecific -experiential -medieval -mediatorial -mediatory -curatorial -proverbial -epiphyseal -diaphyseal -theocratic -comparative -artistic -aesthetic -official -teleological -sentential -intrasentential -scopal -simian -bubaline -embolic -falconine -ferial -faucal -future -futuristic -gallinaceous -geodetic -heraldic -humanitarian -homophonous -hyperbolic -lacustrine -liturgical -locomotive -logarithmic -Markovian -marmorean -marly -mesonic -marsupial -mercantile -metric -mythic -nacreous -normative -ordinal -palatal -Paleozoic -parabolic -pharyngeal -phrenic -prosodic -appetitive -aversive -promissory -quartan -quarterly -quartzose -quintessential -roentgenographic -rotary -septic -semicentennial -centennial -bicentennial -tricentenary -sophistic -Nazi -capitalist -zymotic -zymotic -osmotic -evolutionary -oracular -peritoneal -Epicurean -holographic -holographic -canonic -canonic -canonist -symphonic -contextual -nutritional -paramagnetic -motional -hydrometric -thermohydrometric -ferromagnetic -English -English -Irish -Afghani -idiomatic -dialectal -percussive -waxen -enzymatic -nonenzymatic -iodinated -dramaturgic -autodidactic -aneuploid -aneurysmal -alluvial -doctrinal -dogmatic -providential -philanthropic -philatelic -aerophilatelic -pleochroic -sternal -congestive -hemolytic -sarcolemmal -sarcosomal -sternutatory -sympathetic -urinary -urinary -atheromatous -basophilic -intimal -coeliac -celiac -emphysematous -granulocytic -atrophic -mesenteric -glomerular -calcific -fibrocalcific -pyknotic -eosinophilic -papillary -papillate -vesicular -vestibular -vertebral -neocortical -paleocortical -limbic -fugal -parasympathetic -parasympathomimetic -hypophyseal -hyperemic -neuropsychiatric -psychopharmacological -salivary -prime -nilpotent -megakaryocytic -megaloblastic -myelic -myelinic -myeloid -myeloid -myocardial -myoid -myotonic -triumphal -Darwinian -Lamarckian -larval -operational -microbial -cochlear -lumbar -lumbosacral -flagellate -biflagellate -ceramic -epic -Hellenic -Panhellenic -Greek -Syrian -Minoan -Mycenaean -Aegean -Aegean -Attic -Boeotian -Dipylon -Argive -executive -topographical -endothelial -taxonomic -classificatory -eutherian -proteolytic -microsomal -mithraic -mitotic -mitral -mitral -follicular -philological -dystopian -utopian -Stoic -patristic -sapphirine -saprophytic -saprobic -katharobic -cubist -tomentose -hyoid -geographic -shouldered -shrubby -etymological -British -epiphytic -lithophytic -budgetary -propagandist -isolationist -ascomycetous -pianistic -pianistic -Parisian -dialectic -Turkish -Eurafrican -Eurasian -Moroccan -Scots -Corsican -Sardinian -Alpine -alpine -Andean -myrmecophytic -tuberous -saponaceous -umbellate -narial -Cartesian -Mexican -Tudor -Shavian -Shakespearian -Skinnerian -Falstaffian -Victorian -Gaussian -Aeschylean -Alexandrian -Aristotelian -Audenesque -Balzacian -Beethovenian -Bismarckian -Bogartian -Caesarian -cesarean -Coleridgian -Columbian -Cromwellian -Dantean -Demosthenic -Deweyan -Donnean -Dostoevskian -Draconian -Einsteinian -Elizabethan -Erasmian -Freudian -Frostian -Gandhian -Gauguinesque -Goethean -Handelian -Hegelian -Hemingwayesque -Hitlerian -Hittite -Hugoesque -Huxleyan -Ibsenian -Proustian -Ptolemaic -Socratic -Jungian -Kantian -Keynesian -Kiplingesque -Leibnizian -Leonardesque -Lincolnesque -Lutheran -Marian -Michelangelesque -Muhammadan -Mosaic -Mozartian -Napoleonic -Newtonian -Pasteurian -Pavlovian -Piagetian -eponymous -Pythagorean -Wagnerian -Washingtonian -Washingtonian -Washingtonian -Washingtonian -Rembrandtesque -Riemannian -Rooseveltian -Senecan -Stravinskyan -Thoreauvian -Voltarian -Wordsworthian -Wittgensteinian -Yeatsian -Zolaesque -Hebraic -Hebraic -monocarpic -puerperal -acetic -actinic -aldermanic -alexic -dyslexic -monochromatic -Moravian -dichromatic -ambassadorial -amoebic -anemic -anaesthetic -ablative -accusatorial -inquisitorial -Afrikaans -aneroid -Angolan -Anguillan -prenuptial -postnuptial -Antiguan -antiquarian -antiquarian -appellate -anecdotal -Arabian -Arabian -Arabic -arithmetical -armorial -aspectual -asphyxiated -Augustan -Australian -Bahamian -Bahraini -Bangladeshi -Bantoid -Bantu -baptismal -Barbadian -bardic -Benedictine -Benedictine -Bengali -Beninese -Bermudan -Bhutanese -bilabial -binomial -biographic -bituminous -bituminoid -bivalent -bivariate -bladdery -bladed -bladed -blastemal -blastocoelic -blastodermatic -blastomeric -blastomycotic -blastoporal -blastospheric -boric -Bruneian -bubonic -Bulgarian -bungaloid -bureaucratic -burglarious -Burmese -Burundi -Californian -Cameroonian -cannibalistic -cantonal -carboniferous -Carmelite -carpal -casuistic -casuistic -Catalan -Catalan -cataleptic -catalytic -catatonic -Chadian -citric -citrous -citrous -climatic -Cockney -cockney -commemorative -concessive -Congolese -consular -Coptic -creaseproof -creedal -Creole -Creole -Cretaceous -cretaceous -cybernetic -cyclonic -cyclonic -cyclopean -cyclothymic -Cyprian -Cyrillic -dacitic -dactylic -daisylike -Dalmatian -damascene -defervescent -departmental -interdepartmental -intradepartmental -digestive -Delphic -demagogic -diabetic -disciplinary -interdisciplinary -disciplinary -divisional -Djiboutian -dogmatic -dolomitic -domiciliary -Dominican -Dominican -ducal -ductless -Edwardian -elocutionary -empiric -endometrial -endoscopic -enteric -entomological -entozoan -epizoan -entrepreneurial -Eritrean -Ethiopian -ethnographic -ethnological -euclidian -Fabian -fatalist -faecal -feudatory -Fijian -Filipino -Flemish -Franciscan -Gabonese -Gallic -Gambian -genealogic -Georgian -Georgian -Georgian -Georgian -Germanic -Ghanaian -Gibraltarian -Gilbertian -gladiatorial -glandular -gonadotropic -Gothic -Gothic -Gothic -green -greenhouse -greenside -Gregorian -Gregorian -Grenadian -growing -Guatemalan -Guinean -Guyanese -gyroscopic -Haitian -Hanoverian -Hispaniolan -Hispanic -histological -Hertzian -hiplength -Hippocratic -homeopathic -allopathic -Homeric -homiletic -homiletic -hydraulic -hydraulic -hydropathic -Icelandic -imperialistic -tribal -intertribal -Iranian -Iraqi -Italic -italic -Jacksonian -Jacobean -Jacobinic -Jamaican -Javanese -Jesuitical -Jordanian -journalistic -Jovian -Jovian -Julian -karyokinetic -Kashmiri -Kazakhstani -Kenyan -Kurdish -Kuwaiti -Kuwaiti -Lancastrian -Lancastrian -Laotian -Lao -Laputan -Latin -Latin -Romance -Latin -Lebanese -lenten -Levantine -Liberian -Libyan -Liechtensteiner -Lilliputian -lithographic -Liverpudlian -Luxemburger -Luxemburger -Macedonian -Machiavellian -Madagascan -malarial -Malawian -Malay -Malaysian -Malian -Maltese -Malthusian -Mancunian -manorial -Manx -Mauritanian -mayoral -Mediterranean -megalithic -membranous -Mendelian -mentholated -meritocratic -metacarpal -metallurgical -metatarsal -methylated -milch -millenary -mineral -Mongol -Mongolian -mongoloid -Mongoloid -mongoloid -Montserratian -Moorish -Mozambican -Mozambican -Muscovite -Namibian -Nauruan -Neanderthal -nebular -nectariferous -eolithic -mesolithic -neolithic -paleolithic -neuralgic -neurasthenic -Nicaean -Nicaraguan -Nigerian -Nigerian -Nilotic -Nilotic -nitrogenous -azotic -nodular -nontranslational -Nordic -Nordic -Norman -Norman -Olympic -Olympian -Olympian -Omani -optative -optative -subjunctive -implicational -imperative -indicative -interrogative -ornithological -orthopedic -orthoptic -outdoor -Oxonian -Oxonian -Pakistani -palatial -Papuan -paralytic -parenteral -parenteral -Parthian -participial -partitive -partitive -patronymic -pectic -penile -scrotal -peninsular -pentavalent -pentecostal -pentecostal -pharmaceutical -pharmaceutical -philharmonic -Philistine -phonic -phonic -phosphorous -pineal -piratical -piratical -piscatorial -pituitary -polygonal -polynomial -porcine -porphyritic -postganglionic -postictal -postmillennial -postural -praetorian -prepositional -primiparous -prismatic -prefectural -probabilistic -probabilistic -procedural -processional -processional -proconsular -promotional -promotional -propulsive -Prussian -pudendal -puerile -pugilistic -Carthaginian -purgatorial -purgatorial -puritanical -pyemic -pyloric -pyogenic -pyrectic -pyrochemical -pyroelectric -pyrogallic -pyrogenic -pyrographic -pyroligneous -pyrolytic -pyrotechnic -pyrrhic -pyrrhic -pyrrhic -Qatari -quadratic -biquadratic -quadratic -quadraphonic -quincentennial -Quechuan -Rabelaisian -rayless -recessionary -recessional -redemptive -regimental -residential -residuary -resistive -respiratory -inspiratory -expiratory -responsive -retentive -reversionary -Rhenish -rhizomatous -rhizoidal -rhomboid -ritualistic -romaic -Romany -rotational -Rwandan -Sabahan -Sabbatarian -sabbatical -sabbatical -sacral -sacrificial -Samoan -Sarawakian -satyric -saxicolous -Saxon -schismatic -schizoid -scorbutic -scotomatous -Semite -Semitic -Senegalese -sericultural -serous -Seychellois -Thai -Thai -Thai -Siberian -Singaporean -Singaporean -Singhalese -Sinhala -Slav -Slavonic -Somalian -Sotho -spastic -spicate -spondaic -stereoscopic -stereoscopic -stigmatic -stingless -stipendiary -substantival -gerundial -Sudanese -sulphuric -Sumatran -Swazi -syphilitic -systolic -extrasystolic -Tahitian -Taiwanese -tabular -Tamil -tannic -Tanzanian -tarsal -tartaric -telephonic -terminological -terpsichorean -tertian -tertian -tetanic -tetanic -tetravalent -Texan -textile -theosophical -thermionic -thermometric -thermostatic -thespian -Tobagonian -Togolese -Tongan -tonsorial -translational -Triassic -Trinidadian -trihydroxy -trivalent -trochaic -Trojan -trophoblastic -trophotropic -Tunisian -Tunisian -Turkic -tutorial -Ugandan -uric -uricosuric -uvular -vaginal -valvular -vehicular -vestal -vestiary -vestmental -veterinary -vibrionic -viceregal -Vietnamese -vocative -voyeuristic -weatherly -Welsh -wheaten -Wiccan -oaten -woolen -xerographic -Yemeni -Zairean -Zambian -zenithal -Zimbabwean -Zionist -Zionist -zonal -bizonal -zodiacal -ammoniated -Briton -carroty -philhellenic -boreal -boreal -axillary -paniculate -phyllodial -rupestral -Kafkaesque -Faustian -invitational -involucrate -scalar -scalar -anthropocentric -ethnocentric -deictic -shamanist -shambolic -shaped -shelflike -Shona -striate -sulcate -hymenal -hymeneal -servomechanical -onomatopoeic -commercial -dictyopteran -isopteran -obligational -oscine -osseous -ossicular -ossiferous -osteal -abolitionary -abomasal -absolutist -accentual -accessional -accipitrine -accommodational -acculturational -centromeric -acentric -acrocentric -metacentric -metacentric -telocentric -anaphylactic -bronchoscopic -bryophytic -bulbaceous -bulbed -bulbar -racial -scalic -rosaceous -Rosicrucian -streptococcal -subclavian -thalloid -thallophytic -ulcerative -ultramicroscopic -ultramontane -undescended -undulatory -universalistic -vasomotor -vesical -viscometric -viricidal -vitiliginous -ratlike -salamandriform -salvific -shakedown -sidearm -varicelliform -wiry -WYSIWYG -yeasty -Yuman -Zapotec -zero -zoonotic -zygomatic -zymoid -nosohusial -avenged -unavenged -beaten -calibrated -cantering -collected -uncollected -contested -uncontested -corbelled -elapsed -forced -hammered -held -streaming -surmounted -filled -unfilled -fitted -hypophysectomized -malted -unmalted -mercerized -operating -oxidized -parked -pasteurized -unpasteurized -penciled -pitched -played -plugged -posed -unposed -posted -preconceived -punishing -pursued -ranging -regenerating -ridged -sanitized -shrieked -sintered -sluicing -squashed -stacked -strung -sublimed -thoriated -transpiring -sought -saponified -unsaponified diff --git a/static/text/adjectives.old b/static/text/adjectives.old deleted file mode 100644 index 7731cf6..0000000 --- a/static/text/adjectives.old +++ /dev/null @@ -1 +0,0 @@ -lulling, vile, foul, cheerful, messy, dreadful, uneven, stinky, young, sparkling, sweltering, verdant, hideous, friendly, blistering, rambunctious, carefree, fat, sloppy, gloomy, awful, anemic, minute, stiff, benevolent, ceaseless, large, quick, round, glassy, rusty, scarce, odd, shining, even, dowdy, solemn, scorching, brief, rotten, new, plush, cozy, meandering, apologetic, nimble, busy, strong, great, brilliant, piercing, creepy, miniature, narrow, whimsical, fantastic, cowardly, disgusting, marvelous, snug, stern, stingy, angry, spiky, cheeky, gorgeous, mysterious, flat, clever, charming, dismal, meek, somber, sour, thin, beautiful, stubborn, crazy, challenging, gaunt, salty, indifferent, huge, daring, awkward, picturesque, copious, glowing, truthful, rude, petite, cranky, ornery, brazen, modest, purring, filthy, rotund, short, splendid, hasty, deafening, crawling, furious, tall, mute, ghastly, still, arrogant, crabby, haughty, curly, voiceless, hot, courageous, late, microscopic, vast, stifling, good, disrespectful, bashful, moaning, towering, adventurous, idyllic, careless, shocking, erratic, heavy, square, hard, jagged, gullible, hushed, revolting, content, thrifty, sluggish, eternal, greedy, pleasant, small, demanding, greasy, enormous, hostile, terrible, chilly, speedy, massive, loud, puny, striking, clumsy, soaring, brave, fast, delicious, effortless, bland, thick, little, ancient, silent, wonderful, stuffed, grimy, bitter, muggy, shallow, ridiculous, absent-minded, fuzzy, peculiar, mangy, wide, kind, squeaky, screeching, silly, squealing, spoiled, gigantic, happy, steep, ingenious, modern, juicy, gentle, medium, brawny, curved, lumpy, afraid, amusing, thundering, cooing, oppressive, swollen, grave, sturdy, average, proud, rancid, absurd, entertaining, annoyed, fussy, precise, subtle, gilded, slow, delinquent, nervous, hopeful, rich, adequate, shrill, plump, freezing, nasty, endless, lavish, worried, courteous, bulky, fair, diminutive, groggy, miserable, horrid, crooked, monstrous, superb, contrary, lazy, fidgety, menacing, swift, stale, quarrelsome, quiet, askew, tough, simple, sweet, hardworking, frosty, whispering, famished, crispy, caring, capable, tiny, immense, startled, lovely, high-pitched, tasteless, decrepit, tense, lousy, straight, excited, ugly, stunning, parched, wild, ripe, lonely, optimistic, obnoxious, cavernous, different, harsh, creaky, grand, difficult, temporary, eccentric, muffled, alert, delicate, timid, infamous, enchanting, anxious, humble, edgy, severe, repulsive, desolate, sleepy, slimy, irritable, vigilant, generous, rapid, old-fashioned, hilly, easy, righteous, joyful, surprised, starving, big, early, compassionate, moody, perpetual, dishonest, serious, foolish, soft, old, scared, mighty, trendy, curious, hissing, savage, dense, steaming, broad, slick, creative, icy, adorable, slight, terrified, intense, noisy, cautious, sizzling, blithe, fluttering, faint, delighted, smelly, lively, frightened, gauzy, long, strict, bored, calm, melodic, spicy, relaxed, triangular, dull, wise, dangerous, smooth, cruel, creeping, dawdling, intimidating, exhausted, deep, tasty, obtuse, graceful, tranquil, raspy, selfish, sullen, malicious, ecstatic, wrinkly, opulent, polite, fetid, husky, prudent, skinny, tricky, impatient, loyal, fresh diff --git a/static/text/animals b/static/text/animals deleted file mode 100644 index 0e2e012..0000000 --- a/static/text/animals +++ /dev/null @@ -1 +0,0 @@ -fawn, peacock, fox terrier, civet, musk deer, seastar, pigeon, bull, bumblebee, crocodile, flying squirrel, elephant, leopard seal, baboon, porcupine, wolverine, spider monkey, vampire bat, sparrow, manatee, possum, swallow, wildcat, bandicoot, labradoodle, dragonfly, tarsier, snowy owl, chameleon, boykin, puffin, bison, llama, kitten, stinkbug, macaw, parrot, leopard cat, prawn, panther, dogfish, fennec, frigatebird, nurse shark, turkey, cockatoo, neanderthal, crow, gopher, reindeer, earwig , anaconda, panda, ant, silver fox, collared peccary, puppy, common buzzard, moose, binturong, wildebeest, lovebird, ferret, persian, marine toad, woolly mammoth, dalmatian, bird, umbrellabird, kingfisher, kangaroo, stallion, russian blue, ostrich, owl, tawny owl, affenpinscher, caiman, elephant seal, octopus, meerkat, whale shark, buck, donkey, red wolf, mountain lion, labrador retriever, quetzal, chamois, sponge, hamster, orangutan, sea urchin, uakari, doberman, dormouse, saint bernard, bull shark, ocelot, sparrow, spitz, stoat, snapping turtle, dragonfly, cougar, alligator, walrus, glass lizard, malayan tiger, frog, tiger, armadillo, chinchilla, crab, squid, calf, shrew, dolphin, royal penguin, dingo, turtle, yellow-eyed penguin, chimpanzee, armadillo, boa constrictor, rabbit, basking, coyote, chinook, osprey, sea lion, fly, sperm whale, patas monkey, tiffany, mountain goat, dodo, worm, cat, warthog, peccary, shark, pony, monkey, swan, whippet, beagle, cougar, anteater, quail, liger, cheetah, woodpecker, egret, eagle, moose, warthog, honey bee, snail, stag beetle, budgie, molly, magpie, rhinoceros, elephant, kudu, wombat, tree frog, goat, lamb, tropicbird, human, hog, tang, pool frog, lemur, ox, dog, lizard, echidna, great dane, wallaby, hawk, dove, jellyfish, sloth, macaque, starfish, sun bear, guppy, welsh corgi, deer, impala, porpoise, gazelle, bichon, seal, wolf, zebra shark, mole, narwhal, hedgehog, sheep, horse, bluetick, colt, spadefoot toad, wildebeest, piranha, basenji, mallard, bull mastiff, bear, siberian husky, bird, badger, red panda, hammerhead, rock hyrax, kangaroo, marsh frog, mule, weasel, dogfish, dachsbracke, forest elephant, oyster, bat, python, coati, platypus, salamander, cat, caterpillar, giraffe, snake, kid, falcon, robin, guinea fowl, tern, sea lion, dingo, bolognese, drake, goose, rat, gentoo penguin, iguana, quail, mouse, horseshoe crab, roebuck, cattle dog, fish, poodle, frog, wolverine, chinchilla, bobcat, grey seal, hermit crab, carolina, shepherd, gila monster, snail, mandrill, leopard, frilled lizard, echidna, rabbit, bison, barracuda, foal, ass, eagle, octopus, avocet, siamese, dodo, yorkie, cockroach, wallaroo, tiger, woodlouse, glow worm, fossa, buffalo, zorse, albatross, indri, seahorse, lemur, louse, ostrich, humpback whale, millipede, fin whale, joey, pinscher, dachshund, proboscis monkey, pelican, chihuahua, dogo, indian rhinoceros, wasp, siberian, raccoon dog, yak, stingray, jack russel, water vole, foxhound, sheep, stork, horse, monkey, woolly monkey, waterbuck, dunker, cuscus, ibis, giraffe, aardvark, hummingbird, grizzly bear, otter, pike, minke whale, pika, stickbug, pelican, dugong, bongo, lemming, shrimp, piglet, sabre-toothed tiger, gemsbok, tiger shark, tuatara, rottweiler, elephant shrew, ewe, coati, cichlid, akita, gharial, thorny devil, duck, macaroni penguin, steer, setter, pufferfish, donkey, mink, macaw, wolfhound, white tiger, ram, ant, rat, marten, galapagos tortoise, crab, horn shark, blue whale, koala, starfish, partridge, sea squirt, fire-bellied toad, chipmunk, ibex, maltese, clumber, butterfly, manta ray, flamingo, opossum, parrot, mastiff, water buffalo, okapi, salmon, tapir, adelie, killer whale, lynx, basilisk, indian elephant, oyster, manta ray, prairie dog, chipmunk, locust, dog, cottontop, hyena, spectacled bear, oriole, cobra, pug, monitor, mandrill, antelope, chinstrap, zebra, chicken, mule, seal, goat, little penguin, gull, tasmanian devil, caterpillar, tamarin, wrasse, woodchuck, otter, penguin, porcupine, killer whale, bear, ferret, dusky, nightingale, slow worm, bat, jaguar, humboldt, ermine, saola, emu, lobster, weasel, nightingale, hound, bombay, platypus, electric eel, asian elephant, sea otter, uguisu, scorpion, fox, jerboa, bengal tiger, zebu, lion, zonkey, ragdoll, caracal, bee, kiwi, puma, common loon, jackal, malamute, mayfly, baboon, terrier, jellyfish, vicuna, penguin, desert tortoise, muskrat, water dragon, zebra, malayan civet, burmese, orangutan, himalayan, pond skater, howler monkey, newt, border collie, cow, bearded dragon, fish, barn owl, puffin, chin, anteater, beaver, canary, hamster, sloth, collie, heron, sea dragon, gopher, magpie, king crab, flounder, opossum, pademelon, capybara, boar, leaf-tailed gecko, turkey, clown fish, musk-ox, bulldog, pronghorn, hercules beetle, reindeer, llama, pygmy, eskimo dog, kinkajou, komodo dragon, cuttlefish, cub, bloodhound, squirrel, gander, moorhen, emu, brown bear, javanese, birman, harrier, tortoise, antelope, gnu, kingfisher, wasp, olm, havanese, canaan, lizard, indochinese tiger, ocelot, mist, hare, discus, cony, orca, rooster, ground hog, silver dollar, peacock, akbash, somali, beaver, maine coon, mouse, eland, squirrel, serval, chimpanzee, snowshoe, toucan, catfish, lynx, coyote, bunny, retriever, fur seal, cow, balinese, vulture, coral, leopard, raccoon, polar bear, okapi, kakapo, whale, sand lizard, bonobo, moray, gila monster, cormorant, bracke, camel, markhor, rockhopper, neapolitan, black bear, roseate spoonbill, woodpecker, mountain lion, crested penguin, hippopotamus, puma, camel, alligator, guinea pig, heron, siberian tiger, river dolphin, axolotl, argentino, human, mongoose, drever, quokka, common frog, elk, wombat, spider monkey, civet, sting ray, panther, gar, lionfish, snake, crane, newt, raven, tortoise, fire ant, chicadee, common toad, pig, manatee, centipede, numbat, river turtle, falcon, angelfish, chamois, rhinoceros, shark, flamingo, pheasant, ladybird, grasshopper, greyhound, lemming, pig, marmoset, eel, yorkiepoo, tiger salamander, mosquito, shih tzu, quoll, chick, guanaco, walrus, badger, ainu, squid, pekingese, gerbil, duck, rattlesnake, tapir, lobster, catfish, mustang, wallaby, mongrel, butterfly, booby, bush elephant, fox, rattlesnake, cockroach, tadpole, lark, ape, pied tamarin, mare, tetra, squirrel monkey, elephant seal, dhole, cesky, raccoon, newfoundland, marmoset, stag, bullfrog, black bear, crocodile, lion, barb, wolf, vervet monkey, beetle, polar bear, pointer, grizzly bear, meerkat, owl, reptile, fousek, gibbon, king penguin, budgerigar, swan, hartebeest, cassowary, borneo elephant, oryx, alpaca, gerbil, chameleon, galapagos penguin, vulture, barracuda, insect, fishing cat, hen, giant clam, hare, polecat, fly, chow chow, yak, seahorse, spider, eel, burro, brown bear, boxer dog, crane, bandicoot, hedgehog, dromedary, goose, budgerigar, dolphin, kelpie dog, highland cattle, dormouse, duckbill, springbok, mongoose, bobcat, water buffalo, gecko, hornet, iguana, wild boar, koala, guinea pig, marmot, skink, deer, filly, barnacle, tree toad, leopard tortoise, appenzeller, doe, gecko, mole, mynah bird, mau, gilla monster, french bulldog, termite, salamander, parakeet, finch, horned frog, hippopotamus, hummingbird, cheetah, albatross, jaguar, toad, hyena, gorilla, skunk, impala, sea slug, scorpion fish, jackal, skunk, grouse, sea turtle, moth, caribou, dugong, bighorn sheep, ibizan hound, gorilla, puffer fish, chicken, komodo dragon, buffalo diff --git a/static/text/animals.all b/static/text/animals.all deleted file mode 100644 index a1dd7b0..0000000 --- a/static/text/animals.all +++ /dev/null @@ -1,4902 +0,0 @@ -aardvark -aardwolf -abalone -abomasum -abortus -Abramis -Abrocoma -abrocome -Abudefduf -Abyssinian -Acanthisitta -Acanthocephala -acanthocephalan -Acanthocybium -Acanthophis -Acanthopterygii -Acanthoscelides -Acanthuridae -Acanthurus -acarid -Acaridae -Acarina -acarine -acarus -accentor -Accipiter -Accipitridae -Accipitriformes -Acherontia -Acheta -Achoerodus -acidophil -acidophilus -Acinonyx -Acipenser -Acipenseridae -Acnidosporidia -Acrididae -Acridotheres -Acris -Acrobates -Acrocephalus -acrodont -Acropora -Actias -actinia -Actinia -Actiniaria -actinomyces -Actinomycetaceae -Actinomycetales -actinomycete -Actinomyxidia -actinomyxidian -actinopod -Actinopoda -Actitis -aculea -aculeus -Adalia -Adapid -addax -adder -Adelges -adelgid -Adelgidae -Adelie -Adenota -adenovirus -admiral -adult -Aedes -Aegina -Aegypiidae -Aegypius -Aegyptopithecus -Aepyceros -Aepyornidae -Aepyorniformes -Aerobacter -aerobe -Aetobatus -affenpinscher -Affirmed -Africander -afropavo -aftershaft -agama -agamid -Agamidae -Agapornis -Agelaius -Agkistrodon -Agnatha -Agonidae -Agonus -agouti -Agriocharis -Agrobacterium -agua -Ailuropoda -Ailuropodidae -Ailurus -Airedale -Aix -Ajaia -Akeridae -ala -Alauda -Alaudidae -albacore -albatross -Albula -Albulidae -Alca -Alcedinidae -Alcedo -Alcelaphus -Alces -Alcidae -Alcyonacea -Alcyonaria -alderfly -Alectis -Alectoris -Alectura -Alepisaurus -alewife -Aleyrodes -Aleyrodidae -alga -Algeripithecus -allantois -alligator -alligatorfish -Alligatoridae -allosaur -Alopex -Alopiidae -Alopius -Alosa -Alouatta -alpaca -alphavirus -Alsophila -alula -Alytes -amazon -Amazona -amberjack -Ambloplites -Amblyrhynchus -ambulacrum -Ambystoma -Ambystomatidae -ambystomid -ameba -Ameiuridae -Ameiurus -Amia -Amiidae -Ammodytes -Ammodytidae -Ammotragus -amnion -Amniota -amniote -Amoebida -amphibia -amphibian -Amphibolips -amphidiploid -Amphineura -Amphioxidae -amphipod -Amphipoda -Amphiprion -Amphisbaena -Amphisbaenidae -amphiuma -Amphiumidae -Anabantidae -Anabas -Anabrus -Anacanthini -anaconda -anaerobe -Anagasta -anapsid -Anapsida -Anarhichadidae -Anarhichas -Anas -Anasa -anaspid -Anaspida -Anastomus -Anatidae -anatotitan -anchovy -Ancylidae -Ancylostomatidae -Ancylus -andrena -Andrenidae -Andricus -Aneides -angelfish -anglewing -Angora -Anguidae -Anguilla -Anguillidae -Anguilliformes -Anguillula -Anguis -angwantibo -Anhima -Anhimidae -Anhingidae -ani -animalcule -Animalia -Anisoptera -Anisotremus -ankylosaur -annelid -Annelida -Anniellidae -anoa -Anobiidae -Anodonta -Anolis -Anomala -Anomalopidae -anomalops -anomalopteryx -Anomia -Anomiidae -Anopheles -anopheline -Anoplura -Anostraca -Anser -Anseres -Anseriformes -Anserinae -ant -antbird -anteater -Antedon -Antedonidae -antelope -antenna -Antennariidae -Antheraea -Anthidium -Anthonomus -Anthozoa -anthozoan -anthropoid -Anthropoidea -Anthus -Antidorcas -Antigonia -Antilocapra -Antilocapridae -Antilope -antler -Antrozous -Aotus -aoudad -apar -apatosaur -Apatura -ape -aperea -Aphasmidia -aphid -Aphididae -Aphidoidea -Aphis -Aphriza -Aphrophora -Apidae -Apis -Aplodontia -Aplodontiidae -Aplysia -Aplysiidae -apodeme -Apodemus -Apodidae -Apodiformes -Apogon -Apogonidae -Apoidea -apolemia -Appaloosa -appendicularia -Appenzeller -Aptenodytes -Apterygidae -Apterygiformes -Apus -Aquila -Ara -Arabian -arachnid -Arachnida -arame -Aramus -Aranea -Araneae -arbovirus -Arca -arcella -Arcellidae -archaebacteria -archaeopteryx -archaeornis -Archaeornithes -archenteron -archerfish -archiannelid -Archiannelida -Archidiskidon -Archilochus -architeuthis -Archosargus -archosaur -Archosauria -Arcidae -Arctictis -arctiid -Arctiidae -Arctocebus -Arctocephalus -Arctonyx -Ardea -Ardeidae -Arenaria -Arenaviridae -arenavirus -argali -Argasidae -Argentina -argentine -Argentinidae -argentinosaur -Argiope -Argiopidae -Argonauta -Argonautidae -argus -Argusianus -Argynnis -Argyrotaenia -Ariidae -Arilus -Ariomma -arista -Arius -Arizona -Armadillidiidae -Armadillidium -armadillo -armor -armyworm -arrowworm -Artamidae -Artamus -Artemia -arthropod -Arthropoda -Artiodactyla -Arvicola -Ascaphidae -Ascaphus -Ascaridae -Ascaridia -Ascaris -Ascidiaceae -ascidian -Ascophyllum -Asilidae -Asio -asp -Aspidelaps -Aspidiotus -Aspidophoroides -ass -Assault -Astacidae -Astacus -Asteroidea -Astrophyton -Astropogon -Ateles -Athene -Atherinidae -Atherinopsis -Atherurus -Athiorhodaceae -Atrichornis -Atrichornithidae -Atropidae -Atticus -auk -auklet -Aulacorhyncus -Aulostomidae -Aulostomus -Auriparus -aurochs -australopithecine -Automeris -avadavat -Avahi -Aves -avocet -axolotl -aye-aye -Ayrshire -Aythya -baa-lamb -babbler -Babesiidae -babirusa -baboon -baby -Babyrousa -Bacillaceae -Bacillariophyceae -bacillus -backswimmer -bacteria -bacteriochlorophyll -bacteriophage -bacteroid -Bacteroidaceae -Bacteroides -badger -Baiomys -Bairdiella -Balaena -Balaeniceps -Balaenicipitidae -Balaenidae -Balaenoptera -Balaenopteridae -Balanidae -Balanus -Balistes -Balistidae -balloonfish -bandicoot -Bangiaceae -Bankia -bantam -banteng -barb -barbel -barbet -barbu -bark-louse -barnacle -baronduki -barosaur -barracouta -barracuda -barramundi -barrelfish -Bartramia -basenji -Basiliscus -basilisk -bass -Bassariscidae -Bassariscus -bassarisk -basset -bat -batfish -Bathyergidae -Bathyergus -Batrachoididae -Batrachoseps -bay -baya -beagle -beak -bear -beard -beaugregory -beaver -bedbug -bee -beef -beetle -belemnite -Belemnitidae -Belemnoidea -bellbird -bellwether -belly -Belonidae -Belostomatidae -beluga -Bemisia -beroe -Berycomorphi -bettong -Bettongia -Bibos -bigeye -bighorn -billfish -billy -binturong -biped -bird -bison -bitch -Bitis -Bittacidae -bittern -bivalve -Bivalvia -Blaberus -blackbird -blackbuck -Blackburn -blackcap -blackcock -blackfish -blackfly -blackpoll -blacksnake -bladderwrack -blanquillo -Blarina -blastocoel -blastocyst -blastoderm -blastomere -blastopore -blastula -Blatta -Blattella -Blattidae -Blattodea -Blenniidae -Blennioidea -Blennius -blenny -blindworm -Blissus -bloodhound -bloodworm -blowfly -blue -bluebird -bluebottle -bluefin -bluefish -bluegill -bluehead -bluepoint -bluethroat -bluetick -bluewing -boa -boar -boarfish -boarhound -boatbill -bobcat -bobolink -bobtail -bobwhite -Boidae -bollworm -bolti -Bombina -Bombus -bombycid -Bombycidae -Bombycilla -Bombycillidae -Bombyliidae -Bombyx -Bonasa -bonefish -bongo -bonito -booby -booklouse -borrelia -borzoi -Bos -Boselaphus -bot -Botaurus -botfly -Bothidae -Bothrops -bottom-feeder -botulinus -bovid -Bovidae -Bovinae -bovine -Bovini -bowerbird -bowfin -bowhead -boxer -boxfish -Brachinus -brachiopod -Brachiopoda -Brachyura -brachyuran -Bradypodidae -Bradypus -Brahman -Brama -brambling -Bramidae -Branchiobdella -Branchiobdellidae -Branchiopoda -Branchiostegidae -Branchiura -brant -Branta -breast -Brevoortia -briard -brill -brisling -bristle -bristletail -brit -broadbill -broadtail -brocket -bronco -broodmare -Brosmius -brotula -Brotulidae -browntail -Brucella -Bruchidae -Bruchus -bruin -brush -Bryozoa -bryozoan -Bubalus -Bubo -Bubulcus -Buccinidae -Bucconidae -Bucephala -Buceros -Bucerotidae -buck -buckskin -budgerigar -Budorcas -bufflehead -bufo -Bufonidae -bug -bulbul -bull -bulldog -bullfinch -bullfrog -bullhead -bullock -bullterrier -bumblebee -Bungarus -bunny -bunting -Bunyaviridae -bunyavirus -burbot -Burhinidae -Burhinus -Burmeisteria -burrfish -burro -bushbuck -bushtit -bustard -butcherbird -Buteo -buteonine -butterfish -butterfly -buzzard -by-catch -byssus -cabbageworm -Cacajao -Cacicus -cacique -cackler -caddisworm -Cadra -caecilian -Caeciliidae -Caenolestes -Caenolestidae -caiman -Cairina -cairn -Calamus -calf -Calidris -Callicebus -Callimorpha -Callinectes -Callionymidae -Calliophis -Calliphora -Calliphoridae -Callisaurus -Callithricidae -Callithrix -Callorhinus -calosoma -calyculus -Calymmatobacterium -Cambarus -camel -Camelidae -Camelus -Campephilus -Camponotus -Campylorhynchus -Canachites -canary -Cancer -Cancridae -Canidae -canine -Canis -cankerworm -cannon -canvasback -capelin -capercaillie -Capitonidae -capon -Capra -Caprella -Capreolus -Capricornis -Caprimulgidae -Caprimulgiformes -Caprimulgus -Caproidae -Capromyidae -Capros -capsid -capuchin -capybara -carabao -Carabidae -caracal -caracara -carancha -Carangidae -Caranx -carapace -Carapidae -Carassius -carcase -Carcharhinidae -Carcharhinus -Carcharias -Carchariidae -Carcharodon -Cardigan -Cardiidae -cardinal -cardinalfish -Cardium -Carduelinae -Carduelis -Caretta -Cariama -Cariamidae -caribou -carinate -Carnivora -carnivore -carnosaur -Carnosaura -carp -Carphophis -Carpocapsa -Carpodacus -carrier -carrion -carthorse -caseworm -Casmerodius -cassowary -Castor -Castoridae -Castoroides -Casuaridae -Casuariiformes -Casuarius -cat -Catacala -catalufa -catbird -caterpillar -catfish -Catharacta -Cathartes -Cathartidae -Catoptrophorus -catostomid -Catostomidae -Catostomus -cattalo -cattle -Cavia -Caviidae -cavy -cayuse -Cebidae -Cebuella -Cebus -Cecidomyidae -cecropia -centipede -Centrarchidae -Centriscidae -Centrocercus -Centropomidae -Centropomus -Centropristis -Centropus -Cephalobidae -Cephalochordata -cephalochordate -cephalopod -Cephalopoda -Cephalopterus -Cepphus -Cerambycidae -Cerapteryx -ceras -Ceratitis -Ceratodontidae -ceratodus -Ceratopogon -Ceratopogonidae -Ceratopsia -ceratopsian -Ceratopsidae -ceratosaur -Ceratotherium -cercaria -Cercocebus -Cercopidae -Cercopithecidae -Cercopithecus -cere -cero -Certhia -Certhiidae -Cervidae -Cervus -Ceryle -Cestida -Cestidae -Cestoda -Cestum -Cetacea -cetacean -Cetonia -Cetoniidae -Cetorhinidae -Cetorhinus -chachalaca -chacma -Chaenopsis -chaeta -Chaetodipterus -chaetodon -Chaetodontidae -Chaetognatha -chaffinch -chaja -chalaza -Chalcididae -Chalcis -Chalcostigma -Chamaea -Chamaeleo -Chamaeleontidae -chameleon -chamois -Channidae -char -Chara -Characeae -Characidae -characin -Characinidae -Charadrii -Charadriidae -Charadriiformes -Charadrius -Charales -charger -Charina -Charolais -Charophyceae -Charronia -Chateura -Chauna -cheetah -chelicera -Chelicerata -Chelifer -Chelonethida -Chelonia -chelonian -Cheloniidae -Chelydra -Chelydridae -Chen -cherrystone -chestnut -Cheviot -chevrotain -chewink -chick -chickadee -chicken -chickeree -chigetai -chigoe -Chihuahua -Chilomastix -Chilomeniscus -Chilomycterus -Chilopoda -chimaera -Chimaeridae -chimpanzee -chinchilla -Chinchillidae -chine -chinook -chipmunk -Chironomidae -Chironomus -Chiroptera -chiton -Chlamydera -chlamydia -Chlamydiaceae -Chlamydomonadaceae -Chlamydomonas -Chlamydosaurus -Chlamyphorus -chlorella -Chlorococcales -Chlorococcum -Chlorophis -Chlorophoneus -Chlorophthalmidae -Chlorophyceae -chlorophyll -Chlorophyta -Chlorura -choanocyte -Choeronycteris -Choloepus -Chondrichthyes -Chondrus -chordamesoderm -Chordata -chordate -Chordeiles -chorioallantois -chorion -Choriotis -Chorizagrotis -chough -chow -Chronoperates -chrysalis -Chrysaora -Chrysemys -Chrysochloridae -Chrysochloris -Chrysolophus -Chrysomelidae -Chrysophrys -Chrysophyceae -Chrysophyta -Chrysopidae -chub -chuckwalla -chuck-will's-widow -chunga -cicada -Cicadellidae -Cicadidae -cichlid -Cichlidae -Cicindelidae -Ciconia -Ciconiidae -Ciconiiformes -Ciliata -ciliate -cilium -Cimex -Cimicidae -Cinclidae -Cinclus -cinnabar -Circaetus -Circus -Cirripedia -cirrus -cisco -Cistothorus -Citation -Citellus -Citharichthys -civet -Cladorhyncus -clam -Clamatores -clamshell -Clangula -claw -Cleridae -Clethrionomys -clingfish -clinid -Clinidae -clostridium -clumber -Clupea -Clupeidae -Clydesdale -clypeus -Cnemidophorus -Cnidaria -Cnidosporidia -coachwhip -coat -coati -cob -cobia -Cobitidae -cobra -Coccidae -Coccidia -coccidium -Coccinellidae -coccobacillus -Coccoidea -Coccothraustes -coccus -Coccyzus -cochin -Cochlearius -cock -cockateel -cockatoo -cockchafer -cockerel -cockle -cockroach -cocoon -cod -codling -coelacanth -coelenterate -coelenteron -coelophysis -Coereba -Coerebidae -coho -Colaptes -Coleonyx -Coleoptera -Colinus -coliphage -Collembola -collembolan -collie -Collocalia -colobus -colt -Coluber -Colubridae -Columba -Columbidae -Columbiformes -Comatula -Comatulidae -comb -comma -commensal -compsognathus -conch -conchfish -condor -Condylura -conenose -Conepatus -coney -conferva -conger -Congridae -Conilurus -Connochaetes -conodont -Conodonta -conspecific -constrictor -Contopus -Conuropsis -coondog -coonhound -coot -cooter -copepod -Copepoda -copper -copperhead -Coracias -Coraciidae -Coraciiformes -Coragyps -coral -corbina -Cordylidae -Cordylus -Coregonidae -Coregonus -Coreidae -corgi -Corixa -Corixidae -cormorant -corncrake -cornetfish -Cornish -coronet -Corvidae -Corvus -Corydalidae -Corydalus -Corynebacteriaceae -corynebacterium -Coryphaenidae -corythosaur -coscoroba -cosmid -Cosmocampus -costia -cotinga -Cotingidae -Cotswold -Cottidae -cottonwick -Cottus -Coturnix -coucal -cougar -courlan -courser -cow -cowbird -cowfish -cowrie -coxsackievirus -coydog -coyote -coypu -crab -Cracidae -Cracticidae -Cracticus -crake -crane -Crangon -Crangonidae -crapaud -crappie -Crassostrea -craw -Crax -crayfish -creeper -creepy-crawly -creole-fish -crest -Crex -Cricetidae -Cricetus -cricket -crinoid -Crinoidea -critter -croaker -Crocethia -crocodile -Crocodylia -Crocodylidae -Crocodylus -Crocuta -Cro-magnon -crossbill -crossopterygian -Crossopterygii -Crotalidae -Crotalus -Crotaphytus -Crotophaga -crow -crowbait -Crustacea -crustacean -Cryptacanthodes -Cryptobranchidae -Cryptobranchus -Cryptocercidae -Cryptocercus -cryptomonad -Cryptophyceae -Cryptophyta -Cryptoprocta -Cryptotermes -Cryptotis -ctene -ctenidium -Ctenizidae -Ctenocephalides -Ctenocephalus -Ctenophora -ctenophore -cub -cuckoo -cuckoo-bumblebee -Cuculidae -Cuculiformes -Cuculus -Culex -Culicidae -Cuniculus -cunner -Cuon -cupule -cur -curassow -Curculionidae -curlew -currawong -Cursorius -cuscus -cusk -cusk-eel -Cuterebra -Cuterebridae -cuticula -cutlassfish -cuttlefish -cutworm -Cyamus -cyanobacteria -Cyanocitta -Cyanophyta -Cycliophora -Cyclopes -cyclops -Cyclopteridae -Cyclopterus -Cyclosporeae -Cyclostomata -cyclostome -Cydippida -cygnet -Cygnus -Cymatiidae -Cynipidae -Cynips -Cynocephalidae -Cynocephalus -cynodont -Cynodontia -Cynoglossidae -Cynomys -Cynopterus -Cynoscion -Cypraea -Cypraeidae -cyprinid -Cyprinidae -Cypriniformes -cyprinodont -Cyprinodontidae -Cyprinus -Cystophora -cytomegalovirus -cytostome -dabchick -dace -Dacelo -dachshund -Dactylopiidae -Dactylopius -Dactylopteridae -Dactylopterus -Dactyloscopidae -dalmatian -dam -Dama -Damaliscus -damselfish -damselfly -danaid -Danaidae -Danaus -daphnia -darter -Dasyatidae -Dasyatis -Dasypodidae -Dasyprocta -Dasyproctidae -Dasypus -dasyure -Dasyuridae -Dasyurus -Daubentonia -Daubentoniidae -dealfish -decapod -Decapoda -Decapterus -deer -defoliator -deinocheirus -deinonychus -Delichon -Delphinapterus -Delphinidae -Delphinus -Dendroaspis -Dendrocolaptes -Dendrocolaptidae -Dendroctonus -Dendroica -Dendrolagus -Denisonia -denizen -denticle -Dermacentor -Dermaptera -Dermatobia -Dermestidae -Dermochelyidae -Dermochelys -Dermoptera -desmid -Desmidiaceae -Desmidium -Desmodontidae -Desmodus -Desmograthus -Devon -dhole -Diadophis -Dialeurodes -diamondback -diapheromera -diapsid -Diapsida -Diaspididae -diatom -Dibranchiata -dibranchiate -dicamptodon -Dicamptodontidae -Diceros -dickeybird -Dicrostonyx -Dictyoptera -dicynodont -Dicynodontia -Didelphidae -Didelphis -difflugia -dihybrid -dik-dik -dimetrodon -dingo -dinoceras -Dinocerata -dinocerate -Dinoflagellata -dinoflagellate -Dinornis -Dinornithidae -Dinornithiformes -dinosaur -Diodon -Diodontidae -Diomedeidae -Diphylla -diplococcus -diplodocus -diploid -Diplopoda -Dipnoi -Dipodidae -Dipodomys -Dipsosaurus -Diptera -Dipus -Discocephali -Discoglossidae -Doberman -dobson -dock -doctorfish -dodo -doe -dog -dogfish -dogie -Dolichonyx -Dolichotis -Doliolidae -doliolum -dollarfish -dolphin -dolphinfish -Dominique -doodlebug -dorbeetle -Dorking -dormouse -dory -Dorylinae -dotterel -douroucouli -dove -dowitcher -down -Draco -Dracunculidae -Dracunculus -dragon -dragonet -dragonfly -drake -Dreissena -Drepanididae -Drepanis -driftfish -drill -dromaeosaur -Dromaeosauridae -Dromaius -drone -drosophila -Drosophilidae -drum -Drymarchon -dryopithecine -Dryopithecus -duck -duckling -dug -dugong -Dugongidae -dulse -Dumetella -dun -Duplicidentata -Durham -Dusicyon -Dysdercus -Dytiscidae -Eacles -eagle -eaglet -earthworm -earwig -Echeneididae -Echeneis -echidna -Echidnophaga -echinococcus -echinoderm -Echinodermata -Echinoidea -echovirus -ectoderm -ectoparasite -Ectopistes -ectoproct -Ectoprocta -Edaphosauridae -edaphosaurus -Edentata -edentate -Edmontonia -edmontosaurus -eel -eelblenny -eelpout -eelworm -eft -egg -eggar -egret -Egretta -eider -eiderdown -Eimeriidae -Eira -Elagatis -eland -Elanoides -Elanus -Elaphe -Elaphurus -elapid -Elapidae -elasmobranch -Elasmobranchii -Elateridae -elbow -Electrophoridae -Electrophorus -Eleotridae -elephant -Elephantidae -Elephas -Eleutherodactylus -Eliomys -elk -Elopidae -Elops -elver -Emberiza -Emberizidae -Embioptera -Embiotocidae -embryo -emperor -emu -Emydidae -encolure -endameba -Endamoeba -Endamoebidae -endoderm -endoparasite -Engraulidae -Engraulis -Enhydra -Ensis -entellus -Enterobacteriaceae -Enterobius -enterovirus -EntleBucher -Entomostraca -entoproct -Entoprocta -eohippus -eoraptor -ephemerid -Ephemeridae -ephemeron -Ephemeroptera -Ephestia -Ephippidae -Ephippiorhynchus -Epilachna -Epinephelus -eptatretus -Eptesicus -Equetus -Equidae -equine -Equus -Erethizon -Erethizontidae -Eretmochelys -Erignathus -Erinaceidae -Erinaceus -Eriosoma -Erithacus -ermine -ern -Erolia -erwinia -Erythrocebus -escherichia -Eschrichtiidae -Eschrichtius -escolar -Esocidae -Esox -Estrilda -Etropus -Euarctos -eubacteria -Eubacteriales -Eucinostomus -Euderma -Eudyptes -euglena -Euglenaceae -euglenoid -Euglenophyceae -Euglenophyta -eukaryote -Eumeces -Eumenes -Eumetopias -Eumops -Eunectes -Euphagus -Euphausiacea -Euphractus -Euplectella -Euproctis -Euronithopoda -Euryale -Euryalida -Eurylaimi -Eurylaimidae -eurypterid -Eurypterida -Eutamias -Eutheria -Euthynnus -ewe -Exaeretodon -Exmoor -Exocoetidae -Exocycloida -Exopterygota -eyas -Falco -falcon -falcon-gentle -Falconidae -Falconiformes -fanaloka -fang -Fasciola -Fasciolidae -Fasciolopsis -fawn -feather -feeder -feist -Felidae -feline -Felis -female -Fenusa -fer-de-lance -ferret -fetlock -fetus -fieldfare -fig-bird -filaria -Filariidae -filefish -filly -Filoviridae -filovirus -fin -finback -finch -fingerling -finisher -firebrat -firebug -firefly -fish -fishbone -fisher -Fissipedia -Fissurella -Fissurellidae -Fistularia -Fistulariidae -flag -flagellate -flagellum -flagfish -flamingo -flank -flatfish -flathead -flatworm -Flaviviridae -flavivirus -flea -fledgling -flicker -flickertail -flipper -flounder -fluke -fly -foal -foot -foram -Foraminifera -forefoot -foreleg -forelimb -forelock -forepaw -forewing -Forficula -Forficulidae -Formica -Formicariidae -Formicarius -Formicidae -fossa -Fossa -fox -foxhound -Francisella -Frankliniella -Fratercula -freetail -Fregata -Fregatidae -Friesian -Fringilla -Fringillidae -fritillary -frog -frogfish -froghopper -frogmouth -Fucaceae -Fucales -fucoid -fucus -Fulgoridae -Fulica -fulmar -Fulmarus -Fundulus -Fungia -fur -furcula -Furnariidae -Furnarius -gadfly -Gadidae -Gadiformes -gadoid -Gadus -galago -Galbulidae -Galeocerdo -Galeorhinus -Galleria -gallfly -Galliformes -Gallinago -Gallinula -gallinule -Gallirallus -Galloway -Gallus -Gambelia -Gambusia -game -gamecock -gander -gannet -ganoid -Ganoidei -ganoin -gar -garganey -Garrulinae -Garrulus -gaskin -Gasterophilidae -Gasterophilus -Gasterosteidae -Gasterosteus -Gastrophryne -gastropod -Gastropoda -gastrula -gaur -Gavia -gavial -Gavialidae -Gavialis -Gavidae -Gaviiformes -gayal -Gazella -gazelle -gecko -gee-gee -Gekkonidae -gelding -Gelechia -gelechiid -Gelechiidae -gempylid -Gempylidae -Gempylus -gemsbok -genet -Genetta -Genyonemus -Geochelone -Geococcyx -geoduck -geometrid -Geometridae -Geomyidae -Geomys -Geophilidae -Geophilomorpha -Geophilus -Geothlypis -gerbil -Gerbillinae -Gerbillus -gerenuk -Gerreidae -Gerres -Gerrhonotus -Gerrididae -Gerris -giant -giardia -gib -gibbon -Gigartinaceae -gill -Ginglymostoma -Giraffa -giraffe -Giraffidae -gizzard -Glareola -Glareolidae -Glaucomys -Gliridae -Glis -Globicephala -globigerina -Globigerinidae -Glossinidae -Glossopsitta -glowworm -glutton -gnat -gnatcatcher -Gnathostomata -gnathostome -gnu -goat -goatfish -goatsucker -Gobiesocidae -Gobiesox -Gobiidae -Gobio -goby -godwit -goldcrest -goldeneye -goldfinch -goldfish -gomphothere -Gomphotheriidae -Gomphotherium -gonococcus -Gonorhynchidae -Gonorhynchus -goosander -goose -goosefish -gopher -Gopherus -goral -Gorgonacea -gorgonian -Gorgonocephalus -gorilla -goshawk -gosling -gracilariid -Gracilariidae -grackle -Gracula -grade -grampus -grassfinch -grasshopper -grebe -greenbottle -greeneye -greenfly -greenling -greenshank -greenwing -gregarine -Gregarinida -grenadier -grey -greyback -greyhen -greyhound -greylag -griffon -grison -grivet -grizzly -groenendael -grosbeak -groundfish -groundhog -ground-shaker -grouper -grouse -grub -grubby -Gruidae -Gruiformes -grunt -Grus -Gryllidae -guan -guanaco -gudgeon -guenon -guereza -Guernsey -guillemot -guitarfish -gulfweed -gull -Gulo -gunnel -guppy -gurnard -Gymnelis -Gymnogyps -Gymnophiona -Gymnorhina -Gymnura -Gypaetus -Gyps -gyrfalcon -Gyrinidae -hack -hackle -hackney -haddock -hadrosaur -Hadrosauridae -Haematobia -Haematopodidae -Haematopus -Haemopis -haemoproteid -Haemoproteidae -Haemoproteus -Haemosporidia -haemosporidian -Haemulidae -Haemulon -hagfish -hair -hairstreak -hake -halcyon -Halcyon -Haldea -halfbeak -Haliaeetus -halibut -Halicoeres -Halictidae -Haliotidae -Haliotis -halobacteria -halophile -halter -hamadryad -Haminoea -hammerhead -Hampshire -hamster -hand -haploid -Haplosporidia -haplosporidian -hare -Harpia -harpy -harrier -hart -hartebeest -harvestfish -harvestman -hatchling -haunch -hawfinch -hawk -hawkmoth -head -hedgehog -heifer -Helicidae -Heliobacter -Heliothis -Heliozoa -heliozoan -Helix -hellbender -hellgrammiate -helminth -Heloderma -Helodermatidae -Hemachatus -Hemerobiidae -Hemigalus -Hemigrammus -Hemiprocnidae -Hemiptera -Hemipteronatus -Hemiramphidae -Hemitripterus -hen -hepadnavirus -herbivore -Hereford -Hermissenda -heron -herpes -Herpestes -herrerasaur -herring -Hesperiphona -Heterocephalus -Heterodon -Heterokontophyta -Heteromyidae -heteroploid -Heteroptera -Heteroscelus -Heterosomata -heterostracan -Heterostraci -Heterotrichales -Hexagrammidae -Hexagrammos -Hexamita -Hexanchidae -Hexanchus -hexapod -hide -Himantopus -hind -hindfoot -hindquarters -hinny -Hippobosca -Hippoboscidae -Hippocampus -Hippodamia -Hippoglossoides -Hippoglossus -Hippopotamidae -hippopotamus -Hipposideridae -Hipposideros -Hippotragus -Hipsurus -Hirudinea -Hirudinidae -Hirudo -Hirundinidae -Hirundo -hoatzin -hobby -hock -hog -hogchoker -hogfish -Holbrookia -Holocentridae -Holocentrus -holocephalan -Holocephali -holometabola -Holothuria -Holothuridae -Holothuroidea -Homaridae -Homarus -homeotherm -hominid -Hominidae -hominoid -Hominoidea -homo -Homona -Homoptera -honeybee -honeycreeper -honker -hood -hoof -hookworm -hoopoe -horn -hornbill -hornet -horse -horseback -horsefly -horseleech -host -hound -housedog -housefly -hummingbird -humpback -Hyaenidae -Hyalophora -Hyalospongiae -hybrid -hydra -Hydrobates -Hydrobatidae -Hydrochoeridae -Hydrochoerus -Hydrodamalis -Hydromantes -Hydromyinae -Hydromys -Hydrophidae -Hydrozoa -hydrozoan -Hyemoschus -hyena -Hyla -Hylactophryne -Hylidae -Hylobates -Hylobatidae -Hylocichla -Hylophylax -Hymenoptera -Hynerpeton -Hypentelium -Hypermastigina -hypermastigote -Hyperoglyphe -Hyperoodon -Hyphantria -Hypoderma -hypodermis -Hypopachus -Hypsiglena -Hypsiprymnodon -Hyracoidea -Hyracotherium -hyrax -Hystricidae -Hystricomorpha -Ibero-mesornis -ibex -ibis -ichneumon -Ichneumonidae -ichthyosaur -Ichthyosauria -Ichthyosauridae -ichthyosaurus -Ichyostega -Ictalurus -Icteria -Icteridae -Icterus -Ictiobus -ictodosaur -Ictodosauria -Ictonyx -iguanid -Iguanidae -iguanodon -Iguanodontidae -imago -impala -Inachis -Indicatoridae -indri -Indriidae -Infusoria -infusorian -insect -Insecta -Insectivora -insectivore -Insessores -instar -invertebrate -investment -Irena -Irenidae -Iridoprocne -Ischigualastia -isopod -Isopoda -Isoptera -Isospondyli -Istiophoridae -Istiophorus -Isuridae -Isurus -ivorybill -Ixobrychus -Ixodes -Ixodidae -jabiru -jacamar -jack -jackal -jackdaw -jackknife-fish -jackrabbit -jacksmelt -jacksnipe -Jaculus -jaeger -jaguar -jaguarundi -jassid -Jassidae -Javanthropus -jawfish -jay -jellyfish -jennet -jerboa -Jersey -jewfish -jird -Jordanella -junco -Jynx -Kakatoe -kaki -Kalotermes -Kalotermitidae -kanchil -kangaroo -Katsuwonidae -Katsuwonus -katydid -kea -keeshond -kelp -kelpie -Kenyapithecus -kestrel -kiang -kid -killdeer -killifish -kingbird -kingfish -kingfisher -kinglet -kinkajou -Kinosternidae -Kinosternon -kit -kite -kitten -kittiwake -kitty -kiwi -klebsiella -knot -koala -kob -Kobus -Kogia -komondor -kookaburra -krait -krill -Krypterophaneron -kudu -kuvasz -Kyphosidae -Kyphosus -Labridae -labyrinthodont -Labyrinthodontia -Lacerta -Lacertidae -lacewing -Lachnolaimus -Lactobacillaceae -lactobacillus -Lactophrys -ladybug -ladyfish -Lagidium -Lagodon -lagomorph -Lagomorpha -Lagopus -Lagorchestes -Lagostomus -Lagothrix -Lama -lamb -Lambis -lambkin -Lamellicornia -Laminaria -Laminariaceae -Laminariales -Lamna -Lamnidae -lamprey -Lampridae -Lampris -Lampropeltis -Lampyridae -lancelet -lancetfish -langur -Laniidae -Lanius -lanternfish -Lanthanotidae -Lanthanotus -lapdog -lapin -lappet -lapwing -largemouth -Lari -Laricariidae -larid -Laridae -lark -Larus -larva -Larvacea -larvacean -Lasiocampa -lasiocampid -Lasiocampidae -Lasiurus -Lates -Latimeria -Latimeridae -Latinae -Latrodectus -layer -leafhopper -leatherjacket -Lebistes -lechwe -leech -Leiopelma -Leiopelmatidae -Leishmania -lemming -Lemmus -lemur -Lemuridae -Lemuroidea -Leonberg -Leontocebus -leopard -leopardess -Lepadidae -Lepas -Lepidochelys -Lepidocybium -Lepidoptera -Lepidosauria -Lepisma -Lepismatidae -Lepisosteidae -Lepisosteus -Lepomis -leporid -Leporidae -Leptinotarsa -leptocephalus -Leptodactylidae -Leptodactylus -Leptoglossus -Leptoptilus -leptospira -Leptotyphlopidae -Leptotyphlops -Lepus -lerot -Leuciscus -leucocytozoan -leveret -Lhasa -Lichanura -liger -Limacidae -Limanda -Limax -Limenitis -Limicolae -Limnocryptes -Limnodromus -Limosa -limpet -limpkin -Limulidae -Limulus -Lincoln -ling -lingcod -linnet -Liomys -lion -lioness -lionet -lionfish -lip -Liparididae -Liparis -Liposcelis -Lipotyphla -Lippizan -listeria -Lithodidae -Litocranius -littleneck -Littorina -Littorinidae -livestock -liza -lizard -lizardfish -llama -loach -Lobata -Lobipes -Lobotes -Lobotidae -lobster -locust -Locusta -Lofortyx -loggerhead -loin -loir -loligo -longhorn -longwool -lookdown -loon -Lophiidae -Lophius -Lophodytes -Lopholatilus -Lophophorus -lorica -Loricata -Loriinae -lorikeet -Lorisidae -lory -Lota -louse -louvar -lovebird -Loxia -Loxodonta -Loxostege -Lucanidae -Lucilia -Lucy -Lufengpithecus -lugworm -Lumpenus -lumpfish -lumpsucker -Lunda -lungfish -Luscinia -Lutjanidae -Lutjanus -Lutra -Lutrinae -Luvaridae -Luvarus -Lycaena -lycaenid -Lycaenidae -Lycaeon -Lycosa -Lycosidae -lygaeid -Lygaeidae -Lygus -Lymantria -lymantriid -Lymantriidae -lynx -lyrebird -Lyrurus -lyssavirus -Macaca -macaque -macaw -Machilidae -mackerel -Macrocephalon -Macrocheira -Macroclemys -Macrodactylus -Macronectes -Macropodidae -Macropus -Macrorhamphosidae -Macrotis -macrotus -Macrouridae -Macrozoarces -Madoqua -Madreporaria -Maeandra -maggot -Magicicada -magpie -maigre -Maja -Majidae -Makaira -mako -Malacanthidae -Malaclemys -Malaconotinae -Malacopterygii -Malacosoma -Malacostraca -malamute -male -maleo -malinois -mallard -Mallophaga -Mallotus -Malopterurus -Maltese -mamba -mammal -Mammalia -mammoth -Mammut -Mammuthus -Mammutidae -mamo -manakin -manatee -mandrill -Mandrillus -Manduca -mane -mangabey -Manidae -maniraptor -Maniraptora -Manis -manta -Manteodea -Mantidae -mantis -mantispid -Mantispidae -Mantophasmatodea -manul -Manx -mapinguari -mara -marabou -mare -margate -margay -Marginocephalia -markhor -marlin -marmoset -marmot -Marmota -marsupial -Marsupialia -marten -Martes -martin -massasauga -Masticophis -mastiff -Mastigophora -Mastigoproctus -mastodon -Mastotermes -Mastotermitidae -maverick -Maxostoma -Mayetiola -mayfly -Mazama -meadowlark -mealworm -mealybug -Mecoptera -mecopteran -medusa -meerkat -Megachile -Megachilidae -Megachiroptera -Megaderma -Megadermatidae -Megalobatrachus -Megalonychidae -Megaloptera -megalosaur -Megalosauridae -megapode -Megapodiidae -Megapodius -Megaptera -megatherian -Megatheriidae -Megatherium -Melanerpes -Melanitta -Melanogrammus -Melanoplus -Melanotis -Meleagrididae -Meleagris -Meles -Melinae -Meliphagidae -Mellivora -Melogale -Meloidae -Melolontha -Melolonthidae -Melophagus -Melopsittacus -Melospiza -Melursus -Membracidae -menhaden -Menippe -Menopon -Menotyphla -Menticirrhus -Menura -Menurae -Menuridae -Mephitinae -Mephitis -Mercenaria -merganser -Merginae -Mergus -merino -Meriones -Merlangus -Merluccius -Meropidae -Merops -Merostomata -merozoite -mesenchyme -Mesocricetus -mesoderm -mesohippus -metamere -Metatheria -metatherian -Metazoa -metazoan -methanogen -mew -microbe -Microcentrum -Microchiroptera -Micrococcaceae -Micrococcus -Microdesmidae -Microdipodops -Microhylidae -Micromyx -microorganism -Micropogonias -Micropterus -microsporidian -Microstomus -Microtus -Micruroides -Micrurus -midge -migrator -miller's-thumb -millipede -milt -Milvus -Mimidae -Mimus -mink -minnow -Miridae -Mirounga -mite -moa -Mobula -Mobulidae -mockingbird -mojarra -moke -mole -Molidae -mollie -Mollienesia -Mollusca -mollusk -moloch -Molossidae -Molothrus -molter -Molva -Momotidae -Momotus -monad -monal -monarch -Monera -moneran -mongoose -monitor -monkey -Monocanthidae -Monocanthus -Monochamus -Monodon -Monodontidae -monohybrid -Monomorium -Monotremata -monotreme -monster -moonfish -moorcock -moorhen -moray -Morgan -Morone -morula -Moschus -mosquito -mosquitofish -Motacilla -Motacillidae -moth -motmot -mouflon -mouse -mouser -mouthbreeder -mouthpart -mudder -mudskipper -Mugil -Mugilidae -Mugiloidea -muishond -mule -mullet -Mullidae -Mulloidichthys -mulloway -Mullus -mummichog -Muntiacus -muntjac -Muraenidae -Muridae -murine -Muroidea -murre -Mus -Musca -Muscardinus -Muscicapa -Muscicapidae -Muscidae -Muscivora -Muscoidea -muskellunge -muskrat -Musophaga -Musophagidae -mussel -mustang -Mustela -Mustelidae -Mustelus -mutant -Mutillidae -muzzle -Mya -Myaceae -Myacidae -Myadestes -Mycetophilidae -mycobacteria -Mycobacteriaceae -mycoplasma -Mycoplasmataceae -Mycoplasmatales -Mycrosporidia -Mycteria -Mycteroperca -Myctophidae -Myliobatidae -mylodon -mylodontid -Mylodontidae -myna -Myocastor -Myomorpha -Myopus -Myotis -myriapod -Myrmecia -Myrmecobius -Myrmecophaga -Myrmecophagidae -myrmecophile -Myrmeleon -Myrmeleontidae -Mysidacea -Mysidae -Mysis -Mysticeti -Mytilidae -Mytilus -Myxine -Myxinidae -Myxiniformes -Myxinikela -myxobacteria -Myxocephalus -Myxophyceae -Myxosporidia -myxosporidian -myxovirus -Naemorhedus -Naja -nanny -nanomia -napu -narwhal -Nasalis -Nasua -Natantia -Naticidae -Natrix -natterjack -Naucrates -Nautilidae -Necturus -needlefish -Negaprion -nekton -Nematocera -Nematoda -nematode -Nemertea -Neoceratodus -Neofiber -Neomys -Neophron -Neotoma -Nepa -Nephrops -Nephropsidae -Nepidae -nerita -neritid -Neritidae -neritina -Nerodia -Nesokia -nester -nestling -Nestor -Neuroptera -neuropteron -Neurotrichus -Newfoundland -newt -nighthawk -nightingale -nilgai -Nimravus -nit -Nitella -Nitrobacter -Nitrobacteriaceae -nitrobacterium -nitrosobacteria -Nitrosomonas -noctiluca -Noctua -Noctuidae -nomia -nonstarter -nostoc -Nostocaceae -Notechis -Notemigonus -nothosaur -Nothosauria -notochord -Notomys -Notonecta -Notonectidae -Notophthalmus -notornis -Notoryctidae -Notoryctus -Notostraca -Notropis -Nucifraga -Nuda -Nudibranchia -numbat -Numenius -Numida -Numididae -nummulite -Nummulitidae -nutcracker -nuthatch -nyala -Nyctanassa -Nyctereutes -Nycticebus -Nycticorax -Nyctimene -nymph -nymphalid -Nymphalidae -Nymphalis -Nymphicus -oarfish -Oceanites -ocelot -Ochotona -Ochotonidae -octopod -Octopoda -Octopodidae -octopus -Ocyurus -Odobenidae -Odobenus -Odocoileus -Odonata -odonate -Odontoceti -Odontophorus -Oecanthus -Oedogoniaceae -Oedogoniales -Oedogonium -Oenanthe -Oestridae -Oestrus -Ogcocephalidae -oilbird -oilfish -okapi -Okapia -Oligochaeta -oligochaete -Oligoplites -olm -Omaha -ommastrephes -omnivore -Omomyid -onager -Oncorhynchus -Ondatra -Oniscidae -Oniscus -Onychogalea -Onychomys -Onychophora -onychophoran -opah -openbill -operculum -Opheodrys -Ophidiidae -Ophiodon -Ophiodontidae -Ophiophagus -Ophisaurus -Ophiurida -Ophiuroidea -Opisthobranchia -Opisthocomidae -Opisthocomus -Opisthognathidae -opossum -orangutan -Orchestia -Orchestiidae -Orcinus -Oreamnos -Orectolobidae -Orectolobus -Oreortyx -Oriolidae -Oriolus -ormer -Ornithischia -ornithischian -ornithomimid -Ornithomimida -ornithopod -Ornithorhynchidae -Ornithorhynchus -orphan -Orpington -Ortalis -orthomyxovirus -Orthopristis -Orthoptera -Orthotomus -ortolan -ortygan -Orycteropodidae -Orycteropus -Oryctolagus -oryx -Oryzomys -Oscillatoriaceae -oscine -Oscines -Osmeridae -Osmerus -osprey -Ostariophysi -Osteichthyes -Osteoglossidae -Osteoglossiformes -osteostracan -Osteostraci -Ostraciidae -Ostracoda -ostracoderm -Ostracodermi -Ostrea -Ostreidae -ostrich -Otaria -Otariidae -Otides -Otididae -Otis -otter -otterhound -Otus -Ouranopithecus -Ovalipes -ovenbird -Ovibos -ovipositor -oviraptorid -Ovis -owl -owlet -ox -oxtail -Oxybelis -Oxylebius -Oxyura -Oxyuranus -Oxyuridae -oyster -oystercatcher -paca -pacer -Pachycephala -pachycephalosaur -pachyderm -packhorse -packrat -pad -Padda -paddlefish -pademelon -Pagellus -Pagophila -Pagophilus -Pagrus -Paguridae -Pagurus -Palaemon -Palaemonidae -Paleacrita -palfrey -Palinuridae -Palinurus -palometa -palomino -Pan -Pandion -Pandionidae -pangolin -Panonychus -Panorpidae -panther -Panthera -Pantotheria -papillon -Papio -papovavirus -Paprilus -Paracheirodon -Paradisaeidae -Paradoxurus -parakeet -Paralichthys -Paralithodes -paramecium -paramyxovirus -Paranthias -Paranthropus -parapodium -Parascalops -parasite -Parazoa -Paridae -Parophrys -parr -parrot -parrotfish -partridge -Parula -Parulidae -Parus -parvovirus -Passer -Passeridae -Passeriformes -Passerina -passerine -pastern -Pastor -patas -Patella -Patellidae -pathogen -Pauropoda -Pavo -paw -peachick -peacock -peafowl -peahen -pearlfish -peba -peccary -Pectinibranchia -Pectinidae -Pediculati -Pediculidae -Pediculus -Pedioecetes -Pedionomus -Pedipalpi -peeper -Pekinese -Pelecanidae -Pelecaniformes -Pelecanoididae -Pelecanus -pelican -pellicle -Pelobatidae -peludo -pelycosaur -Pelycosauria -Pembroke -Pempheridae -pen -Peneidae -Penelope -Peneus -penguin -Pennatula -Pennatulidae -pennon -pentail -Pentastomida -Peramelidae -Perca -perch -Percheron -Percidae -Perciformes -Percina -Percoidea -Percophidae -Perdicidae -Perdix -peregrine -peridinian -Peridiniidae -Peridinium -Periophthalmus -Peripatidae -Peripatopsidae -Peripatopsis -Periplaneta -Perisoreus -Perissodactyla -Peristediinae -Peristedion -peristome -periwinkle -permit -Pernis -Perodicticus -Perognathus -Peromyscus -pest -pet -Petaurista -Petauristidae -Petaurus -petrel -Petrogale -Petromyzon -Petromyzoniformes -Petromyzontidae -pewee -Pezophaps -Phacochoerus -Phaeophyceae -Phaeophyta -Phaethon -Phaethontidae -Phalacrocoracidae -Phalacrocorax -Phalaenoptilus -phalanger -Phalangeridae -Phalangida -Phalangiidae -Phalangium -phalarope -Phalaropidae -Phalaropus -Pharomacrus -Phascogale -Phascolarctos -phasianid -Phasianidae -Phasianus -phasmid -Phasmida -Phasmidae -Phasmidia -pheasant -phenacomys -Philaenus -Philohela -Philomachus -Philophylla -Phlebotomus -Phoca -Phocidae -Phocoena -phoebe -Phoenicopteridae -Phoeniculidae -Phoeniculus -Phoenicurus -Pholadidae -Pholas -Pholidae -Pholidota -Pholis -phoronid -Phoronida -Photoblepharon -Phoxinus -phragmocone -Phrynosoma -Phthiriidae -Phthirius -Phthorimaea -phycobilin -phycocyanin -phycoerythrin -Phyllidae -Phyllium -Phyllorhynchus -Phylloscopus -Phyllostomidae -Phyllostomus -Phylloxera -Phylloxeridae -physa -Physalia -Physeter -Physeteridae -Physidae -Phytomastigina -phytoplankton -Pica -Picariae -pichiciago -Picidae -Piciformes -pickerel -Picoides -picornavirus -piculet -Picumnus -Picus -piddock -pierid -Pieridae -Pieris -pigeon -pigfish -piglet -pika -pike -pikeblenny -pike-perch -pilchard -pilotfish -pilus -pinche -Pinctada -Pineus -pinfish -Pinguinus -Pinicola -Pinnipedia -Pinnotheres -Pinnotheridae -pinscher -pintail -pinto -pinworm -Pipa -pipefish -Pipidae -Pipile -Pipilo -pipistrelle -Pipistrellus -pipit -Pipra -Pipridae -Piranga -piranha -piroplasm -pisanosaur -Pisces -Pithecanthropus -Pithecia -pitta -Pittidae -Pituophis -Pitymys -placental -placoderm -Placodermi -Placuna -plaice -planarian -plankton -Planococcus -planula -Plasmodiidae -plasmodium -plastron -Platalea -Plataleidae -Platanistidae -Platichthys -platy -Platycephalidae -Platyctenea -platyctenean -Platyhelminthes -Platypoecilus -platypus -Platyrrhini -Plautus -Plecoptera -Plecotus -plectognath -Plectognathi -Plectophera -Plectrophenax -Plesianthropus -plesiosaur -Plesiosauria -Plethodon -Plethodontidae -Pleurobrachia -Pleurobrachiidae -pleurodont -Pleuronectes -Pleuronectidae -Plicatoperipatus -Ploceidae -Ploceus -plover -plumule -Pluvialis -Pluvianus -pneumococcus -poacher -pochard -Podargidae -Podargus -Podiceps -Podicipedidae -Podicipitiformes -Podilymbus -Poeciliidae -Poecilocapsus -Poecilogale -Poephila -pogge -Pogonophora -poikilotherm -pointer -polecat -Polioptila -poliovirus -Polistes -poll -Pollachius -pollack -pollard -pollinator -Polyangiaceae -Polyangium -Polyborus -Polychaeta -polychaete -Polycirrus -Polydactylus -Polyergus -Polygonia -Polymastigina -polymastigote -polymorph -Polynemidae -Polyodon -Polyodontidae -polyoma -polyp -Polypedates -Polypedatidae -Polyplacophora -polyploid -Polyprion -Pomacanthus -Pomacentridae -Pomacentrus -Pomatomidae -Pomatomus -Pomeranian -pomfret -Pomolobus -Pomoxis -pompano -pompon -Pongidae -Pongo -pony -pooch -poodle -Pooecetes -poorwill -Popillia -popinjay -porbeagle -Porcellio -Porcellionidae -porcupine -porcupinefish -porgy -Porifera -porker -porkfish -Poronotus -Porphyra -Porphyrio -Porphyrula -porpoise -Portunidae -Portunus -Porzana -Potamogalidae -Potamophis -Potoroinae -potoroo -Potorous -Potos -potto -poxvirus -prancer -pratincole -Praunus -prawn -praya -predator -prehensor -Presbytes -prey -Priacanthidae -Priacanthus -pricket -prickleback -primary -primate -Primates -Prinia -Priodontes -Prionace -Prionotus -Pristidae -Pristis -probiotic -Proboscidea -proboscidean -proboscis -Procavia -Procaviidae -Procellaria -Procellariidae -Procellariiformes -Prociphilus -Procnias -proconsul -Procyon -procyonid -Procyonidae -Progne -prokaryote -pronghorn -Prosauropoda -prosimian -Prosimii -Prosopium -Proteidae -Proteles -Proterochampsa -Proteus -prothorax -protist -Protista -protoavis -protoceratops -protoctist -Protoctista -protohippus -Prototheria -prototherian -Protozoa -protozoan -Protura -proturan -Prunella -Prunellidae -psalterium -Psaltriparus -Psenes -Psephurus -Psetta -Psettichthys -Pseudacris -Pseudaletia -Pseudechis -Pseudemys -Pseudococcidae -Pseudococcus -pseudomonad -Pseudomonadales -Pseudomonas -Pseudomonodaceae -Pseudopleuronectes -pseudopod -Pseudoryx -Psithyrus -Psittacidae -Psittaciformes -psittacosaur -Psittacula -Psittacus -psocid -Psocidae -Psocoptera -Psophia -Psophiidae -psychodid -Psychodidae -Psyllidae -ptarmigan -Pteriidae -Pternohyla -Pterocles -Pteroclididae -Pterocnemia -pterodactyl -Pterodactylidae -Pterodactylus -Pterois -Pteropus -pterosaur -Pterosauria -Ptilocercus -Ptilocrinus -Ptilonorhynchidae -Ptilonorhynchus -Ptloris -Ptyas -Ptychozoon -puddingwife -puffbird -puffer -puffin -Puffinus -pug -puku -Pulex -Pulicidae -pullet -Pulmonata -pumpkinseed -punkie -pup -pupa -puppy -Pycnogonida -Pygopodidae -Pygopus -Pygoscelis -Pylodictus -pyralid -Pyralidae -Pyralis -Pyrausta -Pyrocephalus -Pyrophorus -Pyrrhocoridae -Pyrrhula -pyrrhuloxia -Pyrrophyta -python -Pythonidae -Pythoninae -quack-quack -quadruped -quagga -quahog -quail -queen -quetzal -quill -Quiscalus -rabbit -rabbitfish -raccoon -racehorse -racer -racerunner -Rachycentridae -Rachycentron -Radiolaria -radiolarian -rail -Raja -Rajidae -Rajiformes -Rallidae -ram -Rambouillet -Ramphastidae -Ramphomicron -Rana -Ranatra -Rangifer -Ranidae -Raphicerus -Raphidae -Raphidiidae -Raphus -Raptores -rat -ratel -Ratitae -ratite -rattle -rattlesnake -Rattus -raven -ray -razorback -razorbill -recombinant -Recurvirostra -Recurvirostridae -redbone -redfish -redhead -redhorse -redpoll -redshank -redstart -redtail -Reduviidae -redwing -reeve -Regalecidae -Reglaecus -Regulus -Reithrodontomys -relative -Remilegia -remora -remount -Reoviridae -reovirus -Reptantia -reptile -Reptilia -Reticulitermes -reticulum -retriever -retrovirus -Reynard -Rhabdoviridae -rhabdovirus -Rhagoletis -rhea -Rheidae -Rheiformes -rhesus -Rhincodon -Rhincodontidae -Rhinobatidae -rhinoceros -Rhinocerotidae -Rhinolophidae -Rhinonicteris -Rhinoptera -Rhinotermitidae -rhinovirus -Rhizobiaceae -Rhizobium -rhizopod -Rhizopoda -Rhodophyceae -Rhodophyta -Rhodymenia -Rhodymeniaceae -Rhyacotriton -Rhynchocephalia -Rhynchoelaps -ribbonfish -Richmondena -rickettsia -Rickettsiaceae -Rickettsiales -ridgeling -ridley -riflebird -ringdove -ringhals -ringlet -ringtail -Riparia -Rissa -rivulus -roach -roadkill -roadrunner -roan -robalo -robin -Roccus -rockfish -rockweed -rod -rodent -Rodentia -Rodolia -roe -roebuck -roller -rook -rorqual -rosefish -rotavirus -rotifer -Rotifera -Rottweiler -royal -rudapithecus -rudd -rudderfish -ruff -rumen -ruminant -Ruminantia -runner -Rupicapra -Rupicola -Rutilus -Rynchopidae -Rynchops -Rypticus -sable -saddle -saddlebill -sagitta -Sagittariidae -Sagittarius -saiga -sailfish -sailor's-choice -Saimiri -saki -salamander -Salamandra -Salamandridae -Salientia -Salmo -salmon -salmonella -salmonid -Salmonidae -salp -Salpidae -Salpinctes -Saluki -Salvelinus -sambar -Samia -Samoyed -sanderling -sandfish -sandgrouse -sandpiper -sapsucker -Sarcocystis -Sarcodina -sarcodinian -Sarcophaga -Sarcophilus -Sarcoptes -Sarcoptidae -Sarcorhamphus -Sarcosporidia -sarcosporidian -Sarda -Sardina -sardine -Sardinops -sassaby -Saturnia -saturniid -Saturniidae -Satyridae -Sauria -saurian -Saurischia -saurischian -Sauromalus -sauropod -Sauropoda -Sauropodomorpha -Sauropterygia -Saurosuchus -saury -sawfish -sawfly -sawyer -Saxicola -Sayornis -scad -scale -scallop -Scandentia -Scaphiopus -scaphopod -Scaphopoda -scapular -scarab -Scarabaeidae -Scardinius -Scaridae -Scartella -scaup -scavenger -Sceliphron -Sceloglaux -Sceloporus -schipperke -Schistosoma -Schistosomatidae -schistosome -Schizomycetes -Schizophyta -Schizopoda -schnauzer -schoolmaster -Sciaena -Sciaenidae -Sciaenops -Sciaridae -Scincella -Scincidae -Scincus -scissortail -Sciuridae -Sciuromorpha -Sciurus -sclerite -Scleropages -Scleroparei -Scolopacidae -Scolopax -Scolytidae -Scolytus -Scomber -Scomberesocidae -Scomberesox -Scomberomorus -Scombridae -scombroid -Scombroidea -Scophthalmus -Scorpaena -scorpaenid -Scorpaenidae -scorpaenoid -Scorpaenoidea -scorpion -scorpionfish -Scorpionida -scoter -screamer -scrod -scrubbird -sculpin -scup -scut -scute -Scutigera -Scutigerella -Scutigeridae -Scyliorhinidae -Scyphozoa -scyphozoan -seabird -seagrass -seahorse -seal -searcher -seashell -seasnail -seaweed -Sebastodes -Secretariat -Seismosaurus -Seiurus -Selar -Selenarctos -Selene -Sennenhunde -Sepia -Sepiidae -serin -Serinus -Seriola -Seriphus -serotine -serow -Serpentes -Serranidae -Serranus -Serrasalmus -Sertularia -sertularian -serval -seta -Setophaga -setter -shad -shanny -shark -sharksucker -shearwater -sheep -sheepshead -sheep-tick -sheldrake -shelduck -shell -shigella -Shih-Tzu -shiner -shipworm -shire -shoebill -shorebird -shoveler -shovelhead -shrew -shrike -shrimp -shrimpfish -Sialia -Sialidae -Sialis -siamang -sidewinder -sierra -Sigmodon -sild -silkworm -Sillaginidae -Sillago -silurid -Siluridae -Siluriformes -Silurus -silverback -silverfish -silversides -silverspot -Silvia -simian -Simuliidae -Simulium -Sinanthropus -Sinornis -siphon -Siphonaptera -Siphonophora -siphonophore -Sipuncula -sire -siren -Sirenia -Sirenidae -siskin -Sistrurus -Sisyridae -Sitophylus -Sitotroga -Sitta -Sittidae -Sivapithecus -skate -skimmer -skink -skipjack -skua -skunk -skylark -sleeper -slider -sloth -slug -smallmouth -smelt -smew -Smiledon -smoothhound -snail -snailfish -snake -snakebird -snakeblenny -snakefly -snapper -snipe -snipefish -snook -snout -soapfish -sockeye -solan -soldier -soldierfish -sole -Solea -Soleidae -Solenichthyes -Solenidae -solenogaster -Solenogastres -Solenopsis -solitaire -Somateria -songbird -Sonora -Sorex -Soricidae -sorrel -sow -spadefish -spadefoot -Spalacidae -Spalax -spaniel -sparid -Sparidae -sparling -sparrow -spat -Spatangoida -spawn -spawner -spearfish -Sphecidae -Sphecius -Sphecoidea -Sphecotheres -Spheniscidae -Sphenisciformes -Spheniscus -Sphenodon -Sphingidae -Sphyraena -Sphyraenidae -Sphyrapicus -Sphyrna -Sphyrnidae -spider -Spilogale -spine -Spinus -Spirillaceae -spirillum -Spirochaeta -Spirochaetaceae -Spirochaetales -spirochete -spirogyra -spirula -Spirulidae -spitz -Spizella -Spodoptera -sponge -spongefly -spoonbill -Sporozoa -sporozoan -sporozoite -spouter -springbok -springer -Spyeria -squab -Squalidae -Squalus -squama -Squamata -squaretail -Squatina -Squatinidae -squid -squilla -Squillidae -squirrel -squirrelfish -stablemate -stag -staghound -stalking-horse -stallion -Staphylinidae -staphylococcus -starfish -stargazer -starling -staurikosaur -stayer -Steatornis -Steatornithidae -steed -steenbok -steeplechaser -Steganopus -Stegocephalia -stegosaur -Stenopelmatidae -Stenopelmatus -stenopterygius -Stenotomus -stentor -stepper -Stercorariidae -Stercorarius -Stereospondyli -Sterna -Sterninae -Sternotherus -Stichaeidae -stickleback -sticktight -Stictomys -Stictopelia -stifle -stilt -stinger -stingray -stirk -Stizidae -Stizostedion -stoat -stocker -stomatopod -Stomatopoda -stonechat -stonefish -stonefly -stonewort -Storeria -stork -strawworm -stray -Strepera -Strepsirhini -streptobacillus -streptococcus -streptomyces -Streptomycetaceae -Streptopelia -Strigidae -Strigiformes -Strix -Stromateidae -Strombidae -Strombus -Struthio -struthiomimus -Struthionidae -Struthioniformes -Strymon -stud -stunt -sturgeon -Sturnella -Sturnidae -Sturnus -style -stylet -styracosaur -sucker -suckling -Suidae -Sula -Sulidae -sunfish -superbug -surfbird -surfperch -surgeonfish -Suricata -suricate -Surnia -survivor -Sus -suslik -swallow -swan -sweeper -swift -swiftlet -swimmeret -swine -swordfish -swordtail -Sylviidae -Sylviinae -Sylvilagus -Symphalangus -Symphyla -Synagrops -Synanceja -synapsid -Synapsida -Synaptomys -Synentognathi -Synercus -Syngnathidae -Syngnathus -Synodontidae -syrinx -Syrrhaptes -Tabanidae -tabby -Tachinidae -Tachyglossidae -Tachyglossus -Tachypleus -Tadarida -Tadorna -tadpole -taenia -Taeniidae -taguan -tail -tailorbird -taipan -takin -talapoin -talon -Talpidae -tamandua -tamarau -tamarin -Tamias -Tamiasciurus -tanager -tang -Tantilla -tapeworm -tapir -Tapiridae -Tapirus -tarantula -Tardigrada -tardigrade -Taricha -tarpan -tarpon -tarsier -Tarsiidae -Tarsioidea -Tarsius -tatouay -tattler -Taurotragus -tautog -Tautoga -Tautogolabrus -Taxidea -Tayassu -Tayassuidae -tayra -teal -teg -Teiidae -teju -Teleostei -Telosporidia -Temnospondyli -tench -Tenebrionidae -tenrec -Tenrecidae -tentacle -Tentaculata -Tenthredinidae -Terebella -Terebellidae -Teredinidae -teredo -Termes -termite -Termitidae -tern -Terrapene -terrapin -terrier -test -Testacea -testacean -Testudinidae -Testudo -tetra -Tetragonurus -tetrahymena -Tetranychidae -Tetrao -Tetraodontidae -Tetraonidae -tetrapod -Tetrapturus -Tettigoniidae -Thalarctos -Thalassoma -Thaliacea -Thamnophilus -Thamnophis -theca -thecodont -Thecodontia -Theraphosidae -therapsid -Therapsida -Theridiidae -thermoacidophile -Thermobia -theropod -Theropoda -thickhead -thiobacillus -thiobacteria -Thiobacteriaceae -Thomomys -thorax -thornbill -thoroughbred -thrasher -Thraupidae -threadfin -threadfish -thresher -Threskiornis -Threskiornithidae -Thripidae -thrips -throat -thrush -Thryothorus -Thunnus -thylacine -Thylacinus -Thylogale -Thyreophora -thysanopter -Thysanoptera -Thysanura -Tibicen -Tichodroma -tick -tiercel -tiger -tiglon -tigress -Tilapia -tilefish -Timalia -Timaliidae -timucu -Tinamidae -Tinamiformes -tinamou -Tinca -Tinea -tineid -Tineidae -tineoid -Tineoidea -Tineola -Tingidae -Tipulidae -titanosaur -Titanosauridae -Titanosaurus -titi -titmouse -toadfish -Todidae -Todus -tody -Togaviridae -Tolypeutes -tom -Tomistoma -tomtate -tonguefish -tooth -topknot -topminnow -Torpedinidae -Torpediniformes -tortoise -tortoiseshell -tortricid -Tortricidae -toucan -toucanet -touraco -towhee -toxicognath -Toxostoma -Toxotes -Toxotidae -Trachinotus -Trachipteridae -Trachipterus -trachodon -Trachurus -Tragelaphus -tragopan -Tragulidae -Tragulus -treehopper -Trematoda -trepang -treponema -Treponemataceae -Triaenodon -Triakidae -Trialeurodes -Triatoma -Tribolium -Tribonema -Tribonemaceae -triceratops -Trichechidae -Trichechus -trichina -Trichiuridae -trichodesmium -Trichodontidae -Trichoglossus -trichomonad -Trichophaga -Trichoptera -Trichosurus -Trichys -Tridacna -Tridacnidae -Triga -triggerfish -Triglidae -Triglinae -trilobite -Trimorphodon -Trinectes -Tringa -Trionychidae -Trionyx -Triopidae -Triops -tripletail -triton -Triturus -Trochilidae -Trogium -Troglodytes -Troglodytidae -trogon -Trogonidae -Trogoniformes -Trombicula -trombiculid -Trombiculidae -trombidiid -Trombidiidae -trophoblast -trophozoite -Tropidoclonion -trotter -trout -trumpeter -trumpetfish -Trypetidae -tuatara -Tubulidentata -tuft -tumblebug -tuna -Tunga -tunicate -Tupaia -Tupaiidae -Tupinambis -Turbellaria -turbot -Turdidae -Turdinae -Turdus -turkey -Turnicidae -Turnix -turnstone -Tursiops -turtle -turtledove -tusk -tusker -tussah -twitterer -Tylenchidae -Tylenchus -Tympanuchus -Typhlopidae -Tyranni -tyrannid -Tyrannidae -tyrannosaur -Tyrannus -Tyto -Tytonidae -uakari -Uca -udder -Uintatheriidae -Uintatherium -Ulva -Ulvaceae -Ulvales -Ulvophyceae -Uma -Umbrina -undercoat -underpart -underwing -Unguiculata -unguiculate -Ungulata -ungulate -Unio -Unionidae -Upupa -Upupidae -Uranoscopidae -Uria -urial -urochord -Urochordata -Urocyon -urodele -Urodella -Urophycis -Uropsilus -uropygium -Urosaurus -Ursidae -Ursus -Uta -utahraptor -valve -vane -Vanellus -Vanessa -vaquita -Varanidae -Varanus -varmint -vector -vedalia -veery -vein -velociraptor -Veneridae -vent -Venus -verdin -vermin -Vertebrata -vertebrate -vervet -vesiculovirus -Vespa -Vespertilio -Vespertilionidae -vespid -Vespidae -Vespula -vibrio -viceroy -Vicugna -vicuna -Vidua -villus -vinegarroon -viper -Vipera -Viperidae -vireo -Vireonidae -virion -viroid -virus -viscacha -Viverra -Viverricula -Viverridae -viverrine -vixen -vizsla -vole -Volvocaceae -Volvocales -Volvox -Vombatidae -vorticella -Vulpes -Vultur -vulture -wagtail -wahoo -wallaby -walleye -walrus -wapiti -warble -warbler -warhorse -warrigal -warthog -wasp -watchdog -waterbuck -waterdog -waterfowl -waxwing -weakfish -weasel -weaver -web -webfoot -webworm -weevil -Weimaraner -weka -Welsh -wether -whale -wheatear -wheatworm -whelk -whiff -whinchat -whippet -whippoorwill -whip-scorpion -whip-snake -whiptail -Whirlaway -whisker -whitebait -whitefish -whitefly -whiting -whooper -whydah -widgeon -wiggler -wildcat -willet -windowpane -wing -wirehair -wireworm -wisent -wishbone -withers -wolf -wolffish -wolfhound -wolverine -wombat -woodborer -woodcock -wood-frog -woodhewer -woodlouse -woodpecker -woodworm -wool -worker -workhorse -world -worm -wrack -wrasse -wren -wren-tit -wrymouth -wryneck -xanthomonad -Xanthomonas -Xanthophyceae -Xantusiidae -Xenarthra -Xenicidae -Xenicus -Xenopodidae -Xenopus -Xenorhyncus -Xenosauridae -Xenosaurus -Xerobates -Xiphias -Xiphiidae -Xiphosura -Xylocopa -Xyphophorus -yak -yearling -yellowfin -yellowhammer -yellowlegs -yellowtail -yellowthroat -yolk -young -Zaglossus -Zalophus -Zapodidae -Zapus -zebra -zebu -Zeidae -Zenaidura -Zeomorphi -Zeus -Zinjanthropus -Ziphiidae -Zoarces -Zoarcidae -Zonotrichia -zooid -Zoomastigina -zoomastigote -zoophyte -zooplankton -zoril -Zygnema -Zygnemataceae -Zygnematales -Zygoptera diff --git a/static/text/howmany.py b/static/text/howmany.py deleted file mode 100755 index 713774e..0000000 --- a/static/text/howmany.py +++ /dev/null @@ -1,25 +0,0 @@ -adjectives = {} -with open('adjectives','r') as f: - for line in f: - word = line.strip().lower() - if word[0] not in adjectives: - adjectives[word[0]] = [] - adjectives[word[0]].append(word) - -print(len(adjectives.keys())) - -animals = {} -for aword in open('animals','r').read().split(','): - word = aword.strip().lower() - if word[0] not in animals: - animals[word[0]] = [] - animals[word[0]].append(word) - -print(len(animals)) - -i = 0 -for key in adjectives.keys(): - if key in animals and key in adjectives: - i = i + len(adjectives[key])*len(animals[key]) - -print(i) diff --git a/static/text/robots.txt b/static/text/robots.txt deleted file mode 100644 index e0c6441..0000000 --- a/static/text/robots.txt +++ /dev/null @@ -1,4 +0,0 @@ -User-agent: * -Disallow: / -Allow: /Help/view -Allow: /sitemap.xml diff --git a/static/text/sitemap.xml b/static/text/sitemap.xml deleted file mode 100755 index 726c9c7..0000000 --- a/static/text/sitemap.xml +++ /dev/null @@ -1,9 +0,0 @@ - -
-
- https://awwkoala.com/Help/view
- 2016-03-18
- monthly
- 1.0
-
-
diff --git a/supervisord.conf b/supervisord.conf
deleted file mode 100644
index 7fc9239..0000000
--- a/supervisord.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:cowyoserver]
-directory=/root/cowyo
-command=/root/cowyo/cowyo -db /data/cowyo.db 127.0.0.1:8003
-priority=1
-stdout_logfile=/root/cowyo/log.out
-stdout_logfile_maxbytes=0
-stderr_logfile=/root/cowyo/log.err
-stderr_logfile_maxbytes=0
\ No newline at end of file
diff --git a/templates/aboutpage.md b/templates/aboutpage.md
deleted file mode 100644
index 7c8f072..0000000
--- a/templates/aboutpage.md
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-# CowYo
-## Collections of Organized Words You Open
-
-
-This is a self-contained notepad webserver that makes sharing easy and _fast_. The most important feature here is *simplicity*. There are many other features as well including versioning, page locking, self-destructing messages, encryption, math support, syntax highlighting, command line support, content-delivery, and listifying. Read on to learn more about the features. **CowYo** is also [Open Source](https://github.com/schollz/cowyo).
-
-## Features
-**Simplicity**. The philosophy here is to *just type*. To jot a note, simply load the page at [`/`](/) and just start typing. No need to press edit, the browser will already be focused on the text. No need to press save - it will automatically save when you stop writing. The URL at [`/`](/) will redirect to an easy-to-remember name that you can use to reload the page at anytime, anywhere. But, you can also use any URL you want, e.g. [`/AnythingYouWant`](/AnythingYouWant). All pages can be rendered into HTML by adding `/view`. For example, the page [`/AnythingYouWant`](/AnythingYouWant) is rendered at [`/AnythingYouWant/view`](/AnythingYouWant/view). You can write in HTML or [Markdown](https://daringfireball.net/projects/markdown/) for page rendering. To quickly link to `/view` pages, just use `[[AnythingYouWant]]`.
-
-
-
-
- -**Listifying**. If you are writing a list and you want to tick off things really easily, just add `/list`. For example, after editing [`/grocery`](/grocery), goto [`/grocery/list`](/grocery/list). In this page, whatever you click on will be struck through and moved to the end. This is helpful if you write a grocery list and then want to easily delete things from it. - - - -
- -**Page locking**. Pages can be locked by providing a password to prevent further editing. The whole version tree will still be available. _Note_: This is not available for list mode. - - - - - -
- -**Automatic versioning**. All previous versions of all notes are stored and can be accessed by adding `?version=X` onto `/view` or `/edit`. If you are on the `/view` or `/edit` pages the menu below will show the most substantial changes in the history. Note, only the _current_ version can be edited (no branching allowed, yet). - - - -
- -**Self-destructing messages**. You can write a message that will delete itself when a user loads it (in any view). Useful for transmitting sensitive information. To use, simply add a line somewhere that says only "`self-destruct`". - - - -
- -**Security**. HTTPS support is provided and everything is sanitized to prevent XSS attacks. Though all URLs are publicly accessible, you are free to obfuscate your website by using an obscure/random address (read: the site is still publicly accessible, just hard to find!). In addition to TLS support, you can PGP-encrypt your messages using a passphrase (_Note: This will delete the version tree_). - - - -
- -**Syntax highlighting**. If you use a coding extension (e.g. .py, .md, .txt, .js, ...) then you'll automatically see syntax highlighting and line numbers. - - - -
- -**CLI tools**. Want to upload/download from the command line? Its super easy. Upload/download files using `curl` with a simple command: -```bash -$ echo "Hello, world!" > hi.txt -$ curl -L --upload-file hi.txt cowyo.com - File uploaded to http://cowyo.com/hi.txt -$ curl -L cowyo.com/test.txt - Hello, world! -``` -or just skip the file-creation step and let `cowyo` figure out a name for you: -```bash -$ echo "Wow, so easy" | curl -L --upload-file "-" cowyo.com - File uploaded to http://cowyo.com/CautiousCommonLoon -$ curl -L cowyo.com/CautiousCommonLoon - Wow, so easy -``` -
- - -**Keyboard Shortcuts**. Quickly transition between Edit/View/List by using `Ctl+Shift+E` to Edit, `Ctl+Shift+Z` to View, and `Ctl+Shift+L` to Listify. - -**Admin controls**. The Admin can view/delete all the documents by setting the `-a YourAdminKey` when starting the program. Then the admin has access to the `/ls/YourAdminKey` to view and delete any of the pages. - -**Math support**. Math is supported with [Katex](https://github.com/Khan/KaTeX) using `$\frac{1}{2}$` for inline equations and `$$\frac{1}{2}$$` for regular equations. - - -# Contact -Any other comments, questions or anything at all, just tweet me @zack_118 - -Have fun. - -**Powered by Raspberry Pi, Go, and NGINX** - -   diff --git a/templates/base.tmpl b/templates/base.tmpl deleted file mode 100644 index 76d3920..0000000 --- a/templates/base.tmpl +++ /dev/null @@ -1,89 +0,0 @@ - -{{define "header"}} - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{end}} diff --git a/templates/index.tmpl b/templates/index.tmpl deleted file mode 100644 index ec40555..0000000 --- a/templates/index.tmpl +++ /dev/null @@ -1,369 +0,0 @@ - - - - -{{ .Title }}
-
- {{ template "header" }}
-
-
-
-
- {{if .NoEdit}} {{else}}
- {{end}}
-
-
-
-
-
-
-
-
- {{ if .Coding }}
-
-
-
- {{ if eq .CodeType "htmlmixed" }}
-
-
-
- {{ end }}
- {{ end }}
-
- {{ if eq .Suffix "txt" }}
- {{ .Title }}
- {{ template "header" }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ .Title }}
-
- {{ template "header" }}
-
-
-
-
-
-
-{{ if .Coding }}
-
-{{ end }}
-
-
-
-{{ if .Coding }}
-
-
-
-{{ if eq .CodeType "htmlmixed" }}
-
-
-
-{{ end }}
-{{ end }}
-
-
-
-
-
-
-
-{{ if .Coding }}
-
- = 0; {
- if remain == 0 {
- cache, remain = src.Int63(), letterIdxMax
- }
- if idx := int(cache & letterIdxMask); idx < len(letterBytes) {
- b[i] = letterBytes[idx]
- i--
- }
- cache >>= letterIdxBits
- remain--
- }
-
- return string(b)
-}
-
-// GetLocalIP returns the local ip address
-func GetLocalIP() string {
- addrs, err := net.InterfaceAddrs()
- if err != nil {
- return ""
- }
- bestIP := ""
- for _, address := range addrs {
- // check the address type and if it is not a loopback the display it
- if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
- if ipnet.IP.To4() != nil {
- return ipnet.IP.String()
- }
- }
- }
- return bestIP
-}
-
-// HashPassword generates a bcrypt hash of the password using work factor 14.
-// https://github.com/gtank/cryptopasta/blob/master/hash.go
-func HashPassword(password []byte) ([]byte, error) {
- return bcrypt.GenerateFromPassword(password, 14)
-}
-
-// CheckPassword securely compares a bcrypt hashed password with its possible
-// plaintext equivalent. Returns nil on success, or an error on failure.
-// https://github.com/gtank/cryptopasta/blob/master/hash.go
-func CheckPasswordHash(hash, password []byte) error {
- return bcrypt.CompareHashAndPassword(hash, password)
-}
diff --git a/vendor/github.com/boj/redistore/.gitignore b/vendor/github.com/boj/redistore/.gitignore
deleted file mode 100644
index 5ca0973..0000000
--- a/vendor/github.com/boj/redistore/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.DS_Store
-
diff --git a/vendor/github.com/boj/redistore/LICENSE b/vendor/github.com/boj/redistore/LICENSE
deleted file mode 100644
index fabd7b9..0000000
--- a/vendor/github.com/boj/redistore/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2013 Brian Jones
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/boj/redistore/README.md b/vendor/github.com/boj/redistore/README.md
deleted file mode 100644
index e6bb250..0000000
--- a/vendor/github.com/boj/redistore/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# redistore
-
-[](https://drone.io/github.com/boj/redistore/latest)
-
-A session store backend for [gorilla/sessions](http://www.gorillatoolkit.org/pkg/sessions) - [src](https://github.com/gorilla/sessions).
-
-## Requirements
-
-Depends on the [Redigo](https://github.com/garyburd/redigo) Redis library.
-
-## Installation
-
- go get gopkg.in/boj/redistore.v1
-
-## Documentation
-
-Available on [godoc.org](http://www.godoc.org/gopkg.in/boj/redistore.v1).
-
-See http://www.gorillatoolkit.org/pkg/sessions for full documentation on underlying interface.
-
-### Example
-
- // Fetch new store.
- store, err := NewRediStore(10, "tcp", ":6379", "", []byte("secret-key"))
- if err != nil {
- panic(err)
- }
- defer store.Close()
-
- // Get a session.
- session, err = store.Get(req, "session-key")
- if err != nil {
- log.Error(err.Error())
- }
-
- // Add a value.
- session.Values["foo"] = "bar"
-
- // Save.
- if err = sessions.Save(req, rsp); err != nil {
- t.Fatalf("Error saving session: %v", err)
- }
-
- // Delete session.
- session.Options.MaxAge = -1
- if err = sessions.Save(req, rsp); err != nil {
- t.Fatalf("Error saving session: %v", err)
- }
-
- // Change session storage configuration for MaxAge = 10 days.
- store.SetMaxAge(10*24*3600)
-
diff --git a/vendor/github.com/boj/redistore/doc.go b/vendor/github.com/boj/redistore/doc.go
deleted file mode 100644
index 43fb829..0000000
--- a/vendor/github.com/boj/redistore/doc.go
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
-Package redistore is a session store backend for gorilla/sessions
-*/
-package redistore
diff --git a/vendor/github.com/boj/redistore/redistore.go b/vendor/github.com/boj/redistore/redistore.go
deleted file mode 100644
index f19a9c8..0000000
--- a/vendor/github.com/boj/redistore/redistore.go
+++ /dev/null
@@ -1,358 +0,0 @@
-// Copyright 2012 Brian "bojo" Jones. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package redistore
-
-import (
- "bytes"
- "encoding/base32"
- "encoding/gob"
- "encoding/json"
- "errors"
- "fmt"
- "net/http"
- "strings"
- "time"
-
- "github.com/garyburd/redigo/redis"
- "github.com/gorilla/securecookie"
- "github.com/gorilla/sessions"
-)
-
-// Amount of time for cookies/redis keys to expire.
-var sessionExpire = 86400 * 30
-
-// SessionSerializer provides an interface hook for alternative serializers
-type SessionSerializer interface {
- Deserialize(d []byte, ss *sessions.Session) error
- Serialize(ss *sessions.Session) ([]byte, error)
-}
-
-// JSONSerializer encode the session map to JSON.
-type JSONSerializer struct{}
-
-// Serialize to JSON. Will err if there are unmarshalable key values
-func (s JSONSerializer) Serialize(ss *sessions.Session) ([]byte, error) {
- m := make(map[string]interface{}, len(ss.Values))
- for k, v := range ss.Values {
- ks, ok := k.(string)
- if !ok {
- err := fmt.Errorf("Non-string key value, cannot serialize session to JSON: %v", k)
- fmt.Printf("redistore.JSONSerializer.serialize() Error: %v", err)
- return nil, err
- }
- m[ks] = v
- }
- return json.Marshal(m)
-}
-
-// Deserialize back to map[string]interface{}
-func (s JSONSerializer) Deserialize(d []byte, ss *sessions.Session) error {
- m := make(map[string]interface{})
- err := json.Unmarshal(d, &m)
- if err != nil {
- fmt.Printf("redistore.JSONSerializer.deserialize() Error: %v", err)
- return err
- }
- for k, v := range m {
- ss.Values[k] = v
- }
- return nil
-}
-
-// GobSerializer uses gob package to encode the session map
-type GobSerializer struct{}
-
-// Serialize using gob
-func (s GobSerializer) Serialize(ss *sessions.Session) ([]byte, error) {
- buf := new(bytes.Buffer)
- enc := gob.NewEncoder(buf)
- err := enc.Encode(ss.Values)
- if err == nil {
- return buf.Bytes(), nil
- }
- return nil, err
-}
-
-// Deserialize back to map[interface{}]interface{}
-func (s GobSerializer) Deserialize(d []byte, ss *sessions.Session) error {
- dec := gob.NewDecoder(bytes.NewBuffer(d))
- return dec.Decode(&ss.Values)
-}
-
-// RediStore stores sessions in a redis backend.
-type RediStore struct {
- Pool *redis.Pool
- Codecs []securecookie.Codec
- Options *sessions.Options // default configuration
- DefaultMaxAge int // default Redis TTL for a MaxAge == 0 session
- maxLength int
- keyPrefix string
- serializer SessionSerializer
-}
-
-// SetMaxLength sets RediStore.maxLength if the `l` argument is greater or equal 0
-// maxLength restricts the maximum length of new sessions to l.
-// If l is 0 there is no limit to the size of a session, use with caution.
-// The default for a new RediStore is 4096. Redis allows for max.
-// value sizes of up to 512MB (http://redis.io/topics/data-types)
-// Default: 4096,
-func (s *RediStore) SetMaxLength(l int) {
- if l >= 0 {
- s.maxLength = l
- }
-}
-
-// SetKeyPrefix set the prefix
-func (s *RediStore) SetKeyPrefix(p string) {
- s.keyPrefix = p
-}
-
-// SetSerializer sets the serializer
-func (s *RediStore) SetSerializer(ss SessionSerializer) {
- s.serializer = ss
-}
-
-// SetMaxAge restricts the maximum age, in seconds, of the session record
-// both in database and a browser. This is to change session storage configuration.
-// If you want just to remove session use your session `s` object and change it's
-// `Options.MaxAge` to -1, as specified in
-// http://godoc.org/github.com/gorilla/sessions#Options
-//
-// Default is the one provided by this package value - `sessionExpire`.
-// Set it to 0 for no restriction.
-// Because we use `MaxAge` also in SecureCookie crypting algorithm you should
-// use this function to change `MaxAge` value.
-func (s *RediStore) SetMaxAge(v int) {
- var c *securecookie.SecureCookie
- var ok bool
- s.Options.MaxAge = v
- for i := range s.Codecs {
- if c, ok = s.Codecs[i].(*securecookie.SecureCookie); ok {
- c.MaxAge(v)
- } else {
- fmt.Printf("Can't change MaxAge on codec %v\n", s.Codecs[i])
- }
- }
-}
-
-func dial(network, address, password string) (redis.Conn, error) {
- c, err := redis.Dial(network, address)
- if err != nil {
- return nil, err
- }
- if password != "" {
- if _, err := c.Do("AUTH", password); err != nil {
- c.Close()
- return nil, err
- }
- }
- return c, err
-}
-
-// NewRediStore returns a new RediStore.
-// size: maximum number of idle connections.
-func NewRediStore(size int, network, address, password string, keyPairs ...[]byte) (*RediStore, error) {
- return NewRediStoreWithPool(&redis.Pool{
- MaxIdle: size,
- IdleTimeout: 240 * time.Second,
- TestOnBorrow: func(c redis.Conn, t time.Time) error {
- _, err := c.Do("PING")
- return err
- },
- Dial: func() (redis.Conn, error) {
- return dial(network, address, password)
- },
- }, keyPairs...)
-}
-
-func dialWithDB(network, address, password, DB string) (redis.Conn, error) {
- c, err := dial(network, address, password)
- if err != nil {
- return nil, err
- }
- if _, err := c.Do("SELECT", DB); err != nil {
- c.Close()
- return nil, err
- }
- return c, err
-}
-
-// NewRediStoreWithDB - like NewRedisStore but accepts `DB` parameter to select
-// redis DB instead of using the default one ("0")
-func NewRediStoreWithDB(size int, network, address, password, DB string, keyPairs ...[]byte) (*RediStore, error) {
- return NewRediStoreWithPool(&redis.Pool{
- MaxIdle: size,
- IdleTimeout: 240 * time.Second,
- TestOnBorrow: func(c redis.Conn, t time.Time) error {
- _, err := c.Do("PING")
- return err
- },
- Dial: func() (redis.Conn, error) {
- return dialWithDB(network, address, password, DB)
- },
- }, keyPairs...)
-}
-
-// NewRediStoreWithPool instantiates a RediStore with a *redis.Pool passed in.
-func NewRediStoreWithPool(pool *redis.Pool, keyPairs ...[]byte) (*RediStore, error) {
- rs := &RediStore{
- // http://godoc.org/github.com/garyburd/redigo/redis#Pool
- Pool: pool,
- Codecs: securecookie.CodecsFromPairs(keyPairs...),
- Options: &sessions.Options{
- Path: "/",
- MaxAge: sessionExpire,
- },
- DefaultMaxAge: 60 * 20, // 20 minutes seems like a reasonable default
- maxLength: 4096,
- keyPrefix: "session_",
- serializer: GobSerializer{},
- }
- _, err := rs.ping()
- return rs, err
-}
-
-// Close closes the underlying *redis.Pool
-func (s *RediStore) Close() error {
- return s.Pool.Close()
-}
-
-// Get returns a session for the given name after adding it to the registry.
-//
-// See gorilla/sessions FilesystemStore.Get().
-func (s *RediStore) Get(r *http.Request, name string) (*sessions.Session, error) {
- return sessions.GetRegistry(r).Get(s, name)
-}
-
-// New returns a session for the given name without adding it to the registry.
-//
-// See gorilla/sessions FilesystemStore.New().
-func (s *RediStore) New(r *http.Request, name string) (*sessions.Session, error) {
- var err error
- session := sessions.NewSession(s, name)
- // make a copy
- options := *s.Options
- session.Options = &options
- session.IsNew = true
- if c, errCookie := r.Cookie(name); errCookie == nil {
- err = securecookie.DecodeMulti(name, c.Value, &session.ID, s.Codecs...)
- if err == nil {
- ok, err := s.load(session)
- session.IsNew = !(err == nil && ok) // not new if no error and data available
- }
- }
- return session, err
-}
-
-// Save adds a single session to the response.
-func (s *RediStore) Save(r *http.Request, w http.ResponseWriter, session *sessions.Session) error {
- // Marked for deletion.
- if session.Options.MaxAge < 0 {
- if err := s.delete(session); err != nil {
- return err
- }
- http.SetCookie(w, sessions.NewCookie(session.Name(), "", session.Options))
- } else {
- // Build an alphanumeric key for the redis store.
- if session.ID == "" {
- session.ID = strings.TrimRight(base32.StdEncoding.EncodeToString(securecookie.GenerateRandomKey(32)), "=")
- }
- if err := s.save(session); err != nil {
- return err
- }
- encoded, err := securecookie.EncodeMulti(session.Name(), session.ID, s.Codecs...)
- if err != nil {
- return err
- }
- http.SetCookie(w, sessions.NewCookie(session.Name(), encoded, session.Options))
- }
- return nil
-}
-
-// Delete removes the session from redis, and sets the cookie to expire.
-//
-// WARNING: This method should be considered deprecated since it is not exposed via the gorilla/sessions interface.
-// Set session.Options.MaxAge = -1 and call Save instead. - July 18th, 2013
-func (s *RediStore) Delete(r *http.Request, w http.ResponseWriter, session *sessions.Session) error {
- conn := s.Pool.Get()
- defer conn.Close()
- if _, err := conn.Do("DEL", s.keyPrefix+session.ID); err != nil {
- return err
- }
- // Set cookie to expire.
- options := *session.Options
- options.MaxAge = -1
- http.SetCookie(w, sessions.NewCookie(session.Name(), "", &options))
- // Clear session values.
- for k := range session.Values {
- delete(session.Values, k)
- }
- return nil
-}
-
-// ping does an internal ping against a server to check if it is alive.
-func (s *RediStore) ping() (bool, error) {
- conn := s.Pool.Get()
- defer conn.Close()
- data, err := conn.Do("PING")
- if err != nil || data == nil {
- return false, err
- }
- return (data == "PONG"), nil
-}
-
-// save stores the session in redis.
-func (s *RediStore) save(session *sessions.Session) error {
- b, err := s.serializer.Serialize(session)
- if err != nil {
- return err
- }
- if s.maxLength != 0 && len(b) > s.maxLength {
- return errors.New("SessionStore: the value to store is too big")
- }
- conn := s.Pool.Get()
- defer conn.Close()
- if err = conn.Err(); err != nil {
- return err
- }
- age := session.Options.MaxAge
- if age == 0 {
- age = s.DefaultMaxAge
- }
- _, err = conn.Do("SETEX", s.keyPrefix+session.ID, age, b)
- return err
-}
-
-// load reads the session from redis.
-// returns true if there is a sessoin data in DB
-func (s *RediStore) load(session *sessions.Session) (bool, error) {
- conn := s.Pool.Get()
- defer conn.Close()
- if err := conn.Err(); err != nil {
- return false, err
- }
- data, err := conn.Do("GET", s.keyPrefix+session.ID)
- if err != nil {
- return false, err
- }
- if data == nil {
- return false, nil // no data was associated with this key
- }
- b, err := redis.Bytes(data, err)
- if err != nil {
- return false, err
- }
- return true, s.serializer.Deserialize(b, session)
-}
-
-// delete removes keys from redis if MaxAge<0
-func (s *RediStore) delete(session *sessions.Session) error {
- conn := s.Pool.Get()
- defer conn.Close()
- if _, err := conn.Do("DEL", s.keyPrefix+session.ID); err != nil {
- return err
- }
- return nil
-}
diff --git a/vendor/github.com/boltdb/bolt/.gitignore b/vendor/github.com/boltdb/bolt/.gitignore
deleted file mode 100644
index c7bd2b7..0000000
--- a/vendor/github.com/boltdb/bolt/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.prof
-*.test
-*.swp
-/bin/
diff --git a/vendor/github.com/boltdb/bolt/LICENSE b/vendor/github.com/boltdb/bolt/LICENSE
deleted file mode 100644
index 004e77f..0000000
--- a/vendor/github.com/boltdb/bolt/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Ben Johnson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/boltdb/bolt/Makefile b/vendor/github.com/boltdb/bolt/Makefile
deleted file mode 100644
index e035e63..0000000
--- a/vendor/github.com/boltdb/bolt/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-BRANCH=`git rev-parse --abbrev-ref HEAD`
-COMMIT=`git rev-parse --short HEAD`
-GOLDFLAGS="-X main.branch $(BRANCH) -X main.commit $(COMMIT)"
-
-default: build
-
-race:
- @go test -v -race -test.run="TestSimulate_(100op|1000op)"
-
-# go get github.com/kisielk/errcheck
-errcheck:
- @errcheck -ignorepkg=bytes -ignore=os:Remove github.com/boltdb/bolt
-
-test:
- @go test -v -cover .
- @go test -v ./cmd/bolt
-
-.PHONY: fmt test
diff --git a/vendor/github.com/boltdb/bolt/README.md b/vendor/github.com/boltdb/bolt/README.md
deleted file mode 100644
index d7f80e9..0000000
--- a/vendor/github.com/boltdb/bolt/README.md
+++ /dev/null
@@ -1,915 +0,0 @@
-Bolt [](https://coveralls.io/r/boltdb/bolt?branch=master) [](https://godoc.org/github.com/boltdb/bolt) 
-====
-
-Bolt is a pure Go key/value store inspired by [Howard Chu's][hyc_symas]
-[LMDB project][lmdb]. The goal of the project is to provide a simple,
-fast, and reliable database for projects that don't require a full database
-server such as Postgres or MySQL.
-
-Since Bolt is meant to be used as such a low-level piece of functionality,
-simplicity is key. The API will be small and only focus on getting values
-and setting values. That's it.
-
-[hyc_symas]: https://twitter.com/hyc_symas
-[lmdb]: http://symas.com/mdb/
-
-## Project Status
-
-Bolt is stable, the API is fixed, and the file format is fixed. Full unit
-test coverage and randomized black box testing are used to ensure database
-consistency and thread safety. Bolt is currently used in high-load production
-environments serving databases as large as 1TB. Many companies such as
-Shopify and Heroku use Bolt-backed services every day.
-
-## Table of Contents
-
-- [Getting Started](#getting-started)
- - [Installing](#installing)
- - [Opening a database](#opening-a-database)
- - [Transactions](#transactions)
- - [Read-write transactions](#read-write-transactions)
- - [Read-only transactions](#read-only-transactions)
- - [Batch read-write transactions](#batch-read-write-transactions)
- - [Managing transactions manually](#managing-transactions-manually)
- - [Using buckets](#using-buckets)
- - [Using key/value pairs](#using-keyvalue-pairs)
- - [Autoincrementing integer for the bucket](#autoincrementing-integer-for-the-bucket)
- - [Iterating over keys](#iterating-over-keys)
- - [Prefix scans](#prefix-scans)
- - [Range scans](#range-scans)
- - [ForEach()](#foreach)
- - [Nested buckets](#nested-buckets)
- - [Database backups](#database-backups)
- - [Statistics](#statistics)
- - [Read-Only Mode](#read-only-mode)
- - [Mobile Use (iOS/Android)](#mobile-use-iosandroid)
-- [Resources](#resources)
-- [Comparison with other databases](#comparison-with-other-databases)
- - [Postgres, MySQL, & other relational databases](#postgres-mysql--other-relational-databases)
- - [LevelDB, RocksDB](#leveldb-rocksdb)
- - [LMDB](#lmdb)
-- [Caveats & Limitations](#caveats--limitations)
-- [Reading the Source](#reading-the-source)
-- [Other Projects Using Bolt](#other-projects-using-bolt)
-
-## Getting Started
-
-### Installing
-
-To start using Bolt, install Go and run `go get`:
-
-```sh
-$ go get github.com/boltdb/bolt/...
-```
-
-This will retrieve the library and install the `bolt` command line utility into
-your `$GOBIN` path.
-
-
-### Opening a database
-
-The top-level object in Bolt is a `DB`. It is represented as a single file on
-your disk and represents a consistent snapshot of your data.
-
-To open your database, simply use the `bolt.Open()` function:
-
-```go
-package main
-
-import (
- "log"
-
- "github.com/boltdb/bolt"
-)
-
-func main() {
- // Open the my.db data file in your current directory.
- // It will be created if it doesn't exist.
- db, err := bolt.Open("my.db", 0600, nil)
- if err != nil {
- log.Fatal(err)
- }
- defer db.Close()
-
- ...
-}
-```
-
-Please note that Bolt obtains a file lock on the data file so multiple processes
-cannot open the same database at the same time. Opening an already open Bolt
-database will cause it to hang until the other process closes it. To prevent
-an indefinite wait you can pass a timeout option to the `Open()` function:
-
-```go
-db, err := bolt.Open("my.db", 0600, &bolt.Options{Timeout: 1 * time.Second})
-```
-
-
-### Transactions
-
-Bolt allows only one read-write transaction at a time but allows as many
-read-only transactions as you want at a time. Each transaction has a consistent
-view of the data as it existed when the transaction started.
-
-Individual transactions and all objects created from them (e.g. buckets, keys)
-are not thread safe. To work with data in multiple goroutines you must start
-a transaction for each one or use locking to ensure only one goroutine accesses
-a transaction at a time. Creating transaction from the `DB` is thread safe.
-
-Read-only transactions and read-write transactions should not depend on one
-another and generally shouldn't be opened simultaneously in the same goroutine.
-This can cause a deadlock as the read-write transaction needs to periodically
-re-map the data file but it cannot do so while a read-only transaction is open.
-
-
-#### Read-write transactions
-
-To start a read-write transaction, you can use the `DB.Update()` function:
-
-```go
-err := db.Update(func(tx *bolt.Tx) error {
- ...
- return nil
-})
-```
-
-Inside the closure, you have a consistent view of the database. You commit the
-transaction by returning `nil` at the end. You can also rollback the transaction
-at any point by returning an error. All database operations are allowed inside
-a read-write transaction.
-
-Always check the return error as it will report any disk failures that can cause
-your transaction to not complete. If you return an error within your closure
-it will be passed through.
-
-
-#### Read-only transactions
-
-To start a read-only transaction, you can use the `DB.View()` function:
-
-```go
-err := db.View(func(tx *bolt.Tx) error {
- ...
- return nil
-})
-```
-
-You also get a consistent view of the database within this closure, however,
-no mutating operations are allowed within a read-only transaction. You can only
-retrieve buckets, retrieve values, and copy the database within a read-only
-transaction.
-
-
-#### Batch read-write transactions
-
-Each `DB.Update()` waits for disk to commit the writes. This overhead
-can be minimized by combining multiple updates with the `DB.Batch()`
-function:
-
-```go
-err := db.Batch(func(tx *bolt.Tx) error {
- ...
- return nil
-})
-```
-
-Concurrent Batch calls are opportunistically combined into larger
-transactions. Batch is only useful when there are multiple goroutines
-calling it.
-
-The trade-off is that `Batch` can call the given
-function multiple times, if parts of the transaction fail. The
-function must be idempotent and side effects must take effect only
-after a successful return from `DB.Batch()`.
-
-For example: don't display messages from inside the function, instead
-set variables in the enclosing scope:
-
-```go
-var id uint64
-err := db.Batch(func(tx *bolt.Tx) error {
- // Find last key in bucket, decode as bigendian uint64, increment
- // by one, encode back to []byte, and add new key.
- ...
- id = newValue
- return nil
-})
-if err != nil {
- return ...
-}
-fmt.Println("Allocated ID %d", id)
-```
-
-
-#### Managing transactions manually
-
-The `DB.View()` and `DB.Update()` functions are wrappers around the `DB.Begin()`
-function. These helper functions will start the transaction, execute a function,
-and then safely close your transaction if an error is returned. This is the
-recommended way to use Bolt transactions.
-
-However, sometimes you may want to manually start and end your transactions.
-You can use the `DB.Begin()` function directly but **please** be sure to close
-the transaction.
-
-```go
-// Start a writable transaction.
-tx, err := db.Begin(true)
-if err != nil {
- return err
-}
-defer tx.Rollback()
-
-// Use the transaction...
-_, err := tx.CreateBucket([]byte("MyBucket"))
-if err != nil {
- return err
-}
-
-// Commit the transaction and check for error.
-if err := tx.Commit(); err != nil {
- return err
-}
-```
-
-The first argument to `DB.Begin()` is a boolean stating if the transaction
-should be writable.
-
-
-### Using buckets
-
-Buckets are collections of key/value pairs within the database. All keys in a
-bucket must be unique. You can create a bucket using the `DB.CreateBucket()`
-function:
-
-```go
-db.Update(func(tx *bolt.Tx) error {
- b, err := tx.CreateBucket([]byte("MyBucket"))
- if err != nil {
- return fmt.Errorf("create bucket: %s", err)
- }
- return nil
-})
-```
-
-You can also create a bucket only if it doesn't exist by using the
-`Tx.CreateBucketIfNotExists()` function. It's a common pattern to call this
-function for all your top-level buckets after you open your database so you can
-guarantee that they exist for future transactions.
-
-To delete a bucket, simply call the `Tx.DeleteBucket()` function.
-
-
-### Using key/value pairs
-
-To save a key/value pair to a bucket, use the `Bucket.Put()` function:
-
-```go
-db.Update(func(tx *bolt.Tx) error {
- b := tx.Bucket([]byte("MyBucket"))
- err := b.Put([]byte("answer"), []byte("42"))
- return err
-})
-```
-
-This will set the value of the `"answer"` key to `"42"` in the `MyBucket`
-bucket. To retrieve this value, we can use the `Bucket.Get()` function:
-
-```go
-db.View(func(tx *bolt.Tx) error {
- b := tx.Bucket([]byte("MyBucket"))
- v := b.Get([]byte("answer"))
- fmt.Printf("The answer is: %s\n", v)
- return nil
-})
-```
-
-The `Get()` function does not return an error because its operation is
-guaranteed to work (unless there is some kind of system failure). If the key
-exists then it will return its byte slice value. If it doesn't exist then it
-will return `nil`. It's important to note that you can have a zero-length value
-set to a key which is different than the key not existing.
-
-Use the `Bucket.Delete()` function to delete a key from the bucket.
-
-Please note that values returned from `Get()` are only valid while the
-transaction is open. If you need to use a value outside of the transaction
-then you must use `copy()` to copy it to another byte slice.
-
-
-### Autoincrementing integer for the bucket
-By using the `NextSequence()` function, you can let Bolt determine a sequence
-which can be used as the unique identifier for your key/value pairs. See the
-example below.
-
-```go
-// CreateUser saves u to the store. The new user ID is set on u once the data is persisted.
-func (s *Store) CreateUser(u *User) error {
- return s.db.Update(func(tx *bolt.Tx) error {
- // Retrieve the users bucket.
- // This should be created when the DB is first opened.
- b := tx.Bucket([]byte("users"))
-
- // Generate ID for the user.
- // This returns an error only if the Tx is closed or not writeable.
- // That can't happen in an Update() call so I ignore the error check.
- id, _ := b.NextSequence()
- u.ID = int(id)
-
- // Marshal user data into bytes.
- buf, err := json.Marshal(u)
- if err != nil {
- return err
- }
-
- // Persist bytes to users bucket.
- return b.Put(itob(u.ID), buf)
- })
-}
-
-// itob returns an 8-byte big endian representation of v.
-func itob(v int) []byte {
- b := make([]byte, 8)
- binary.BigEndian.PutUint64(b, uint64(v))
- return b
-}
-
-type User struct {
- ID int
- ...
-}
-```
-
-### Iterating over keys
-
-Bolt stores its keys in byte-sorted order within a bucket. This makes sequential
-iteration over these keys extremely fast. To iterate over keys we'll use a
-`Cursor`:
-
-```go
-db.View(func(tx *bolt.Tx) error {
- // Assume bucket exists and has keys
- b := tx.Bucket([]byte("MyBucket"))
-
- c := b.Cursor()
-
- for k, v := c.First(); k != nil; k, v = c.Next() {
- fmt.Printf("key=%s, value=%s\n", k, v)
- }
-
- return nil
-})
-```
-
-The cursor allows you to move to a specific point in the list of keys and move
-forward or backward through the keys one at a time.
-
-The following functions are available on the cursor:
-
-```
-First() Move to the first key.
-Last() Move to the last key.
-Seek() Move to a specific key.
-Next() Move to the next key.
-Prev() Move to the previous key.
-```
-
-Each of those functions has a return signature of `(key []byte, value []byte)`.
-When you have iterated to the end of the cursor then `Next()` will return a
-`nil` key. You must seek to a position using `First()`, `Last()`, or `Seek()`
-before calling `Next()` or `Prev()`. If you do not seek to a position then
-these functions will return a `nil` key.
-
-During iteration, if the key is non-`nil` but the value is `nil`, that means
-the key refers to a bucket rather than a value. Use `Bucket.Bucket()` to
-access the sub-bucket.
-
-
-#### Prefix scans
-
-To iterate over a key prefix, you can combine `Seek()` and `bytes.HasPrefix()`:
-
-```go
-db.View(func(tx *bolt.Tx) error {
- // Assume bucket exists and has keys
- c := tx.Bucket([]byte("MyBucket")).Cursor()
-
- prefix := []byte("1234")
- for k, v := c.Seek(prefix); k != nil && bytes.HasPrefix(k, prefix); k, v = c.Next() {
- fmt.Printf("key=%s, value=%s\n", k, v)
- }
-
- return nil
-})
-```
-
-#### Range scans
-
-Another common use case is scanning over a range such as a time range. If you
-use a sortable time encoding such as RFC3339 then you can query a specific
-date range like this:
-
-```go
-db.View(func(tx *bolt.Tx) error {
- // Assume our events bucket exists and has RFC3339 encoded time keys.
- c := tx.Bucket([]byte("Events")).Cursor()
-
- // Our time range spans the 90's decade.
- min := []byte("1990-01-01T00:00:00Z")
- max := []byte("2000-01-01T00:00:00Z")
-
- // Iterate over the 90's.
- for k, v := c.Seek(min); k != nil && bytes.Compare(k, max) <= 0; k, v = c.Next() {
- fmt.Printf("%s: %s\n", k, v)
- }
-
- return nil
-})
-```
-
-Note that, while RFC3339 is sortable, the Golang implementation of RFC3339Nano does not use a fixed number of digits after the decimal point and is therefore not sortable.
-
-
-#### ForEach()
-
-You can also use the function `ForEach()` if you know you'll be iterating over
-all the keys in a bucket:
-
-```go
-db.View(func(tx *bolt.Tx) error {
- // Assume bucket exists and has keys
- b := tx.Bucket([]byte("MyBucket"))
-
- b.ForEach(func(k, v []byte) error {
- fmt.Printf("key=%s, value=%s\n", k, v)
- return nil
- })
- return nil
-})
-```
-
-Please note that keys and values in `ForEach()` are only valid while
-the transaction is open. If you need to use a key or value outside of
-the transaction, you must use `copy()` to copy it to another byte
-slice.
-
-### Nested buckets
-
-You can also store a bucket in a key to create nested buckets. The API is the
-same as the bucket management API on the `DB` object:
-
-```go
-func (*Bucket) CreateBucket(key []byte) (*Bucket, error)
-func (*Bucket) CreateBucketIfNotExists(key []byte) (*Bucket, error)
-func (*Bucket) DeleteBucket(key []byte) error
-```
-
-Say you had a multi-tenant application where the root level bucket was the account bucket. Inside of this bucket was a sequence of accounts which themselves are buckets. And inside the sequence bucket you could have many buckets pertaining to the Account itself (Users, Notes, etc) isolating the information into logical groupings.
-
-```go
-
-// createUser creates a new user in the given account.
-func createUser(accountID int, u *User) error {
- // Start the transaction.
- tx, err := db.Begin(true)
- if err != nil {
- return err
- }
- defer tx.Rollback()
-
- // Retrieve the root bucket for the account.
- // Assume this has already been created when the account was set up.
- root := tx.Bucket([]byte(strconv.FormatUint(accountID, 10)))
-
- // Setup the users bucket.
- bkt, err := root.CreateBucketIfNotExists([]byte("USERS"))
- if err != nil {
- return err
- }
-
- // Generate an ID for the new user.
- userID, err := bkt.NextSequence()
- if err != nil {
- return err
- }
- u.ID = userID
-
- // Marshal and save the encoded user.
- if buf, err := json.Marshal(u); err != nil {
- return err
- } else if err := bkt.Put([]byte(strconv.FormatUint(u.ID, 10)), buf); err != nil {
- return err
- }
-
- // Commit the transaction.
- if err := tx.Commit(); err != nil {
- return err
- }
-
- return nil
-}
-
-```
-
-
-
-
-### Database backups
-
-Bolt is a single file so it's easy to backup. You can use the `Tx.WriteTo()`
-function to write a consistent view of the database to a writer. If you call
-this from a read-only transaction, it will perform a hot backup and not block
-your other database reads and writes.
-
-By default, it will use a regular file handle which will utilize the operating
-system's page cache. See the [`Tx`](https://godoc.org/github.com/boltdb/bolt#Tx)
-documentation for information about optimizing for larger-than-RAM datasets.
-
-One common use case is to backup over HTTP so you can use tools like `cURL` to
-do database backups:
-
-```go
-func BackupHandleFunc(w http.ResponseWriter, req *http.Request) {
- err := db.View(func(tx *bolt.Tx) error {
- w.Header().Set("Content-Type", "application/octet-stream")
- w.Header().Set("Content-Disposition", `attachment; filename="my.db"`)
- w.Header().Set("Content-Length", strconv.Itoa(int(tx.Size())))
- _, err := tx.WriteTo(w)
- return err
- })
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- }
-}
-```
-
-Then you can backup using this command:
-
-```sh
-$ curl http://localhost/backup > my.db
-```
-
-Or you can open your browser to `http://localhost/backup` and it will download
-automatically.
-
-If you want to backup to another file you can use the `Tx.CopyFile()` helper
-function.
-
-
-### Statistics
-
-The database keeps a running count of many of the internal operations it
-performs so you can better understand what's going on. By grabbing a snapshot
-of these stats at two points in time we can see what operations were performed
-in that time range.
-
-For example, we could start a goroutine to log stats every 10 seconds:
-
-```go
-go func() {
- // Grab the initial stats.
- prev := db.Stats()
-
- for {
- // Wait for 10s.
- time.Sleep(10 * time.Second)
-
- // Grab the current stats and diff them.
- stats := db.Stats()
- diff := stats.Sub(&prev)
-
- // Encode stats to JSON and print to STDERR.
- json.NewEncoder(os.Stderr).Encode(diff)
-
- // Save stats for the next loop.
- prev = stats
- }
-}()
-```
-
-It's also useful to pipe these stats to a service such as statsd for monitoring
-or to provide an HTTP endpoint that will perform a fixed-length sample.
-
-
-### Read-Only Mode
-
-Sometimes it is useful to create a shared, read-only Bolt database. To this,
-set the `Options.ReadOnly` flag when opening your database. Read-only mode
-uses a shared lock to allow multiple processes to read from the database but
-it will block any processes from opening the database in read-write mode.
-
-```go
-db, err := bolt.Open("my.db", 0666, &bolt.Options{ReadOnly: true})
-if err != nil {
- log.Fatal(err)
-}
-```
-
-### Mobile Use (iOS/Android)
-
-Bolt is able to run on mobile devices by leveraging the binding feature of the
-[gomobile](https://github.com/golang/mobile) tool. Create a struct that will
-contain your database logic and a reference to a `*bolt.DB` with a initializing
-constructor that takes in a filepath where the database file will be stored.
-Neither Android nor iOS require extra permissions or cleanup from using this method.
-
-```go
-func NewBoltDB(filepath string) *BoltDB {
- db, err := bolt.Open(filepath+"/demo.db", 0600, nil)
- if err != nil {
- log.Fatal(err)
- }
-
- return &BoltDB{db}
-}
-
-type BoltDB struct {
- db *bolt.DB
- ...
-}
-
-func (b *BoltDB) Path() string {
- return b.db.Path()
-}
-
-func (b *BoltDB) Close() {
- b.db.Close()
-}
-```
-
-Database logic should be defined as methods on this wrapper struct.
-
-To initialize this struct from the native language (both platforms now sync
-their local storage to the cloud. These snippets disable that functionality for the
-database file):
-
-#### Android
-
-```java
-String path;
-if (android.os.Build.VERSION.SDK_INT >=android.os.Build.VERSION_CODES.LOLLIPOP){
- path = getNoBackupFilesDir().getAbsolutePath();
-} else{
- path = getFilesDir().getAbsolutePath();
-}
-Boltmobiledemo.BoltDB boltDB = Boltmobiledemo.NewBoltDB(path)
-```
-
-#### iOS
-
-```objc
-- (void)demo {
- NSString* path = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
- NSUserDomainMask,
- YES) objectAtIndex:0];
- GoBoltmobiledemoBoltDB * demo = GoBoltmobiledemoNewBoltDB(path);
- [self addSkipBackupAttributeToItemAtPath:demo.path];
- //Some DB Logic would go here
- [demo close];
-}
-
-- (BOOL)addSkipBackupAttributeToItemAtPath:(NSString *) filePathString
-{
- NSURL* URL= [NSURL fileURLWithPath: filePathString];
- assert([[NSFileManager defaultManager] fileExistsAtPath: [URL path]]);
-
- NSError *error = nil;
- BOOL success = [URL setResourceValue: [NSNumber numberWithBool: YES]
- forKey: NSURLIsExcludedFromBackupKey error: &error];
- if(!success){
- NSLog(@"Error excluding %@ from backup %@", [URL lastPathComponent], error);
- }
- return success;
-}
-
-```
-
-## Resources
-
-For more information on getting started with Bolt, check out the following articles:
-
-* [Intro to BoltDB: Painless Performant Persistence](http://npf.io/2014/07/intro-to-boltdb-painless-performant-persistence/) by [Nate Finch](https://github.com/natefinch).
-* [Bolt -- an embedded key/value database for Go](https://www.progville.com/go/bolt-embedded-db-golang/) by Progville
-
-
-## Comparison with other databases
-
-### Postgres, MySQL, & other relational databases
-
-Relational databases structure data into rows and are only accessible through
-the use of SQL. This approach provides flexibility in how you store and query
-your data but also incurs overhead in parsing and planning SQL statements. Bolt
-accesses all data by a byte slice key. This makes Bolt fast to read and write
-data by key but provides no built-in support for joining values together.
-
-Most relational databases (with the exception of SQLite) are standalone servers
-that run separately from your application. This gives your systems
-flexibility to connect multiple application servers to a single database
-server but also adds overhead in serializing and transporting data over the
-network. Bolt runs as a library included in your application so all data access
-has to go through your application's process. This brings data closer to your
-application but limits multi-process access to the data.
-
-
-### LevelDB, RocksDB
-
-LevelDB and its derivatives (RocksDB, HyperLevelDB) are similar to Bolt in that
-they are libraries bundled into the application, however, their underlying
-structure is a log-structured merge-tree (LSM tree). An LSM tree optimizes
-random writes by using a write ahead log and multi-tiered, sorted files called
-SSTables. Bolt uses a B+tree internally and only a single file. Both approaches
-have trade-offs.
-
-If you require a high random write throughput (>10,000 w/sec) or you need to use
-spinning disks then LevelDB could be a good choice. If your application is
-read-heavy or does a lot of range scans then Bolt could be a good choice.
-
-One other important consideration is that LevelDB does not have transactions.
-It supports batch writing of key/values pairs and it supports read snapshots
-but it will not give you the ability to do a compare-and-swap operation safely.
-Bolt supports fully serializable ACID transactions.
-
-
-### LMDB
-
-Bolt was originally a port of LMDB so it is architecturally similar. Both use
-a B+tree, have ACID semantics with fully serializable transactions, and support
-lock-free MVCC using a single writer and multiple readers.
-
-The two projects have somewhat diverged. LMDB heavily focuses on raw performance
-while Bolt has focused on simplicity and ease of use. For example, LMDB allows
-several unsafe actions such as direct writes for the sake of performance. Bolt
-opts to disallow actions which can leave the database in a corrupted state. The
-only exception to this in Bolt is `DB.NoSync`.
-
-There are also a few differences in API. LMDB requires a maximum mmap size when
-opening an `mdb_env` whereas Bolt will handle incremental mmap resizing
-automatically. LMDB overloads the getter and setter functions with multiple
-flags whereas Bolt splits these specialized cases into their own functions.
-
-
-## Caveats & Limitations
-
-It's important to pick the right tool for the job and Bolt is no exception.
-Here are a few things to note when evaluating and using Bolt:
-
-* Bolt is good for read intensive workloads. Sequential write performance is
- also fast but random writes can be slow. You can use `DB.Batch()` or add a
- write-ahead log to help mitigate this issue.
-
-* Bolt uses a B+tree internally so there can be a lot of random page access.
- SSDs provide a significant performance boost over spinning disks.
-
-* Try to avoid long running read transactions. Bolt uses copy-on-write so
- old pages cannot be reclaimed while an old transaction is using them.
-
-* Byte slices returned from Bolt are only valid during a transaction. Once the
- transaction has been committed or rolled back then the memory they point to
- can be reused by a new page or can be unmapped from virtual memory and you'll
- see an `unexpected fault address` panic when accessing it.
-
-* Bolt uses an exclusive write lock on the database file so it cannot be
- shared by multiple processes.
-
-* Be careful when using `Bucket.FillPercent`. Setting a high fill percent for
- buckets that have random inserts will cause your database to have very poor
- page utilization.
-
-* Use larger buckets in general. Smaller buckets causes poor page utilization
- once they become larger than the page size (typically 4KB).
-
-* Bulk loading a lot of random writes into a new bucket can be slow as the
- page will not split until the transaction is committed. Randomly inserting
- more than 100,000 key/value pairs into a single new bucket in a single
- transaction is not advised.
-
-* Bolt uses a memory-mapped file so the underlying operating system handles the
- caching of the data. Typically, the OS will cache as much of the file as it
- can in memory and will release memory as needed to other processes. This means
- that Bolt can show very high memory usage when working with large databases.
- However, this is expected and the OS will release memory as needed. Bolt can
- handle databases much larger than the available physical RAM, provided its
- memory-map fits in the process virtual address space. It may be problematic
- on 32-bits systems.
-
-* The data structures in the Bolt database are memory mapped so the data file
- will be endian specific. This means that you cannot copy a Bolt file from a
- little endian machine to a big endian machine and have it work. For most
- users this is not a concern since most modern CPUs are little endian.
-
-* Because of the way pages are laid out on disk, Bolt cannot truncate data files
- and return free pages back to the disk. Instead, Bolt maintains a free list
- of unused pages within its data file. These free pages can be reused by later
- transactions. This works well for many use cases as databases generally tend
- to grow. However, it's important to note that deleting large chunks of data
- will not allow you to reclaim that space on disk.
-
- For more information on page allocation, [see this comment][page-allocation].
-
-[page-allocation]: https://github.com/boltdb/bolt/issues/308#issuecomment-74811638
-
-
-## Reading the Source
-
-Bolt is a relatively small code base (<3KLOC) for an embedded, serializable,
-transactional key/value database so it can be a good starting point for people
-interested in how databases work.
-
-The best places to start are the main entry points into Bolt:
-
-- `Open()` - Initializes the reference to the database. It's responsible for
- creating the database if it doesn't exist, obtaining an exclusive lock on the
- file, reading the meta pages, & memory-mapping the file.
-
-- `DB.Begin()` - Starts a read-only or read-write transaction depending on the
- value of the `writable` argument. This requires briefly obtaining the "meta"
- lock to keep track of open transactions. Only one read-write transaction can
- exist at a time so the "rwlock" is acquired during the life of a read-write
- transaction.
-
-- `Bucket.Put()` - Writes a key/value pair into a bucket. After validating the
- arguments, a cursor is used to traverse the B+tree to the page and position
- where they key & value will be written. Once the position is found, the bucket
- materializes the underlying page and the page's parent pages into memory as
- "nodes". These nodes are where mutations occur during read-write transactions.
- These changes get flushed to disk during commit.
-
-- `Bucket.Get()` - Retrieves a key/value pair from a bucket. This uses a cursor
- to move to the page & position of a key/value pair. During a read-only
- transaction, the key and value data is returned as a direct reference to the
- underlying mmap file so there's no allocation overhead. For read-write
- transactions, this data may reference the mmap file or one of the in-memory
- node values.
-
-- `Cursor` - This object is simply for traversing the B+tree of on-disk pages
- or in-memory nodes. It can seek to a specific key, move to the first or last
- value, or it can move forward or backward. The cursor handles the movement up
- and down the B+tree transparently to the end user.
-
-- `Tx.Commit()` - Converts the in-memory dirty nodes and the list of free pages
- into pages to be written to disk. Writing to disk then occurs in two phases.
- First, the dirty pages are written to disk and an `fsync()` occurs. Second, a
- new meta page with an incremented transaction ID is written and another
- `fsync()` occurs. This two phase write ensures that partially written data
- pages are ignored in the event of a crash since the meta page pointing to them
- is never written. Partially written meta pages are invalidated because they
- are written with a checksum.
-
-If you have additional notes that could be helpful for others, please submit
-them via pull request.
-
-
-## Other Projects Using Bolt
-
-Below is a list of public, open source projects that use Bolt:
-
-* [BoltDbWeb](https://github.com/evnix/boltdbweb) - A web based GUI for BoltDB files.
-* [Operation Go: A Routine Mission](http://gocode.io) - An online programming game for Golang using Bolt for user accounts and a leaderboard.
-* [Bazil](https://bazil.org/) - A file system that lets your data reside where it is most convenient for it to reside.
-* [DVID](https://github.com/janelia-flyem/dvid) - Added Bolt as optional storage engine and testing it against Basho-tuned leveldb.
-* [Skybox Analytics](https://github.com/skybox/skybox) - A standalone funnel analysis tool for web analytics.
-* [Scuttlebutt](https://github.com/benbjohnson/scuttlebutt) - Uses Bolt to store and process all Twitter mentions of GitHub projects.
-* [Wiki](https://github.com/peterhellberg/wiki) - A tiny wiki using Goji, BoltDB and Blackfriday.
-* [ChainStore](https://github.com/pressly/chainstore) - Simple key-value interface to a variety of storage engines organized as a chain of operations.
-* [MetricBase](https://github.com/msiebuhr/MetricBase) - Single-binary version of Graphite.
-* [Gitchain](https://github.com/gitchain/gitchain) - Decentralized, peer-to-peer Git repositories aka "Git meets Bitcoin".
-* [event-shuttle](https://github.com/sclasen/event-shuttle) - A Unix system service to collect and reliably deliver messages to Kafka.
-* [ipxed](https://github.com/kelseyhightower/ipxed) - Web interface and api for ipxed.
-* [BoltStore](https://github.com/yosssi/boltstore) - Session store using Bolt.
-* [photosite/session](https://godoc.org/bitbucket.org/kardianos/photosite/session) - Sessions for a photo viewing site.
-* [LedisDB](https://github.com/siddontang/ledisdb) - A high performance NoSQL, using Bolt as optional storage.
-* [ipLocator](https://github.com/AndreasBriese/ipLocator) - A fast ip-geo-location-server using bolt with bloom filters.
-* [cayley](https://github.com/google/cayley) - Cayley is an open-source graph database using Bolt as optional backend.
-* [bleve](http://www.blevesearch.com/) - A pure Go search engine similar to ElasticSearch that uses Bolt as the default storage backend.
-* [tentacool](https://github.com/optiflows/tentacool) - REST api server to manage system stuff (IP, DNS, Gateway...) on a linux server.
-* [Seaweed File System](https://github.com/chrislusf/seaweedfs) - Highly scalable distributed key~file system with O(1) disk read.
-* [InfluxDB](https://influxdata.com) - Scalable datastore for metrics, events, and real-time analytics.
-* [Freehold](http://tshannon.bitbucket.org/freehold/) - An open, secure, and lightweight platform for your files and data.
-* [Prometheus Annotation Server](https://github.com/oliver006/prom_annotation_server) - Annotation server for PromDash & Prometheus service monitoring system.
-* [Consul](https://github.com/hashicorp/consul) - Consul is service discovery and configuration made easy. Distributed, highly available, and datacenter-aware.
-* [Kala](https://github.com/ajvb/kala) - Kala is a modern job scheduler optimized to run on a single node. It is persistent, JSON over HTTP API, ISO 8601 duration notation, and dependent jobs.
-* [drive](https://github.com/odeke-em/drive) - drive is an unofficial Google Drive command line client for \*NIX operating systems.
-* [stow](https://github.com/djherbis/stow) - a persistence manager for objects
- backed by boltdb.
-* [buckets](https://github.com/joyrexus/buckets) - a bolt wrapper streamlining
- simple tx and key scans.
-* [mbuckets](https://github.com/abhigupta912/mbuckets) - A Bolt wrapper that allows easy operations on multi level (nested) buckets.
-* [Request Baskets](https://github.com/darklynx/request-baskets) - A web service to collect arbitrary HTTP requests and inspect them via REST API or simple web UI, similar to [RequestBin](http://requestb.in/) service
-* [Go Report Card](https://goreportcard.com/) - Go code quality report cards as a (free and open source) service.
-* [Boltdb Boilerplate](https://github.com/bobintornado/boltdb-boilerplate) - Boilerplate wrapper around bolt aiming to make simple calls one-liners.
-* [lru](https://github.com/crowdriff/lru) - Easy to use Bolt-backed Least-Recently-Used (LRU) read-through cache with chainable remote stores.
-* [Storm](https://github.com/asdine/storm) - Simple and powerful ORM for BoltDB.
-* [GoWebApp](https://github.com/josephspurrier/gowebapp) - A basic MVC web application in Go using BoltDB.
-* [SimpleBolt](https://github.com/xyproto/simplebolt) - A simple way to use BoltDB. Deals mainly with strings.
-* [Algernon](https://github.com/xyproto/algernon) - A HTTP/2 web server with built-in support for Lua. Uses BoltDB as the default database backend.
-* [MuLiFS](https://github.com/dankomiocevic/mulifs) - Music Library Filesystem creates a filesystem to organise your music files.
-* [GoShort](https://github.com/pankajkhairnar/goShort) - GoShort is a URL shortener written in Golang and BoltDB for persistent key/value storage and for routing it's using high performent HTTPRouter.
-* [torrent](https://github.com/anacrolix/torrent) - Full-featured BitTorrent client package and utilities in Go. BoltDB is a storage backend in development.
-* [gopherpit](https://github.com/gopherpit/gopherpit) - A web service to manage Go remote import paths with custom domains
-* [bolter](https://github.com/hasit/bolter) - Command-line app for viewing BoltDB file in your terminal.
-* [btcwallet](https://github.com/btcsuite/btcwallet) - A bitcoin wallet.
-* [dcrwallet](https://github.com/decred/dcrwallet) - A wallet for the Decred cryptocurrency.
-* [Ironsmith](https://github.com/timshannon/ironsmith) - A simple, script-driven continuous integration (build - > test -> release) tool, with no external dependencies
-* [BoltHold](https://github.com/timshannon/bolthold) - An embeddable NoSQL store for Go types built on BoltDB
-
-If you are using Bolt in a project please send a pull request to add it to the list.
diff --git a/vendor/github.com/boltdb/bolt/appveyor.yml b/vendor/github.com/boltdb/bolt/appveyor.yml
deleted file mode 100644
index 6e26e94..0000000
--- a/vendor/github.com/boltdb/bolt/appveyor.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "{build}"
-
-os: Windows Server 2012 R2
-
-clone_folder: c:\gopath\src\github.com\boltdb\bolt
-
-environment:
- GOPATH: c:\gopath
-
-install:
- - echo %PATH%
- - echo %GOPATH%
- - go version
- - go env
- - go get -v -t ./...
-
-build_script:
- - go test -v ./...
diff --git a/vendor/github.com/boltdb/bolt/bolt_386.go b/vendor/github.com/boltdb/bolt/bolt_386.go
deleted file mode 100644
index 820d533..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_386.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0x7FFFFFFF // 2GB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0xFFFFFFF
-
-// Are unaligned load/stores broken on this arch?
-var brokenUnaligned = false
diff --git a/vendor/github.com/boltdb/bolt/bolt_amd64.go b/vendor/github.com/boltdb/bolt/bolt_amd64.go
deleted file mode 100644
index 98fafdb..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_amd64.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0xFFFFFFFFFFFF // 256TB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0x7FFFFFFF
-
-// Are unaligned load/stores broken on this arch?
-var brokenUnaligned = false
diff --git a/vendor/github.com/boltdb/bolt/bolt_arm.go b/vendor/github.com/boltdb/bolt/bolt_arm.go
deleted file mode 100644
index 7e5cb4b..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_arm.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package bolt
-
-import "unsafe"
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0x7FFFFFFF // 2GB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0xFFFFFFF
-
-// Are unaligned load/stores broken on this arch?
-var brokenUnaligned bool
-
-func init() {
- // Simple check to see whether this arch handles unaligned load/stores
- // correctly.
-
- // ARM9 and older devices require load/stores to be from/to aligned
- // addresses. If not, the lower 2 bits are cleared and that address is
- // read in a jumbled up order.
-
- // See http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.faqs/ka15414.html
-
- raw := [6]byte{0xfe, 0xef, 0x11, 0x22, 0x22, 0x11}
- val := *(*uint32)(unsafe.Pointer(uintptr(unsafe.Pointer(&raw)) + 2))
-
- brokenUnaligned = val != 0x11222211
-}
diff --git a/vendor/github.com/boltdb/bolt/bolt_arm64.go b/vendor/github.com/boltdb/bolt/bolt_arm64.go
deleted file mode 100644
index b26d84f..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_arm64.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build arm64
-
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0xFFFFFFFFFFFF // 256TB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0x7FFFFFFF
-
-// Are unaligned load/stores broken on this arch?
-var brokenUnaligned = false
diff --git a/vendor/github.com/boltdb/bolt/bolt_linux.go b/vendor/github.com/boltdb/bolt/bolt_linux.go
deleted file mode 100644
index 2b67666..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_linux.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package bolt
-
-import (
- "syscall"
-)
-
-// fdatasync flushes written data to a file descriptor.
-func fdatasync(db *DB) error {
- return syscall.Fdatasync(int(db.file.Fd()))
-}
diff --git a/vendor/github.com/boltdb/bolt/bolt_openbsd.go b/vendor/github.com/boltdb/bolt/bolt_openbsd.go
deleted file mode 100644
index 7058c3d..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_openbsd.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package bolt
-
-import (
- "syscall"
- "unsafe"
-)
-
-const (
- msAsync = 1 << iota // perform asynchronous writes
- msSync // perform synchronous writes
- msInvalidate // invalidate cached data
-)
-
-func msync(db *DB) error {
- _, _, errno := syscall.Syscall(syscall.SYS_MSYNC, uintptr(unsafe.Pointer(db.data)), uintptr(db.datasz), msInvalidate)
- if errno != 0 {
- return errno
- }
- return nil
-}
-
-func fdatasync(db *DB) error {
- if db.data != nil {
- return msync(db)
- }
- return db.file.Sync()
-}
diff --git a/vendor/github.com/boltdb/bolt/bolt_ppc.go b/vendor/github.com/boltdb/bolt/bolt_ppc.go
deleted file mode 100644
index 645ddc3..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_ppc.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build ppc
-
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0x7FFFFFFF // 2GB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0xFFFFFFF
diff --git a/vendor/github.com/boltdb/bolt/bolt_ppc64.go b/vendor/github.com/boltdb/bolt/bolt_ppc64.go
deleted file mode 100644
index 9331d97..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_ppc64.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build ppc64
-
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0xFFFFFFFFFFFF // 256TB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0x7FFFFFFF
-
-// Are unaligned load/stores broken on this arch?
-var brokenUnaligned = false
diff --git a/vendor/github.com/boltdb/bolt/bolt_ppc64le.go b/vendor/github.com/boltdb/bolt/bolt_ppc64le.go
deleted file mode 100644
index 8c143bc..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_ppc64le.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build ppc64le
-
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0xFFFFFFFFFFFF // 256TB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0x7FFFFFFF
-
-// Are unaligned load/stores broken on this arch?
-var brokenUnaligned = false
diff --git a/vendor/github.com/boltdb/bolt/bolt_s390x.go b/vendor/github.com/boltdb/bolt/bolt_s390x.go
deleted file mode 100644
index d7c39af..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_s390x.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build s390x
-
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0xFFFFFFFFFFFF // 256TB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0x7FFFFFFF
-
-// Are unaligned load/stores broken on this arch?
-var brokenUnaligned = false
diff --git a/vendor/github.com/boltdb/bolt/bolt_unix.go b/vendor/github.com/boltdb/bolt/bolt_unix.go
deleted file mode 100644
index cad62dd..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_unix.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// +build !windows,!plan9,!solaris
-
-package bolt
-
-import (
- "fmt"
- "os"
- "syscall"
- "time"
- "unsafe"
-)
-
-// flock acquires an advisory lock on a file descriptor.
-func flock(db *DB, mode os.FileMode, exclusive bool, timeout time.Duration) error {
- var t time.Time
- for {
- // If we're beyond our timeout then return an error.
- // This can only occur after we've attempted a flock once.
- if t.IsZero() {
- t = time.Now()
- } else if timeout > 0 && time.Since(t) > timeout {
- return ErrTimeout
- }
- flag := syscall.LOCK_SH
- if exclusive {
- flag = syscall.LOCK_EX
- }
-
- // Otherwise attempt to obtain an exclusive lock.
- err := syscall.Flock(int(db.file.Fd()), flag|syscall.LOCK_NB)
- if err == nil {
- return nil
- } else if err != syscall.EWOULDBLOCK {
- return err
- }
-
- // Wait for a bit and try again.
- time.Sleep(50 * time.Millisecond)
- }
-}
-
-// funlock releases an advisory lock on a file descriptor.
-func funlock(db *DB) error {
- return syscall.Flock(int(db.file.Fd()), syscall.LOCK_UN)
-}
-
-// mmap memory maps a DB's data file.
-func mmap(db *DB, sz int) error {
- // Map the data file to memory.
- b, err := syscall.Mmap(int(db.file.Fd()), 0, sz, syscall.PROT_READ, syscall.MAP_SHARED|db.MmapFlags)
- if err != nil {
- return err
- }
-
- // Advise the kernel that the mmap is accessed randomly.
- if err := madvise(b, syscall.MADV_RANDOM); err != nil {
- return fmt.Errorf("madvise: %s", err)
- }
-
- // Save the original byte slice and convert to a byte array pointer.
- db.dataref = b
- db.data = (*[maxMapSize]byte)(unsafe.Pointer(&b[0]))
- db.datasz = sz
- return nil
-}
-
-// munmap unmaps a DB's data file from memory.
-func munmap(db *DB) error {
- // Ignore the unmap if we have no mapped data.
- if db.dataref == nil {
- return nil
- }
-
- // Unmap using the original byte slice.
- err := syscall.Munmap(db.dataref)
- db.dataref = nil
- db.data = nil
- db.datasz = 0
- return err
-}
-
-// NOTE: This function is copied from stdlib because it is not available on darwin.
-func madvise(b []byte, advice int) (err error) {
- _, _, e1 := syscall.Syscall(syscall.SYS_MADVISE, uintptr(unsafe.Pointer(&b[0])), uintptr(len(b)), uintptr(advice))
- if e1 != 0 {
- err = e1
- }
- return
-}
diff --git a/vendor/github.com/boltdb/bolt/bolt_unix_solaris.go b/vendor/github.com/boltdb/bolt/bolt_unix_solaris.go
deleted file mode 100644
index 307bf2b..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_unix_solaris.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package bolt
-
-import (
- "fmt"
- "os"
- "syscall"
- "time"
- "unsafe"
-
- "golang.org/x/sys/unix"
-)
-
-// flock acquires an advisory lock on a file descriptor.
-func flock(db *DB, mode os.FileMode, exclusive bool, timeout time.Duration) error {
- var t time.Time
- for {
- // If we're beyond our timeout then return an error.
- // This can only occur after we've attempted a flock once.
- if t.IsZero() {
- t = time.Now()
- } else if timeout > 0 && time.Since(t) > timeout {
- return ErrTimeout
- }
- var lock syscall.Flock_t
- lock.Start = 0
- lock.Len = 0
- lock.Pid = 0
- lock.Whence = 0
- lock.Pid = 0
- if exclusive {
- lock.Type = syscall.F_WRLCK
- } else {
- lock.Type = syscall.F_RDLCK
- }
- err := syscall.FcntlFlock(db.file.Fd(), syscall.F_SETLK, &lock)
- if err == nil {
- return nil
- } else if err != syscall.EAGAIN {
- return err
- }
-
- // Wait for a bit and try again.
- time.Sleep(50 * time.Millisecond)
- }
-}
-
-// funlock releases an advisory lock on a file descriptor.
-func funlock(db *DB) error {
- var lock syscall.Flock_t
- lock.Start = 0
- lock.Len = 0
- lock.Type = syscall.F_UNLCK
- lock.Whence = 0
- return syscall.FcntlFlock(uintptr(db.file.Fd()), syscall.F_SETLK, &lock)
-}
-
-// mmap memory maps a DB's data file.
-func mmap(db *DB, sz int) error {
- // Map the data file to memory.
- b, err := unix.Mmap(int(db.file.Fd()), 0, sz, syscall.PROT_READ, syscall.MAP_SHARED|db.MmapFlags)
- if err != nil {
- return err
- }
-
- // Advise the kernel that the mmap is accessed randomly.
- if err := unix.Madvise(b, syscall.MADV_RANDOM); err != nil {
- return fmt.Errorf("madvise: %s", err)
- }
-
- // Save the original byte slice and convert to a byte array pointer.
- db.dataref = b
- db.data = (*[maxMapSize]byte)(unsafe.Pointer(&b[0]))
- db.datasz = sz
- return nil
-}
-
-// munmap unmaps a DB's data file from memory.
-func munmap(db *DB) error {
- // Ignore the unmap if we have no mapped data.
- if db.dataref == nil {
- return nil
- }
-
- // Unmap using the original byte slice.
- err := unix.Munmap(db.dataref)
- db.dataref = nil
- db.data = nil
- db.datasz = 0
- return err
-}
diff --git a/vendor/github.com/boltdb/bolt/bolt_windows.go b/vendor/github.com/boltdb/bolt/bolt_windows.go
deleted file mode 100644
index b00fb07..0000000
--- a/vendor/github.com/boltdb/bolt/bolt_windows.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package bolt
-
-import (
- "fmt"
- "os"
- "syscall"
- "time"
- "unsafe"
-)
-
-// LockFileEx code derived from golang build filemutex_windows.go @ v1.5.1
-var (
- modkernel32 = syscall.NewLazyDLL("kernel32.dll")
- procLockFileEx = modkernel32.NewProc("LockFileEx")
- procUnlockFileEx = modkernel32.NewProc("UnlockFileEx")
-)
-
-const (
- lockExt = ".lock"
-
- // see https://msdn.microsoft.com/en-us/library/windows/desktop/aa365203(v=vs.85).aspx
- flagLockExclusive = 2
- flagLockFailImmediately = 1
-
- // see https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382(v=vs.85).aspx
- errLockViolation syscall.Errno = 0x21
-)
-
-func lockFileEx(h syscall.Handle, flags, reserved, locklow, lockhigh uint32, ol *syscall.Overlapped) (err error) {
- r, _, err := procLockFileEx.Call(uintptr(h), uintptr(flags), uintptr(reserved), uintptr(locklow), uintptr(lockhigh), uintptr(unsafe.Pointer(ol)))
- if r == 0 {
- return err
- }
- return nil
-}
-
-func unlockFileEx(h syscall.Handle, reserved, locklow, lockhigh uint32, ol *syscall.Overlapped) (err error) {
- r, _, err := procUnlockFileEx.Call(uintptr(h), uintptr(reserved), uintptr(locklow), uintptr(lockhigh), uintptr(unsafe.Pointer(ol)), 0)
- if r == 0 {
- return err
- }
- return nil
-}
-
-// fdatasync flushes written data to a file descriptor.
-func fdatasync(db *DB) error {
- return db.file.Sync()
-}
-
-// flock acquires an advisory lock on a file descriptor.
-func flock(db *DB, mode os.FileMode, exclusive bool, timeout time.Duration) error {
- // Create a separate lock file on windows because a process
- // cannot share an exclusive lock on the same file. This is
- // needed during Tx.WriteTo().
- f, err := os.OpenFile(db.path+lockExt, os.O_CREATE, mode)
- if err != nil {
- return err
- }
- db.lockfile = f
-
- var t time.Time
- for {
- // If we're beyond our timeout then return an error.
- // This can only occur after we've attempted a flock once.
- if t.IsZero() {
- t = time.Now()
- } else if timeout > 0 && time.Since(t) > timeout {
- return ErrTimeout
- }
-
- var flag uint32 = flagLockFailImmediately
- if exclusive {
- flag |= flagLockExclusive
- }
-
- err := lockFileEx(syscall.Handle(db.lockfile.Fd()), flag, 0, 1, 0, &syscall.Overlapped{})
- if err == nil {
- return nil
- } else if err != errLockViolation {
- return err
- }
-
- // Wait for a bit and try again.
- time.Sleep(50 * time.Millisecond)
- }
-}
-
-// funlock releases an advisory lock on a file descriptor.
-func funlock(db *DB) error {
- err := unlockFileEx(syscall.Handle(db.lockfile.Fd()), 0, 1, 0, &syscall.Overlapped{})
- db.lockfile.Close()
- os.Remove(db.path + lockExt)
- return err
-}
-
-// mmap memory maps a DB's data file.
-// Based on: https://github.com/edsrzf/mmap-go
-func mmap(db *DB, sz int) error {
- if !db.readOnly {
- // Truncate the database to the size of the mmap.
- if err := db.file.Truncate(int64(sz)); err != nil {
- return fmt.Errorf("truncate: %s", err)
- }
- }
-
- // Open a file mapping handle.
- sizelo := uint32(sz >> 32)
- sizehi := uint32(sz) & 0xffffffff
- h, errno := syscall.CreateFileMapping(syscall.Handle(db.file.Fd()), nil, syscall.PAGE_READONLY, sizelo, sizehi, nil)
- if h == 0 {
- return os.NewSyscallError("CreateFileMapping", errno)
- }
-
- // Create the memory map.
- addr, errno := syscall.MapViewOfFile(h, syscall.FILE_MAP_READ, 0, 0, uintptr(sz))
- if addr == 0 {
- return os.NewSyscallError("MapViewOfFile", errno)
- }
-
- // Close mapping handle.
- if err := syscall.CloseHandle(syscall.Handle(h)); err != nil {
- return os.NewSyscallError("CloseHandle", err)
- }
-
- // Convert to a byte array.
- db.data = ((*[maxMapSize]byte)(unsafe.Pointer(addr)))
- db.datasz = sz
-
- return nil
-}
-
-// munmap unmaps a pointer from a file.
-// Based on: https://github.com/edsrzf/mmap-go
-func munmap(db *DB) error {
- if db.data == nil {
- return nil
- }
-
- addr := (uintptr)(unsafe.Pointer(&db.data[0]))
- if err := syscall.UnmapViewOfFile(addr); err != nil {
- return os.NewSyscallError("UnmapViewOfFile", err)
- }
- return nil
-}
diff --git a/vendor/github.com/boltdb/bolt/boltsync_unix.go b/vendor/github.com/boltdb/bolt/boltsync_unix.go
deleted file mode 100644
index f504425..0000000
--- a/vendor/github.com/boltdb/bolt/boltsync_unix.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !windows,!plan9,!linux,!openbsd
-
-package bolt
-
-// fdatasync flushes written data to a file descriptor.
-func fdatasync(db *DB) error {
- return db.file.Sync()
-}
diff --git a/vendor/github.com/boltdb/bolt/bucket.go b/vendor/github.com/boltdb/bolt/bucket.go
deleted file mode 100644
index 0c5bf27..0000000
--- a/vendor/github.com/boltdb/bolt/bucket.go
+++ /dev/null
@@ -1,777 +0,0 @@
-package bolt
-
-import (
- "bytes"
- "fmt"
- "unsafe"
-)
-
-const (
- // MaxKeySize is the maximum length of a key, in bytes.
- MaxKeySize = 32768
-
- // MaxValueSize is the maximum length of a value, in bytes.
- MaxValueSize = (1 << 31) - 2
-)
-
-const (
- maxUint = ^uint(0)
- minUint = 0
- maxInt = int(^uint(0) >> 1)
- minInt = -maxInt - 1
-)
-
-const bucketHeaderSize = int(unsafe.Sizeof(bucket{}))
-
-const (
- minFillPercent = 0.1
- maxFillPercent = 1.0
-)
-
-// DefaultFillPercent is the percentage that split pages are filled.
-// This value can be changed by setting Bucket.FillPercent.
-const DefaultFillPercent = 0.5
-
-// Bucket represents a collection of key/value pairs inside the database.
-type Bucket struct {
- *bucket
- tx *Tx // the associated transaction
- buckets map[string]*Bucket // subbucket cache
- page *page // inline page reference
- rootNode *node // materialized node for the root page.
- nodes map[pgid]*node // node cache
-
- // Sets the threshold for filling nodes when they split. By default,
- // the bucket will fill to 50% but it can be useful to increase this
- // amount if you know that your write workloads are mostly append-only.
- //
- // This is non-persisted across transactions so it must be set in every Tx.
- FillPercent float64
-}
-
-// bucket represents the on-file representation of a bucket.
-// This is stored as the "value" of a bucket key. If the bucket is small enough,
-// then its root page can be stored inline in the "value", after the bucket
-// header. In the case of inline buckets, the "root" will be 0.
-type bucket struct {
- root pgid // page id of the bucket's root-level page
- sequence uint64 // monotonically incrementing, used by NextSequence()
-}
-
-// newBucket returns a new bucket associated with a transaction.
-func newBucket(tx *Tx) Bucket {
- var b = Bucket{tx: tx, FillPercent: DefaultFillPercent}
- if tx.writable {
- b.buckets = make(map[string]*Bucket)
- b.nodes = make(map[pgid]*node)
- }
- return b
-}
-
-// Tx returns the tx of the bucket.
-func (b *Bucket) Tx() *Tx {
- return b.tx
-}
-
-// Root returns the root of the bucket.
-func (b *Bucket) Root() pgid {
- return b.root
-}
-
-// Writable returns whether the bucket is writable.
-func (b *Bucket) Writable() bool {
- return b.tx.writable
-}
-
-// Cursor creates a cursor associated with the bucket.
-// The cursor is only valid as long as the transaction is open.
-// Do not use a cursor after the transaction is closed.
-func (b *Bucket) Cursor() *Cursor {
- // Update transaction statistics.
- b.tx.stats.CursorCount++
-
- // Allocate and return a cursor.
- return &Cursor{
- bucket: b,
- stack: make([]elemRef, 0),
- }
-}
-
-// Bucket retrieves a nested bucket by name.
-// Returns nil if the bucket does not exist.
-// The bucket instance is only valid for the lifetime of the transaction.
-func (b *Bucket) Bucket(name []byte) *Bucket {
- if b.buckets != nil {
- if child := b.buckets[string(name)]; child != nil {
- return child
- }
- }
-
- // Move cursor to key.
- c := b.Cursor()
- k, v, flags := c.seek(name)
-
- // Return nil if the key doesn't exist or it is not a bucket.
- if !bytes.Equal(name, k) || (flags&bucketLeafFlag) == 0 {
- return nil
- }
-
- // Otherwise create a bucket and cache it.
- var child = b.openBucket(v)
- if b.buckets != nil {
- b.buckets[string(name)] = child
- }
-
- return child
-}
-
-// Helper method that re-interprets a sub-bucket value
-// from a parent into a Bucket
-func (b *Bucket) openBucket(value []byte) *Bucket {
- var child = newBucket(b.tx)
-
- // If unaligned load/stores are broken on this arch and value is
- // unaligned simply clone to an aligned byte array.
- unaligned := brokenUnaligned && uintptr(unsafe.Pointer(&value[0]))&3 != 0
-
- if unaligned {
- value = cloneBytes(value)
- }
-
- // If this is a writable transaction then we need to copy the bucket entry.
- // Read-only transactions can point directly at the mmap entry.
- if b.tx.writable && !unaligned {
- child.bucket = &bucket{}
- *child.bucket = *(*bucket)(unsafe.Pointer(&value[0]))
- } else {
- child.bucket = (*bucket)(unsafe.Pointer(&value[0]))
- }
-
- // Save a reference to the inline page if the bucket is inline.
- if child.root == 0 {
- child.page = (*page)(unsafe.Pointer(&value[bucketHeaderSize]))
- }
-
- return &child
-}
-
-// CreateBucket creates a new bucket at the given key and returns the new bucket.
-// Returns an error if the key already exists, if the bucket name is blank, or if the bucket name is too long.
-// The bucket instance is only valid for the lifetime of the transaction.
-func (b *Bucket) CreateBucket(key []byte) (*Bucket, error) {
- if b.tx.db == nil {
- return nil, ErrTxClosed
- } else if !b.tx.writable {
- return nil, ErrTxNotWritable
- } else if len(key) == 0 {
- return nil, ErrBucketNameRequired
- }
-
- // Move cursor to correct position.
- c := b.Cursor()
- k, _, flags := c.seek(key)
-
- // Return an error if there is an existing key.
- if bytes.Equal(key, k) {
- if (flags & bucketLeafFlag) != 0 {
- return nil, ErrBucketExists
- }
- return nil, ErrIncompatibleValue
- }
-
- // Create empty, inline bucket.
- var bucket = Bucket{
- bucket: &bucket{},
- rootNode: &node{isLeaf: true},
- FillPercent: DefaultFillPercent,
- }
- var value = bucket.write()
-
- // Insert into node.
- key = cloneBytes(key)
- c.node().put(key, key, value, 0, bucketLeafFlag)
-
- // Since subbuckets are not allowed on inline buckets, we need to
- // dereference the inline page, if it exists. This will cause the bucket
- // to be treated as a regular, non-inline bucket for the rest of the tx.
- b.page = nil
-
- return b.Bucket(key), nil
-}
-
-// CreateBucketIfNotExists creates a new bucket if it doesn't already exist and returns a reference to it.
-// Returns an error if the bucket name is blank, or if the bucket name is too long.
-// The bucket instance is only valid for the lifetime of the transaction.
-func (b *Bucket) CreateBucketIfNotExists(key []byte) (*Bucket, error) {
- child, err := b.CreateBucket(key)
- if err == ErrBucketExists {
- return b.Bucket(key), nil
- } else if err != nil {
- return nil, err
- }
- return child, nil
-}
-
-// DeleteBucket deletes a bucket at the given key.
-// Returns an error if the bucket does not exists, or if the key represents a non-bucket value.
-func (b *Bucket) DeleteBucket(key []byte) error {
- if b.tx.db == nil {
- return ErrTxClosed
- } else if !b.Writable() {
- return ErrTxNotWritable
- }
-
- // Move cursor to correct position.
- c := b.Cursor()
- k, _, flags := c.seek(key)
-
- // Return an error if bucket doesn't exist or is not a bucket.
- if !bytes.Equal(key, k) {
- return ErrBucketNotFound
- } else if (flags & bucketLeafFlag) == 0 {
- return ErrIncompatibleValue
- }
-
- // Recursively delete all child buckets.
- child := b.Bucket(key)
- err := child.ForEach(func(k, v []byte) error {
- if v == nil {
- if err := child.DeleteBucket(k); err != nil {
- return fmt.Errorf("delete bucket: %s", err)
- }
- }
- return nil
- })
- if err != nil {
- return err
- }
-
- // Remove cached copy.
- delete(b.buckets, string(key))
-
- // Release all bucket pages to freelist.
- child.nodes = nil
- child.rootNode = nil
- child.free()
-
- // Delete the node if we have a matching key.
- c.node().del(key)
-
- return nil
-}
-
-// Get retrieves the value for a key in the bucket.
-// Returns a nil value if the key does not exist or if the key is a nested bucket.
-// The returned value is only valid for the life of the transaction.
-func (b *Bucket) Get(key []byte) []byte {
- k, v, flags := b.Cursor().seek(key)
-
- // Return nil if this is a bucket.
- if (flags & bucketLeafFlag) != 0 {
- return nil
- }
-
- // If our target node isn't the same key as what's passed in then return nil.
- if !bytes.Equal(key, k) {
- return nil
- }
- return v
-}
-
-// Put sets the value for a key in the bucket.
-// If the key exist then its previous value will be overwritten.
-// Supplied value must remain valid for the life of the transaction.
-// Returns an error if the bucket was created from a read-only transaction, if the key is blank, if the key is too large, or if the value is too large.
-func (b *Bucket) Put(key []byte, value []byte) error {
- if b.tx.db == nil {
- return ErrTxClosed
- } else if !b.Writable() {
- return ErrTxNotWritable
- } else if len(key) == 0 {
- return ErrKeyRequired
- } else if len(key) > MaxKeySize {
- return ErrKeyTooLarge
- } else if int64(len(value)) > MaxValueSize {
- return ErrValueTooLarge
- }
-
- // Move cursor to correct position.
- c := b.Cursor()
- k, _, flags := c.seek(key)
-
- // Return an error if there is an existing key with a bucket value.
- if bytes.Equal(key, k) && (flags&bucketLeafFlag) != 0 {
- return ErrIncompatibleValue
- }
-
- // Insert into node.
- key = cloneBytes(key)
- c.node().put(key, key, value, 0, 0)
-
- return nil
-}
-
-// Delete removes a key from the bucket.
-// If the key does not exist then nothing is done and a nil error is returned.
-// Returns an error if the bucket was created from a read-only transaction.
-func (b *Bucket) Delete(key []byte) error {
- if b.tx.db == nil {
- return ErrTxClosed
- } else if !b.Writable() {
- return ErrTxNotWritable
- }
-
- // Move cursor to correct position.
- c := b.Cursor()
- _, _, flags := c.seek(key)
-
- // Return an error if there is already existing bucket value.
- if (flags & bucketLeafFlag) != 0 {
- return ErrIncompatibleValue
- }
-
- // Delete the node if we have a matching key.
- c.node().del(key)
-
- return nil
-}
-
-// Sequence returns the current integer for the bucket without incrementing it.
-func (b *Bucket) Sequence() uint64 { return b.bucket.sequence }
-
-// SetSequence updates the sequence number for the bucket.
-func (b *Bucket) SetSequence(v uint64) error {
- if b.tx.db == nil {
- return ErrTxClosed
- } else if !b.Writable() {
- return ErrTxNotWritable
- }
-
- // Materialize the root node if it hasn't been already so that the
- // bucket will be saved during commit.
- if b.rootNode == nil {
- _ = b.node(b.root, nil)
- }
-
- // Increment and return the sequence.
- b.bucket.sequence = v
- return nil
-}
-
-// NextSequence returns an autoincrementing integer for the bucket.
-func (b *Bucket) NextSequence() (uint64, error) {
- if b.tx.db == nil {
- return 0, ErrTxClosed
- } else if !b.Writable() {
- return 0, ErrTxNotWritable
- }
-
- // Materialize the root node if it hasn't been already so that the
- // bucket will be saved during commit.
- if b.rootNode == nil {
- _ = b.node(b.root, nil)
- }
-
- // Increment and return the sequence.
- b.bucket.sequence++
- return b.bucket.sequence, nil
-}
-
-// ForEach executes a function for each key/value pair in a bucket.
-// If the provided function returns an error then the iteration is stopped and
-// the error is returned to the caller. The provided function must not modify
-// the bucket; this will result in undefined behavior.
-func (b *Bucket) ForEach(fn func(k, v []byte) error) error {
- if b.tx.db == nil {
- return ErrTxClosed
- }
- c := b.Cursor()
- for k, v := c.First(); k != nil; k, v = c.Next() {
- if err := fn(k, v); err != nil {
- return err
- }
- }
- return nil
-}
-
-// Stat returns stats on a bucket.
-func (b *Bucket) Stats() BucketStats {
- var s, subStats BucketStats
- pageSize := b.tx.db.pageSize
- s.BucketN += 1
- if b.root == 0 {
- s.InlineBucketN += 1
- }
- b.forEachPage(func(p *page, depth int) {
- if (p.flags & leafPageFlag) != 0 {
- s.KeyN += int(p.count)
-
- // used totals the used bytes for the page
- used := pageHeaderSize
-
- if p.count != 0 {
- // If page has any elements, add all element headers.
- used += leafPageElementSize * int(p.count-1)
-
- // Add all element key, value sizes.
- // The computation takes advantage of the fact that the position
- // of the last element's key/value equals to the total of the sizes
- // of all previous elements' keys and values.
- // It also includes the last element's header.
- lastElement := p.leafPageElement(p.count - 1)
- used += int(lastElement.pos + lastElement.ksize + lastElement.vsize)
- }
-
- if b.root == 0 {
- // For inlined bucket just update the inline stats
- s.InlineBucketInuse += used
- } else {
- // For non-inlined bucket update all the leaf stats
- s.LeafPageN++
- s.LeafInuse += used
- s.LeafOverflowN += int(p.overflow)
-
- // Collect stats from sub-buckets.
- // Do that by iterating over all element headers
- // looking for the ones with the bucketLeafFlag.
- for i := uint16(0); i < p.count; i++ {
- e := p.leafPageElement(i)
- if (e.flags & bucketLeafFlag) != 0 {
- // For any bucket element, open the element value
- // and recursively call Stats on the contained bucket.
- subStats.Add(b.openBucket(e.value()).Stats())
- }
- }
- }
- } else if (p.flags & branchPageFlag) != 0 {
- s.BranchPageN++
- lastElement := p.branchPageElement(p.count - 1)
-
- // used totals the used bytes for the page
- // Add header and all element headers.
- used := pageHeaderSize + (branchPageElementSize * int(p.count-1))
-
- // Add size of all keys and values.
- // Again, use the fact that last element's position equals to
- // the total of key, value sizes of all previous elements.
- used += int(lastElement.pos + lastElement.ksize)
- s.BranchInuse += used
- s.BranchOverflowN += int(p.overflow)
- }
-
- // Keep track of maximum page depth.
- if depth+1 > s.Depth {
- s.Depth = (depth + 1)
- }
- })
-
- // Alloc stats can be computed from page counts and pageSize.
- s.BranchAlloc = (s.BranchPageN + s.BranchOverflowN) * pageSize
- s.LeafAlloc = (s.LeafPageN + s.LeafOverflowN) * pageSize
-
- // Add the max depth of sub-buckets to get total nested depth.
- s.Depth += subStats.Depth
- // Add the stats for all sub-buckets
- s.Add(subStats)
- return s
-}
-
-// forEachPage iterates over every page in a bucket, including inline pages.
-func (b *Bucket) forEachPage(fn func(*page, int)) {
- // If we have an inline page then just use that.
- if b.page != nil {
- fn(b.page, 0)
- return
- }
-
- // Otherwise traverse the page hierarchy.
- b.tx.forEachPage(b.root, 0, fn)
-}
-
-// forEachPageNode iterates over every page (or node) in a bucket.
-// This also includes inline pages.
-func (b *Bucket) forEachPageNode(fn func(*page, *node, int)) {
- // If we have an inline page or root node then just use that.
- if b.page != nil {
- fn(b.page, nil, 0)
- return
- }
- b._forEachPageNode(b.root, 0, fn)
-}
-
-func (b *Bucket) _forEachPageNode(pgid pgid, depth int, fn func(*page, *node, int)) {
- var p, n = b.pageNode(pgid)
-
- // Execute function.
- fn(p, n, depth)
-
- // Recursively loop over children.
- if p != nil {
- if (p.flags & branchPageFlag) != 0 {
- for i := 0; i < int(p.count); i++ {
- elem := p.branchPageElement(uint16(i))
- b._forEachPageNode(elem.pgid, depth+1, fn)
- }
- }
- } else {
- if !n.isLeaf {
- for _, inode := range n.inodes {
- b._forEachPageNode(inode.pgid, depth+1, fn)
- }
- }
- }
-}
-
-// spill writes all the nodes for this bucket to dirty pages.
-func (b *Bucket) spill() error {
- // Spill all child buckets first.
- for name, child := range b.buckets {
- // If the child bucket is small enough and it has no child buckets then
- // write it inline into the parent bucket's page. Otherwise spill it
- // like a normal bucket and make the parent value a pointer to the page.
- var value []byte
- if child.inlineable() {
- child.free()
- value = child.write()
- } else {
- if err := child.spill(); err != nil {
- return err
- }
-
- // Update the child bucket header in this bucket.
- value = make([]byte, unsafe.Sizeof(bucket{}))
- var bucket = (*bucket)(unsafe.Pointer(&value[0]))
- *bucket = *child.bucket
- }
-
- // Skip writing the bucket if there are no materialized nodes.
- if child.rootNode == nil {
- continue
- }
-
- // Update parent node.
- var c = b.Cursor()
- k, _, flags := c.seek([]byte(name))
- if !bytes.Equal([]byte(name), k) {
- panic(fmt.Sprintf("misplaced bucket header: %x -> %x", []byte(name), k))
- }
- if flags&bucketLeafFlag == 0 {
- panic(fmt.Sprintf("unexpected bucket header flag: %x", flags))
- }
- c.node().put([]byte(name), []byte(name), value, 0, bucketLeafFlag)
- }
-
- // Ignore if there's not a materialized root node.
- if b.rootNode == nil {
- return nil
- }
-
- // Spill nodes.
- if err := b.rootNode.spill(); err != nil {
- return err
- }
- b.rootNode = b.rootNode.root()
-
- // Update the root node for this bucket.
- if b.rootNode.pgid >= b.tx.meta.pgid {
- panic(fmt.Sprintf("pgid (%d) above high water mark (%d)", b.rootNode.pgid, b.tx.meta.pgid))
- }
- b.root = b.rootNode.pgid
-
- return nil
-}
-
-// inlineable returns true if a bucket is small enough to be written inline
-// and if it contains no subbuckets. Otherwise returns false.
-func (b *Bucket) inlineable() bool {
- var n = b.rootNode
-
- // Bucket must only contain a single leaf node.
- if n == nil || !n.isLeaf {
- return false
- }
-
- // Bucket is not inlineable if it contains subbuckets or if it goes beyond
- // our threshold for inline bucket size.
- var size = pageHeaderSize
- for _, inode := range n.inodes {
- size += leafPageElementSize + len(inode.key) + len(inode.value)
-
- if inode.flags&bucketLeafFlag != 0 {
- return false
- } else if size > b.maxInlineBucketSize() {
- return false
- }
- }
-
- return true
-}
-
-// Returns the maximum total size of a bucket to make it a candidate for inlining.
-func (b *Bucket) maxInlineBucketSize() int {
- return b.tx.db.pageSize / 4
-}
-
-// write allocates and writes a bucket to a byte slice.
-func (b *Bucket) write() []byte {
- // Allocate the appropriate size.
- var n = b.rootNode
- var value = make([]byte, bucketHeaderSize+n.size())
-
- // Write a bucket header.
- var bucket = (*bucket)(unsafe.Pointer(&value[0]))
- *bucket = *b.bucket
-
- // Convert byte slice to a fake page and write the root node.
- var p = (*page)(unsafe.Pointer(&value[bucketHeaderSize]))
- n.write(p)
-
- return value
-}
-
-// rebalance attempts to balance all nodes.
-func (b *Bucket) rebalance() {
- for _, n := range b.nodes {
- n.rebalance()
- }
- for _, child := range b.buckets {
- child.rebalance()
- }
-}
-
-// node creates a node from a page and associates it with a given parent.
-func (b *Bucket) node(pgid pgid, parent *node) *node {
- _assert(b.nodes != nil, "nodes map expected")
-
- // Retrieve node if it's already been created.
- if n := b.nodes[pgid]; n != nil {
- return n
- }
-
- // Otherwise create a node and cache it.
- n := &node{bucket: b, parent: parent}
- if parent == nil {
- b.rootNode = n
- } else {
- parent.children = append(parent.children, n)
- }
-
- // Use the inline page if this is an inline bucket.
- var p = b.page
- if p == nil {
- p = b.tx.page(pgid)
- }
-
- // Read the page into the node and cache it.
- n.read(p)
- b.nodes[pgid] = n
-
- // Update statistics.
- b.tx.stats.NodeCount++
-
- return n
-}
-
-// free recursively frees all pages in the bucket.
-func (b *Bucket) free() {
- if b.root == 0 {
- return
- }
-
- var tx = b.tx
- b.forEachPageNode(func(p *page, n *node, _ int) {
- if p != nil {
- tx.db.freelist.free(tx.meta.txid, p)
- } else {
- n.free()
- }
- })
- b.root = 0
-}
-
-// dereference removes all references to the old mmap.
-func (b *Bucket) dereference() {
- if b.rootNode != nil {
- b.rootNode.root().dereference()
- }
-
- for _, child := range b.buckets {
- child.dereference()
- }
-}
-
-// pageNode returns the in-memory node, if it exists.
-// Otherwise returns the underlying page.
-func (b *Bucket) pageNode(id pgid) (*page, *node) {
- // Inline buckets have a fake page embedded in their value so treat them
- // differently. We'll return the rootNode (if available) or the fake page.
- if b.root == 0 {
- if id != 0 {
- panic(fmt.Sprintf("inline bucket non-zero page access(2): %d != 0", id))
- }
- if b.rootNode != nil {
- return nil, b.rootNode
- }
- return b.page, nil
- }
-
- // Check the node cache for non-inline buckets.
- if b.nodes != nil {
- if n := b.nodes[id]; n != nil {
- return nil, n
- }
- }
-
- // Finally lookup the page from the transaction if no node is materialized.
- return b.tx.page(id), nil
-}
-
-// BucketStats records statistics about resources used by a bucket.
-type BucketStats struct {
- // Page count statistics.
- BranchPageN int // number of logical branch pages
- BranchOverflowN int // number of physical branch overflow pages
- LeafPageN int // number of logical leaf pages
- LeafOverflowN int // number of physical leaf overflow pages
-
- // Tree statistics.
- KeyN int // number of keys/value pairs
- Depth int // number of levels in B+tree
-
- // Page size utilization.
- BranchAlloc int // bytes allocated for physical branch pages
- BranchInuse int // bytes actually used for branch data
- LeafAlloc int // bytes allocated for physical leaf pages
- LeafInuse int // bytes actually used for leaf data
-
- // Bucket statistics
- BucketN int // total number of buckets including the top bucket
- InlineBucketN int // total number on inlined buckets
- InlineBucketInuse int // bytes used for inlined buckets (also accounted for in LeafInuse)
-}
-
-func (s *BucketStats) Add(other BucketStats) {
- s.BranchPageN += other.BranchPageN
- s.BranchOverflowN += other.BranchOverflowN
- s.LeafPageN += other.LeafPageN
- s.LeafOverflowN += other.LeafOverflowN
- s.KeyN += other.KeyN
- if s.Depth < other.Depth {
- s.Depth = other.Depth
- }
- s.BranchAlloc += other.BranchAlloc
- s.BranchInuse += other.BranchInuse
- s.LeafAlloc += other.LeafAlloc
- s.LeafInuse += other.LeafInuse
-
- s.BucketN += other.BucketN
- s.InlineBucketN += other.InlineBucketN
- s.InlineBucketInuse += other.InlineBucketInuse
-}
-
-// cloneBytes returns a copy of a given slice.
-func cloneBytes(v []byte) []byte {
- var clone = make([]byte, len(v))
- copy(clone, v)
- return clone
-}
diff --git a/vendor/github.com/boltdb/bolt/cursor.go b/vendor/github.com/boltdb/bolt/cursor.go
deleted file mode 100644
index 1be9f35..0000000
--- a/vendor/github.com/boltdb/bolt/cursor.go
+++ /dev/null
@@ -1,400 +0,0 @@
-package bolt
-
-import (
- "bytes"
- "fmt"
- "sort"
-)
-
-// Cursor represents an iterator that can traverse over all key/value pairs in a bucket in sorted order.
-// Cursors see nested buckets with value == nil.
-// Cursors can be obtained from a transaction and are valid as long as the transaction is open.
-//
-// Keys and values returned from the cursor are only valid for the life of the transaction.
-//
-// Changing data while traversing with a cursor may cause it to be invalidated
-// and return unexpected keys and/or values. You must reposition your cursor
-// after mutating data.
-type Cursor struct {
- bucket *Bucket
- stack []elemRef
-}
-
-// Bucket returns the bucket that this cursor was created from.
-func (c *Cursor) Bucket() *Bucket {
- return c.bucket
-}
-
-// First moves the cursor to the first item in the bucket and returns its key and value.
-// If the bucket is empty then a nil key and value are returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) First() (key []byte, value []byte) {
- _assert(c.bucket.tx.db != nil, "tx closed")
- c.stack = c.stack[:0]
- p, n := c.bucket.pageNode(c.bucket.root)
- c.stack = append(c.stack, elemRef{page: p, node: n, index: 0})
- c.first()
-
- // If we land on an empty page then move to the next value.
- // https://github.com/boltdb/bolt/issues/450
- if c.stack[len(c.stack)-1].count() == 0 {
- c.next()
- }
-
- k, v, flags := c.keyValue()
- if (flags & uint32(bucketLeafFlag)) != 0 {
- return k, nil
- }
- return k, v
-
-}
-
-// Last moves the cursor to the last item in the bucket and returns its key and value.
-// If the bucket is empty then a nil key and value are returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) Last() (key []byte, value []byte) {
- _assert(c.bucket.tx.db != nil, "tx closed")
- c.stack = c.stack[:0]
- p, n := c.bucket.pageNode(c.bucket.root)
- ref := elemRef{page: p, node: n}
- ref.index = ref.count() - 1
- c.stack = append(c.stack, ref)
- c.last()
- k, v, flags := c.keyValue()
- if (flags & uint32(bucketLeafFlag)) != 0 {
- return k, nil
- }
- return k, v
-}
-
-// Next moves the cursor to the next item in the bucket and returns its key and value.
-// If the cursor is at the end of the bucket then a nil key and value are returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) Next() (key []byte, value []byte) {
- _assert(c.bucket.tx.db != nil, "tx closed")
- k, v, flags := c.next()
- if (flags & uint32(bucketLeafFlag)) != 0 {
- return k, nil
- }
- return k, v
-}
-
-// Prev moves the cursor to the previous item in the bucket and returns its key and value.
-// If the cursor is at the beginning of the bucket then a nil key and value are returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) Prev() (key []byte, value []byte) {
- _assert(c.bucket.tx.db != nil, "tx closed")
-
- // Attempt to move back one element until we're successful.
- // Move up the stack as we hit the beginning of each page in our stack.
- for i := len(c.stack) - 1; i >= 0; i-- {
- elem := &c.stack[i]
- if elem.index > 0 {
- elem.index--
- break
- }
- c.stack = c.stack[:i]
- }
-
- // If we've hit the end then return nil.
- if len(c.stack) == 0 {
- return nil, nil
- }
-
- // Move down the stack to find the last element of the last leaf under this branch.
- c.last()
- k, v, flags := c.keyValue()
- if (flags & uint32(bucketLeafFlag)) != 0 {
- return k, nil
- }
- return k, v
-}
-
-// Seek moves the cursor to a given key and returns it.
-// If the key does not exist then the next key is used. If no keys
-// follow, a nil key is returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) Seek(seek []byte) (key []byte, value []byte) {
- k, v, flags := c.seek(seek)
-
- // If we ended up after the last element of a page then move to the next one.
- if ref := &c.stack[len(c.stack)-1]; ref.index >= ref.count() {
- k, v, flags = c.next()
- }
-
- if k == nil {
- return nil, nil
- } else if (flags & uint32(bucketLeafFlag)) != 0 {
- return k, nil
- }
- return k, v
-}
-
-// Delete removes the current key/value under the cursor from the bucket.
-// Delete fails if current key/value is a bucket or if the transaction is not writable.
-func (c *Cursor) Delete() error {
- if c.bucket.tx.db == nil {
- return ErrTxClosed
- } else if !c.bucket.Writable() {
- return ErrTxNotWritable
- }
-
- key, _, flags := c.keyValue()
- // Return an error if current value is a bucket.
- if (flags & bucketLeafFlag) != 0 {
- return ErrIncompatibleValue
- }
- c.node().del(key)
-
- return nil
-}
-
-// seek moves the cursor to a given key and returns it.
-// If the key does not exist then the next key is used.
-func (c *Cursor) seek(seek []byte) (key []byte, value []byte, flags uint32) {
- _assert(c.bucket.tx.db != nil, "tx closed")
-
- // Start from root page/node and traverse to correct page.
- c.stack = c.stack[:0]
- c.search(seek, c.bucket.root)
- ref := &c.stack[len(c.stack)-1]
-
- // If the cursor is pointing to the end of page/node then return nil.
- if ref.index >= ref.count() {
- return nil, nil, 0
- }
-
- // If this is a bucket then return a nil value.
- return c.keyValue()
-}
-
-// first moves the cursor to the first leaf element under the last page in the stack.
-func (c *Cursor) first() {
- for {
- // Exit when we hit a leaf page.
- var ref = &c.stack[len(c.stack)-1]
- if ref.isLeaf() {
- break
- }
-
- // Keep adding pages pointing to the first element to the stack.
- var pgid pgid
- if ref.node != nil {
- pgid = ref.node.inodes[ref.index].pgid
- } else {
- pgid = ref.page.branchPageElement(uint16(ref.index)).pgid
- }
- p, n := c.bucket.pageNode(pgid)
- c.stack = append(c.stack, elemRef{page: p, node: n, index: 0})
- }
-}
-
-// last moves the cursor to the last leaf element under the last page in the stack.
-func (c *Cursor) last() {
- for {
- // Exit when we hit a leaf page.
- ref := &c.stack[len(c.stack)-1]
- if ref.isLeaf() {
- break
- }
-
- // Keep adding pages pointing to the last element in the stack.
- var pgid pgid
- if ref.node != nil {
- pgid = ref.node.inodes[ref.index].pgid
- } else {
- pgid = ref.page.branchPageElement(uint16(ref.index)).pgid
- }
- p, n := c.bucket.pageNode(pgid)
-
- var nextRef = elemRef{page: p, node: n}
- nextRef.index = nextRef.count() - 1
- c.stack = append(c.stack, nextRef)
- }
-}
-
-// next moves to the next leaf element and returns the key and value.
-// If the cursor is at the last leaf element then it stays there and returns nil.
-func (c *Cursor) next() (key []byte, value []byte, flags uint32) {
- for {
- // Attempt to move over one element until we're successful.
- // Move up the stack as we hit the end of each page in our stack.
- var i int
- for i = len(c.stack) - 1; i >= 0; i-- {
- elem := &c.stack[i]
- if elem.index < elem.count()-1 {
- elem.index++
- break
- }
- }
-
- // If we've hit the root page then stop and return. This will leave the
- // cursor on the last element of the last page.
- if i == -1 {
- return nil, nil, 0
- }
-
- // Otherwise start from where we left off in the stack and find the
- // first element of the first leaf page.
- c.stack = c.stack[:i+1]
- c.first()
-
- // If this is an empty page then restart and move back up the stack.
- // https://github.com/boltdb/bolt/issues/450
- if c.stack[len(c.stack)-1].count() == 0 {
- continue
- }
-
- return c.keyValue()
- }
-}
-
-// search recursively performs a binary search against a given page/node until it finds a given key.
-func (c *Cursor) search(key []byte, pgid pgid) {
- p, n := c.bucket.pageNode(pgid)
- if p != nil && (p.flags&(branchPageFlag|leafPageFlag)) == 0 {
- panic(fmt.Sprintf("invalid page type: %d: %x", p.id, p.flags))
- }
- e := elemRef{page: p, node: n}
- c.stack = append(c.stack, e)
-
- // If we're on a leaf page/node then find the specific node.
- if e.isLeaf() {
- c.nsearch(key)
- return
- }
-
- if n != nil {
- c.searchNode(key, n)
- return
- }
- c.searchPage(key, p)
-}
-
-func (c *Cursor) searchNode(key []byte, n *node) {
- var exact bool
- index := sort.Search(len(n.inodes), func(i int) bool {
- // TODO(benbjohnson): Optimize this range search. It's a bit hacky right now.
- // sort.Search() finds the lowest index where f() != -1 but we need the highest index.
- ret := bytes.Compare(n.inodes[i].key, key)
- if ret == 0 {
- exact = true
- }
- return ret != -1
- })
- if !exact && index > 0 {
- index--
- }
- c.stack[len(c.stack)-1].index = index
-
- // Recursively search to the next page.
- c.search(key, n.inodes[index].pgid)
-}
-
-func (c *Cursor) searchPage(key []byte, p *page) {
- // Binary search for the correct range.
- inodes := p.branchPageElements()
-
- var exact bool
- index := sort.Search(int(p.count), func(i int) bool {
- // TODO(benbjohnson): Optimize this range search. It's a bit hacky right now.
- // sort.Search() finds the lowest index where f() != -1 but we need the highest index.
- ret := bytes.Compare(inodes[i].key(), key)
- if ret == 0 {
- exact = true
- }
- return ret != -1
- })
- if !exact && index > 0 {
- index--
- }
- c.stack[len(c.stack)-1].index = index
-
- // Recursively search to the next page.
- c.search(key, inodes[index].pgid)
-}
-
-// nsearch searches the leaf node on the top of the stack for a key.
-func (c *Cursor) nsearch(key []byte) {
- e := &c.stack[len(c.stack)-1]
- p, n := e.page, e.node
-
- // If we have a node then search its inodes.
- if n != nil {
- index := sort.Search(len(n.inodes), func(i int) bool {
- return bytes.Compare(n.inodes[i].key, key) != -1
- })
- e.index = index
- return
- }
-
- // If we have a page then search its leaf elements.
- inodes := p.leafPageElements()
- index := sort.Search(int(p.count), func(i int) bool {
- return bytes.Compare(inodes[i].key(), key) != -1
- })
- e.index = index
-}
-
-// keyValue returns the key and value of the current leaf element.
-func (c *Cursor) keyValue() ([]byte, []byte, uint32) {
- ref := &c.stack[len(c.stack)-1]
- if ref.count() == 0 || ref.index >= ref.count() {
- return nil, nil, 0
- }
-
- // Retrieve value from node.
- if ref.node != nil {
- inode := &ref.node.inodes[ref.index]
- return inode.key, inode.value, inode.flags
- }
-
- // Or retrieve value from page.
- elem := ref.page.leafPageElement(uint16(ref.index))
- return elem.key(), elem.value(), elem.flags
-}
-
-// node returns the node that the cursor is currently positioned on.
-func (c *Cursor) node() *node {
- _assert(len(c.stack) > 0, "accessing a node with a zero-length cursor stack")
-
- // If the top of the stack is a leaf node then just return it.
- if ref := &c.stack[len(c.stack)-1]; ref.node != nil && ref.isLeaf() {
- return ref.node
- }
-
- // Start from root and traverse down the hierarchy.
- var n = c.stack[0].node
- if n == nil {
- n = c.bucket.node(c.stack[0].page.id, nil)
- }
- for _, ref := range c.stack[:len(c.stack)-1] {
- _assert(!n.isLeaf, "expected branch node")
- n = n.childAt(int(ref.index))
- }
- _assert(n.isLeaf, "expected leaf node")
- return n
-}
-
-// elemRef represents a reference to an element on a given page/node.
-type elemRef struct {
- page *page
- node *node
- index int
-}
-
-// isLeaf returns whether the ref is pointing at a leaf page/node.
-func (r *elemRef) isLeaf() bool {
- if r.node != nil {
- return r.node.isLeaf
- }
- return (r.page.flags & leafPageFlag) != 0
-}
-
-// count returns the number of inodes or page elements.
-func (r *elemRef) count() int {
- if r.node != nil {
- return len(r.node.inodes)
- }
- return int(r.page.count)
-}
diff --git a/vendor/github.com/boltdb/bolt/db.go b/vendor/github.com/boltdb/bolt/db.go
deleted file mode 100644
index f352ff1..0000000
--- a/vendor/github.com/boltdb/bolt/db.go
+++ /dev/null
@@ -1,1039 +0,0 @@
-package bolt
-
-import (
- "errors"
- "fmt"
- "hash/fnv"
- "log"
- "os"
- "runtime"
- "runtime/debug"
- "strings"
- "sync"
- "time"
- "unsafe"
-)
-
-// The largest step that can be taken when remapping the mmap.
-const maxMmapStep = 1 << 30 // 1GB
-
-// The data file format version.
-const version = 2
-
-// Represents a marker value to indicate that a file is a Bolt DB.
-const magic uint32 = 0xED0CDAED
-
-// IgnoreNoSync specifies whether the NoSync field of a DB is ignored when
-// syncing changes to a file. This is required as some operating systems,
-// such as OpenBSD, do not have a unified buffer cache (UBC) and writes
-// must be synchronized using the msync(2) syscall.
-const IgnoreNoSync = runtime.GOOS == "openbsd"
-
-// Default values if not set in a DB instance.
-const (
- DefaultMaxBatchSize int = 1000
- DefaultMaxBatchDelay = 10 * time.Millisecond
- DefaultAllocSize = 16 * 1024 * 1024
-)
-
-// default page size for db is set to the OS page size.
-var defaultPageSize = os.Getpagesize()
-
-// DB represents a collection of buckets persisted to a file on disk.
-// All data access is performed through transactions which can be obtained through the DB.
-// All the functions on DB will return a ErrDatabaseNotOpen if accessed before Open() is called.
-type DB struct {
- // When enabled, the database will perform a Check() after every commit.
- // A panic is issued if the database is in an inconsistent state. This
- // flag has a large performance impact so it should only be used for
- // debugging purposes.
- StrictMode bool
-
- // Setting the NoSync flag will cause the database to skip fsync()
- // calls after each commit. This can be useful when bulk loading data
- // into a database and you can restart the bulk load in the event of
- // a system failure or database corruption. Do not set this flag for
- // normal use.
- //
- // If the package global IgnoreNoSync constant is true, this value is
- // ignored. See the comment on that constant for more details.
- //
- // THIS IS UNSAFE. PLEASE USE WITH CAUTION.
- NoSync bool
-
- // When true, skips the truncate call when growing the database.
- // Setting this to true is only safe on non-ext3/ext4 systems.
- // Skipping truncation avoids preallocation of hard drive space and
- // bypasses a truncate() and fsync() syscall on remapping.
- //
- // https://github.com/boltdb/bolt/issues/284
- NoGrowSync bool
-
- // If you want to read the entire database fast, you can set MmapFlag to
- // syscall.MAP_POPULATE on Linux 2.6.23+ for sequential read-ahead.
- MmapFlags int
-
- // MaxBatchSize is the maximum size of a batch. Default value is
- // copied from DefaultMaxBatchSize in Open.
- //
- // If <=0, disables batching.
- //
- // Do not change concurrently with calls to Batch.
- MaxBatchSize int
-
- // MaxBatchDelay is the maximum delay before a batch starts.
- // Default value is copied from DefaultMaxBatchDelay in Open.
- //
- // If <=0, effectively disables batching.
- //
- // Do not change concurrently with calls to Batch.
- MaxBatchDelay time.Duration
-
- // AllocSize is the amount of space allocated when the database
- // needs to create new pages. This is done to amortize the cost
- // of truncate() and fsync() when growing the data file.
- AllocSize int
-
- path string
- file *os.File
- lockfile *os.File // windows only
- dataref []byte // mmap'ed readonly, write throws SEGV
- data *[maxMapSize]byte
- datasz int
- filesz int // current on disk file size
- meta0 *meta
- meta1 *meta
- pageSize int
- opened bool
- rwtx *Tx
- txs []*Tx
- freelist *freelist
- stats Stats
-
- pagePool sync.Pool
-
- batchMu sync.Mutex
- batch *batch
-
- rwlock sync.Mutex // Allows only one writer at a time.
- metalock sync.Mutex // Protects meta page access.
- mmaplock sync.RWMutex // Protects mmap access during remapping.
- statlock sync.RWMutex // Protects stats access.
-
- ops struct {
- writeAt func(b []byte, off int64) (n int, err error)
- }
-
- // Read only mode.
- // When true, Update() and Begin(true) return ErrDatabaseReadOnly immediately.
- readOnly bool
-}
-
-// Path returns the path to currently open database file.
-func (db *DB) Path() string {
- return db.path
-}
-
-// GoString returns the Go string representation of the database.
-func (db *DB) GoString() string {
- return fmt.Sprintf("bolt.DB{path:%q}", db.path)
-}
-
-// String returns the string representation of the database.
-func (db *DB) String() string {
- return fmt.Sprintf("DB<%q>", db.path)
-}
-
-// Open creates and opens a database at the given path.
-// If the file does not exist then it will be created automatically.
-// Passing in nil options will cause Bolt to open the database with the default options.
-func Open(path string, mode os.FileMode, options *Options) (*DB, error) {
- var db = &DB{opened: true}
-
- // Set default options if no options are provided.
- if options == nil {
- options = DefaultOptions
- }
- db.NoGrowSync = options.NoGrowSync
- db.MmapFlags = options.MmapFlags
-
- // Set default values for later DB operations.
- db.MaxBatchSize = DefaultMaxBatchSize
- db.MaxBatchDelay = DefaultMaxBatchDelay
- db.AllocSize = DefaultAllocSize
-
- flag := os.O_RDWR
- if options.ReadOnly {
- flag = os.O_RDONLY
- db.readOnly = true
- }
-
- // Open data file and separate sync handler for metadata writes.
- db.path = path
- var err error
- if db.file, err = os.OpenFile(db.path, flag|os.O_CREATE, mode); err != nil {
- _ = db.close()
- return nil, err
- }
-
- // Lock file so that other processes using Bolt in read-write mode cannot
- // use the database at the same time. This would cause corruption since
- // the two processes would write meta pages and free pages separately.
- // The database file is locked exclusively (only one process can grab the lock)
- // if !options.ReadOnly.
- // The database file is locked using the shared lock (more than one process may
- // hold a lock at the same time) otherwise (options.ReadOnly is set).
- if err := flock(db, mode, !db.readOnly, options.Timeout); err != nil {
- _ = db.close()
- return nil, err
- }
-
- // Default values for test hooks
- db.ops.writeAt = db.file.WriteAt
-
- // Initialize the database if it doesn't exist.
- if info, err := db.file.Stat(); err != nil {
- return nil, err
- } else if info.Size() == 0 {
- // Initialize new files with meta pages.
- if err := db.init(); err != nil {
- return nil, err
- }
- } else {
- // Read the first meta page to determine the page size.
- var buf [0x1000]byte
- if _, err := db.file.ReadAt(buf[:], 0); err == nil {
- m := db.pageInBuffer(buf[:], 0).meta()
- if err := m.validate(); err != nil {
- // If we can't read the page size, we can assume it's the same
- // as the OS -- since that's how the page size was chosen in the
- // first place.
- //
- // If the first page is invalid and this OS uses a different
- // page size than what the database was created with then we
- // are out of luck and cannot access the database.
- db.pageSize = os.Getpagesize()
- } else {
- db.pageSize = int(m.pageSize)
- }
- }
- }
-
- // Initialize page pool.
- db.pagePool = sync.Pool{
- New: func() interface{} {
- return make([]byte, db.pageSize)
- },
- }
-
- // Memory map the data file.
- if err := db.mmap(options.InitialMmapSize); err != nil {
- _ = db.close()
- return nil, err
- }
-
- // Read in the freelist.
- db.freelist = newFreelist()
- db.freelist.read(db.page(db.meta().freelist))
-
- // Mark the database as opened and return.
- return db, nil
-}
-
-// mmap opens the underlying memory-mapped file and initializes the meta references.
-// minsz is the minimum size that the new mmap can be.
-func (db *DB) mmap(minsz int) error {
- db.mmaplock.Lock()
- defer db.mmaplock.Unlock()
-
- info, err := db.file.Stat()
- if err != nil {
- return fmt.Errorf("mmap stat error: %s", err)
- } else if int(info.Size()) < db.pageSize*2 {
- return fmt.Errorf("file size too small")
- }
-
- // Ensure the size is at least the minimum size.
- var size = int(info.Size())
- if size < minsz {
- size = minsz
- }
- size, err = db.mmapSize(size)
- if err != nil {
- return err
- }
-
- // Dereference all mmap references before unmapping.
- if db.rwtx != nil {
- db.rwtx.root.dereference()
- }
-
- // Unmap existing data before continuing.
- if err := db.munmap(); err != nil {
- return err
- }
-
- // Memory-map the data file as a byte slice.
- if err := mmap(db, size); err != nil {
- return err
- }
-
- // Save references to the meta pages.
- db.meta0 = db.page(0).meta()
- db.meta1 = db.page(1).meta()
-
- // Validate the meta pages. We only return an error if both meta pages fail
- // validation, since meta0 failing validation means that it wasn't saved
- // properly -- but we can recover using meta1. And vice-versa.
- err0 := db.meta0.validate()
- err1 := db.meta1.validate()
- if err0 != nil && err1 != nil {
- return err0
- }
-
- return nil
-}
-
-// munmap unmaps the data file from memory.
-func (db *DB) munmap() error {
- if err := munmap(db); err != nil {
- return fmt.Errorf("unmap error: " + err.Error())
- }
- return nil
-}
-
-// mmapSize determines the appropriate size for the mmap given the current size
-// of the database. The minimum size is 32KB and doubles until it reaches 1GB.
-// Returns an error if the new mmap size is greater than the max allowed.
-func (db *DB) mmapSize(size int) (int, error) {
- // Double the size from 32KB until 1GB.
- for i := uint(15); i <= 30; i++ {
- if size <= 1< maxMapSize {
- return 0, fmt.Errorf("mmap too large")
- }
-
- // If larger than 1GB then grow by 1GB at a time.
- sz := int64(size)
- if remainder := sz % int64(maxMmapStep); remainder > 0 {
- sz += int64(maxMmapStep) - remainder
- }
-
- // Ensure that the mmap size is a multiple of the page size.
- // This should always be true since we're incrementing in MBs.
- pageSize := int64(db.pageSize)
- if (sz % pageSize) != 0 {
- sz = ((sz / pageSize) + 1) * pageSize
- }
-
- // If we've exceeded the max size then only grow up to the max size.
- if sz > maxMapSize {
- sz = maxMapSize
- }
-
- return int(sz), nil
-}
-
-// init creates a new database file and initializes its meta pages.
-func (db *DB) init() error {
- // Set the page size to the OS page size.
- db.pageSize = os.Getpagesize()
-
- // Create two meta pages on a buffer.
- buf := make([]byte, db.pageSize*4)
- for i := 0; i < 2; i++ {
- p := db.pageInBuffer(buf[:], pgid(i))
- p.id = pgid(i)
- p.flags = metaPageFlag
-
- // Initialize the meta page.
- m := p.meta()
- m.magic = magic
- m.version = version
- m.pageSize = uint32(db.pageSize)
- m.freelist = 2
- m.root = bucket{root: 3}
- m.pgid = 4
- m.txid = txid(i)
- m.checksum = m.sum64()
- }
-
- // Write an empty freelist at page 3.
- p := db.pageInBuffer(buf[:], pgid(2))
- p.id = pgid(2)
- p.flags = freelistPageFlag
- p.count = 0
-
- // Write an empty leaf page at page 4.
- p = db.pageInBuffer(buf[:], pgid(3))
- p.id = pgid(3)
- p.flags = leafPageFlag
- p.count = 0
-
- // Write the buffer to our data file.
- if _, err := db.ops.writeAt(buf, 0); err != nil {
- return err
- }
- if err := fdatasync(db); err != nil {
- return err
- }
-
- return nil
-}
-
-// Close releases all database resources.
-// All transactions must be closed before closing the database.
-func (db *DB) Close() error {
- db.rwlock.Lock()
- defer db.rwlock.Unlock()
-
- db.metalock.Lock()
- defer db.metalock.Unlock()
-
- db.mmaplock.RLock()
- defer db.mmaplock.RUnlock()
-
- return db.close()
-}
-
-func (db *DB) close() error {
- if !db.opened {
- return nil
- }
-
- db.opened = false
-
- db.freelist = nil
-
- // Clear ops.
- db.ops.writeAt = nil
-
- // Close the mmap.
- if err := db.munmap(); err != nil {
- return err
- }
-
- // Close file handles.
- if db.file != nil {
- // No need to unlock read-only file.
- if !db.readOnly {
- // Unlock the file.
- if err := funlock(db); err != nil {
- log.Printf("bolt.Close(): funlock error: %s", err)
- }
- }
-
- // Close the file descriptor.
- if err := db.file.Close(); err != nil {
- return fmt.Errorf("db file close: %s", err)
- }
- db.file = nil
- }
-
- db.path = ""
- return nil
-}
-
-// Begin starts a new transaction.
-// Multiple read-only transactions can be used concurrently but only one
-// write transaction can be used at a time. Starting multiple write transactions
-// will cause the calls to block and be serialized until the current write
-// transaction finishes.
-//
-// Transactions should not be dependent on one another. Opening a read
-// transaction and a write transaction in the same goroutine can cause the
-// writer to deadlock because the database periodically needs to re-mmap itself
-// as it grows and it cannot do that while a read transaction is open.
-//
-// If a long running read transaction (for example, a snapshot transaction) is
-// needed, you might want to set DB.InitialMmapSize to a large enough value
-// to avoid potential blocking of write transaction.
-//
-// IMPORTANT: You must close read-only transactions after you are finished or
-// else the database will not reclaim old pages.
-func (db *DB) Begin(writable bool) (*Tx, error) {
- if writable {
- return db.beginRWTx()
- }
- return db.beginTx()
-}
-
-func (db *DB) beginTx() (*Tx, error) {
- // Lock the meta pages while we initialize the transaction. We obtain
- // the meta lock before the mmap lock because that's the order that the
- // write transaction will obtain them.
- db.metalock.Lock()
-
- // Obtain a read-only lock on the mmap. When the mmap is remapped it will
- // obtain a write lock so all transactions must finish before it can be
- // remapped.
- db.mmaplock.RLock()
-
- // Exit if the database is not open yet.
- if !db.opened {
- db.mmaplock.RUnlock()
- db.metalock.Unlock()
- return nil, ErrDatabaseNotOpen
- }
-
- // Create a transaction associated with the database.
- t := &Tx{}
- t.init(db)
-
- // Keep track of transaction until it closes.
- db.txs = append(db.txs, t)
- n := len(db.txs)
-
- // Unlock the meta pages.
- db.metalock.Unlock()
-
- // Update the transaction stats.
- db.statlock.Lock()
- db.stats.TxN++
- db.stats.OpenTxN = n
- db.statlock.Unlock()
-
- return t, nil
-}
-
-func (db *DB) beginRWTx() (*Tx, error) {
- // If the database was opened with Options.ReadOnly, return an error.
- if db.readOnly {
- return nil, ErrDatabaseReadOnly
- }
-
- // Obtain writer lock. This is released by the transaction when it closes.
- // This enforces only one writer transaction at a time.
- db.rwlock.Lock()
-
- // Once we have the writer lock then we can lock the meta pages so that
- // we can set up the transaction.
- db.metalock.Lock()
- defer db.metalock.Unlock()
-
- // Exit if the database is not open yet.
- if !db.opened {
- db.rwlock.Unlock()
- return nil, ErrDatabaseNotOpen
- }
-
- // Create a transaction associated with the database.
- t := &Tx{writable: true}
- t.init(db)
- db.rwtx = t
-
- // Free any pages associated with closed read-only transactions.
- var minid txid = 0xFFFFFFFFFFFFFFFF
- for _, t := range db.txs {
- if t.meta.txid < minid {
- minid = t.meta.txid
- }
- }
- if minid > 0 {
- db.freelist.release(minid - 1)
- }
-
- return t, nil
-}
-
-// removeTx removes a transaction from the database.
-func (db *DB) removeTx(tx *Tx) {
- // Release the read lock on the mmap.
- db.mmaplock.RUnlock()
-
- // Use the meta lock to restrict access to the DB object.
- db.metalock.Lock()
-
- // Remove the transaction.
- for i, t := range db.txs {
- if t == tx {
- last := len(db.txs) - 1
- db.txs[i] = db.txs[last]
- db.txs[last] = nil
- db.txs = db.txs[:last]
- break
- }
- }
- n := len(db.txs)
-
- // Unlock the meta pages.
- db.metalock.Unlock()
-
- // Merge statistics.
- db.statlock.Lock()
- db.stats.OpenTxN = n
- db.stats.TxStats.add(&tx.stats)
- db.statlock.Unlock()
-}
-
-// Update executes a function within the context of a read-write managed transaction.
-// If no error is returned from the function then the transaction is committed.
-// If an error is returned then the entire transaction is rolled back.
-// Any error that is returned from the function or returned from the commit is
-// returned from the Update() method.
-//
-// Attempting to manually commit or rollback within the function will cause a panic.
-func (db *DB) Update(fn func(*Tx) error) error {
- t, err := db.Begin(true)
- if err != nil {
- return err
- }
-
- // Make sure the transaction rolls back in the event of a panic.
- defer func() {
- if t.db != nil {
- t.rollback()
- }
- }()
-
- // Mark as a managed tx so that the inner function cannot manually commit.
- t.managed = true
-
- // If an error is returned from the function then rollback and return error.
- err = fn(t)
- t.managed = false
- if err != nil {
- _ = t.Rollback()
- return err
- }
-
- return t.Commit()
-}
-
-// View executes a function within the context of a managed read-only transaction.
-// Any error that is returned from the function is returned from the View() method.
-//
-// Attempting to manually rollback within the function will cause a panic.
-func (db *DB) View(fn func(*Tx) error) error {
- t, err := db.Begin(false)
- if err != nil {
- return err
- }
-
- // Make sure the transaction rolls back in the event of a panic.
- defer func() {
- if t.db != nil {
- t.rollback()
- }
- }()
-
- // Mark as a managed tx so that the inner function cannot manually rollback.
- t.managed = true
-
- // If an error is returned from the function then pass it through.
- err = fn(t)
- t.managed = false
- if err != nil {
- _ = t.Rollback()
- return err
- }
-
- if err := t.Rollback(); err != nil {
- return err
- }
-
- return nil
-}
-
-// Batch calls fn as part of a batch. It behaves similar to Update,
-// except:
-//
-// 1. concurrent Batch calls can be combined into a single Bolt
-// transaction.
-//
-// 2. the function passed to Batch may be called multiple times,
-// regardless of whether it returns error or not.
-//
-// This means that Batch function side effects must be idempotent and
-// take permanent effect only after a successful return is seen in
-// caller.
-//
-// The maximum batch size and delay can be adjusted with DB.MaxBatchSize
-// and DB.MaxBatchDelay, respectively.
-//
-// Batch is only useful when there are multiple goroutines calling it.
-func (db *DB) Batch(fn func(*Tx) error) error {
- errCh := make(chan error, 1)
-
- db.batchMu.Lock()
- if (db.batch == nil) || (db.batch != nil && len(db.batch.calls) >= db.MaxBatchSize) {
- // There is no existing batch, or the existing batch is full; start a new one.
- db.batch = &batch{
- db: db,
- }
- db.batch.timer = time.AfterFunc(db.MaxBatchDelay, db.batch.trigger)
- }
- db.batch.calls = append(db.batch.calls, call{fn: fn, err: errCh})
- if len(db.batch.calls) >= db.MaxBatchSize {
- // wake up batch, it's ready to run
- go db.batch.trigger()
- }
- db.batchMu.Unlock()
-
- err := <-errCh
- if err == trySolo {
- err = db.Update(fn)
- }
- return err
-}
-
-type call struct {
- fn func(*Tx) error
- err chan<- error
-}
-
-type batch struct {
- db *DB
- timer *time.Timer
- start sync.Once
- calls []call
-}
-
-// trigger runs the batch if it hasn't already been run.
-func (b *batch) trigger() {
- b.start.Do(b.run)
-}
-
-// run performs the transactions in the batch and communicates results
-// back to DB.Batch.
-func (b *batch) run() {
- b.db.batchMu.Lock()
- b.timer.Stop()
- // Make sure no new work is added to this batch, but don't break
- // other batches.
- if b.db.batch == b {
- b.db.batch = nil
- }
- b.db.batchMu.Unlock()
-
-retry:
- for len(b.calls) > 0 {
- var failIdx = -1
- err := b.db.Update(func(tx *Tx) error {
- for i, c := range b.calls {
- if err := safelyCall(c.fn, tx); err != nil {
- failIdx = i
- return err
- }
- }
- return nil
- })
-
- if failIdx >= 0 {
- // take the failing transaction out of the batch. it's
- // safe to shorten b.calls here because db.batch no longer
- // points to us, and we hold the mutex anyway.
- c := b.calls[failIdx]
- b.calls[failIdx], b.calls = b.calls[len(b.calls)-1], b.calls[:len(b.calls)-1]
- // tell the submitter re-run it solo, continue with the rest of the batch
- c.err <- trySolo
- continue retry
- }
-
- // pass success, or bolt internal errors, to all callers
- for _, c := range b.calls {
- if c.err != nil {
- c.err <- err
- }
- }
- break retry
- }
-}
-
-// trySolo is a special sentinel error value used for signaling that a
-// transaction function should be re-run. It should never be seen by
-// callers.
-var trySolo = errors.New("batch function returned an error and should be re-run solo")
-
-type panicked struct {
- reason interface{}
-}
-
-func (p panicked) Error() string {
- if err, ok := p.reason.(error); ok {
- return err.Error()
- }
- return fmt.Sprintf("panic: %v", p.reason)
-}
-
-func safelyCall(fn func(*Tx) error, tx *Tx) (err error) {
- defer func() {
- if p := recover(); p != nil {
- err = panicked{p}
- }
- }()
- return fn(tx)
-}
-
-// Sync executes fdatasync() against the database file handle.
-//
-// This is not necessary under normal operation, however, if you use NoSync
-// then it allows you to force the database file to sync against the disk.
-func (db *DB) Sync() error { return fdatasync(db) }
-
-// Stats retrieves ongoing performance stats for the database.
-// This is only updated when a transaction closes.
-func (db *DB) Stats() Stats {
- db.statlock.RLock()
- defer db.statlock.RUnlock()
- return db.stats
-}
-
-// This is for internal access to the raw data bytes from the C cursor, use
-// carefully, or not at all.
-func (db *DB) Info() *Info {
- return &Info{uintptr(unsafe.Pointer(&db.data[0])), db.pageSize}
-}
-
-// page retrieves a page reference from the mmap based on the current page size.
-func (db *DB) page(id pgid) *page {
- pos := id * pgid(db.pageSize)
- return (*page)(unsafe.Pointer(&db.data[pos]))
-}
-
-// pageInBuffer retrieves a page reference from a given byte array based on the current page size.
-func (db *DB) pageInBuffer(b []byte, id pgid) *page {
- return (*page)(unsafe.Pointer(&b[id*pgid(db.pageSize)]))
-}
-
-// meta retrieves the current meta page reference.
-func (db *DB) meta() *meta {
- // We have to return the meta with the highest txid which doesn't fail
- // validation. Otherwise, we can cause errors when in fact the database is
- // in a consistent state. metaA is the one with the higher txid.
- metaA := db.meta0
- metaB := db.meta1
- if db.meta1.txid > db.meta0.txid {
- metaA = db.meta1
- metaB = db.meta0
- }
-
- // Use higher meta page if valid. Otherwise fallback to previous, if valid.
- if err := metaA.validate(); err == nil {
- return metaA
- } else if err := metaB.validate(); err == nil {
- return metaB
- }
-
- // This should never be reached, because both meta1 and meta0 were validated
- // on mmap() and we do fsync() on every write.
- panic("bolt.DB.meta(): invalid meta pages")
-}
-
-// allocate returns a contiguous block of memory starting at a given page.
-func (db *DB) allocate(count int) (*page, error) {
- // Allocate a temporary buffer for the page.
- var buf []byte
- if count == 1 {
- buf = db.pagePool.Get().([]byte)
- } else {
- buf = make([]byte, count*db.pageSize)
- }
- p := (*page)(unsafe.Pointer(&buf[0]))
- p.overflow = uint32(count - 1)
-
- // Use pages from the freelist if they are available.
- if p.id = db.freelist.allocate(count); p.id != 0 {
- return p, nil
- }
-
- // Resize mmap() if we're at the end.
- p.id = db.rwtx.meta.pgid
- var minsz = int((p.id+pgid(count))+1) * db.pageSize
- if minsz >= db.datasz {
- if err := db.mmap(minsz); err != nil {
- return nil, fmt.Errorf("mmap allocate error: %s", err)
- }
- }
-
- // Move the page id high water mark.
- db.rwtx.meta.pgid += pgid(count)
-
- return p, nil
-}
-
-// grow grows the size of the database to the given sz.
-func (db *DB) grow(sz int) error {
- // Ignore if the new size is less than available file size.
- if sz <= db.filesz {
- return nil
- }
-
- // If the data is smaller than the alloc size then only allocate what's needed.
- // Once it goes over the allocation size then allocate in chunks.
- if db.datasz < db.AllocSize {
- sz = db.datasz
- } else {
- sz += db.AllocSize
- }
-
- // Truncate and fsync to ensure file size metadata is flushed.
- // https://github.com/boltdb/bolt/issues/284
- if !db.NoGrowSync && !db.readOnly {
- if runtime.GOOS != "windows" {
- if err := db.file.Truncate(int64(sz)); err != nil {
- return fmt.Errorf("file resize error: %s", err)
- }
- }
- if err := db.file.Sync(); err != nil {
- return fmt.Errorf("file sync error: %s", err)
- }
- }
-
- db.filesz = sz
- return nil
-}
-
-func (db *DB) IsReadOnly() bool {
- return db.readOnly
-}
-
-// Options represents the options that can be set when opening a database.
-type Options struct {
- // Timeout is the amount of time to wait to obtain a file lock.
- // When set to zero it will wait indefinitely. This option is only
- // available on Darwin and Linux.
- Timeout time.Duration
-
- // Sets the DB.NoGrowSync flag before memory mapping the file.
- NoGrowSync bool
-
- // Open database in read-only mode. Uses flock(..., LOCK_SH |LOCK_NB) to
- // grab a shared lock (UNIX).
- ReadOnly bool
-
- // Sets the DB.MmapFlags flag before memory mapping the file.
- MmapFlags int
-
- // InitialMmapSize is the initial mmap size of the database
- // in bytes. Read transactions won't block write transaction
- // if the InitialMmapSize is large enough to hold database mmap
- // size. (See DB.Begin for more information)
- //
- // If <=0, the initial map size is 0.
- // If initialMmapSize is smaller than the previous database size,
- // it takes no effect.
- InitialMmapSize int
-}
-
-// DefaultOptions represent the options used if nil options are passed into Open().
-// No timeout is used which will cause Bolt to wait indefinitely for a lock.
-var DefaultOptions = &Options{
- Timeout: 0,
- NoGrowSync: false,
-}
-
-// Stats represents statistics about the database.
-type Stats struct {
- // Freelist stats
- FreePageN int // total number of free pages on the freelist
- PendingPageN int // total number of pending pages on the freelist
- FreeAlloc int // total bytes allocated in free pages
- FreelistInuse int // total bytes used by the freelist
-
- // Transaction stats
- TxN int // total number of started read transactions
- OpenTxN int // number of currently open read transactions
-
- TxStats TxStats // global, ongoing stats.
-}
-
-// Sub calculates and returns the difference between two sets of database stats.
-// This is useful when obtaining stats at two different points and time and
-// you need the performance counters that occurred within that time span.
-func (s *Stats) Sub(other *Stats) Stats {
- if other == nil {
- return *s
- }
- var diff Stats
- diff.FreePageN = s.FreePageN
- diff.PendingPageN = s.PendingPageN
- diff.FreeAlloc = s.FreeAlloc
- diff.FreelistInuse = s.FreelistInuse
- diff.TxN = s.TxN - other.TxN
- diff.TxStats = s.TxStats.Sub(&other.TxStats)
- return diff
-}
-
-func (s *Stats) add(other *Stats) {
- s.TxStats.add(&other.TxStats)
-}
-
-type Info struct {
- Data uintptr
- PageSize int
-}
-
-type meta struct {
- magic uint32
- version uint32
- pageSize uint32
- flags uint32
- root bucket
- freelist pgid
- pgid pgid
- txid txid
- checksum uint64
-}
-
-// validate checks the marker bytes and version of the meta page to ensure it matches this binary.
-func (m *meta) validate() error {
- if m.magic != magic {
- return ErrInvalid
- } else if m.version != version {
- return ErrVersionMismatch
- } else if m.checksum != 0 && m.checksum != m.sum64() {
- return ErrChecksum
- }
- return nil
-}
-
-// copy copies one meta object to another.
-func (m *meta) copy(dest *meta) {
- *dest = *m
-}
-
-// write writes the meta onto a page.
-func (m *meta) write(p *page) {
- if m.root.root >= m.pgid {
- panic(fmt.Sprintf("root bucket pgid (%d) above high water mark (%d)", m.root.root, m.pgid))
- } else if m.freelist >= m.pgid {
- panic(fmt.Sprintf("freelist pgid (%d) above high water mark (%d)", m.freelist, m.pgid))
- }
-
- // Page id is either going to be 0 or 1 which we can determine by the transaction ID.
- p.id = pgid(m.txid % 2)
- p.flags |= metaPageFlag
-
- // Calculate the checksum.
- m.checksum = m.sum64()
-
- m.copy(p.meta())
-}
-
-// generates the checksum for the meta.
-func (m *meta) sum64() uint64 {
- var h = fnv.New64a()
- _, _ = h.Write((*[unsafe.Offsetof(meta{}.checksum)]byte)(unsafe.Pointer(m))[:])
- return h.Sum64()
-}
-
-// _assert will panic with a given formatted message if the given condition is false.
-func _assert(condition bool, msg string, v ...interface{}) {
- if !condition {
- panic(fmt.Sprintf("assertion failed: "+msg, v...))
- }
-}
-
-func warn(v ...interface{}) { fmt.Fprintln(os.Stderr, v...) }
-func warnf(msg string, v ...interface{}) { fmt.Fprintf(os.Stderr, msg+"\n", v...) }
-
-func printstack() {
- stack := strings.Join(strings.Split(string(debug.Stack()), "\n")[2:], "\n")
- fmt.Fprintln(os.Stderr, stack)
-}
diff --git a/vendor/github.com/boltdb/bolt/doc.go b/vendor/github.com/boltdb/bolt/doc.go
deleted file mode 100644
index cc93784..0000000
--- a/vendor/github.com/boltdb/bolt/doc.go
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Package bolt implements a low-level key/value store in pure Go. It supports
-fully serializable transactions, ACID semantics, and lock-free MVCC with
-multiple readers and a single writer. Bolt can be used for projects that
-want a simple data store without the need to add large dependencies such as
-Postgres or MySQL.
-
-Bolt is a single-level, zero-copy, B+tree data store. This means that Bolt is
-optimized for fast read access and does not require recovery in the event of a
-system crash. Transactions which have not finished committing will simply be
-rolled back in the event of a crash.
-
-The design of Bolt is based on Howard Chu's LMDB database project.
-
-Bolt currently works on Windows, Mac OS X, and Linux.
-
-
-Basics
-
-There are only a few types in Bolt: DB, Bucket, Tx, and Cursor. The DB is
-a collection of buckets and is represented by a single file on disk. A bucket is
-a collection of unique keys that are associated with values.
-
-Transactions provide either read-only or read-write access to the database.
-Read-only transactions can retrieve key/value pairs and can use Cursors to
-iterate over the dataset sequentially. Read-write transactions can create and
-delete buckets and can insert and remove keys. Only one read-write transaction
-is allowed at a time.
-
-
-Caveats
-
-The database uses a read-only, memory-mapped data file to ensure that
-applications cannot corrupt the database, however, this means that keys and
-values returned from Bolt cannot be changed. Writing to a read-only byte slice
-will cause Go to panic.
-
-Keys and values retrieved from the database are only valid for the life of
-the transaction. When used outside the transaction, these byte slices can
-point to different data or can point to invalid memory which will cause a panic.
-
-
-*/
-package bolt
diff --git a/vendor/github.com/boltdb/bolt/errors.go b/vendor/github.com/boltdb/bolt/errors.go
deleted file mode 100644
index a3620a3..0000000
--- a/vendor/github.com/boltdb/bolt/errors.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package bolt
-
-import "errors"
-
-// These errors can be returned when opening or calling methods on a DB.
-var (
- // ErrDatabaseNotOpen is returned when a DB instance is accessed before it
- // is opened or after it is closed.
- ErrDatabaseNotOpen = errors.New("database not open")
-
- // ErrDatabaseOpen is returned when opening a database that is
- // already open.
- ErrDatabaseOpen = errors.New("database already open")
-
- // ErrInvalid is returned when both meta pages on a database are invalid.
- // This typically occurs when a file is not a bolt database.
- ErrInvalid = errors.New("invalid database")
-
- // ErrVersionMismatch is returned when the data file was created with a
- // different version of Bolt.
- ErrVersionMismatch = errors.New("version mismatch")
-
- // ErrChecksum is returned when either meta page checksum does not match.
- ErrChecksum = errors.New("checksum error")
-
- // ErrTimeout is returned when a database cannot obtain an exclusive lock
- // on the data file after the timeout passed to Open().
- ErrTimeout = errors.New("timeout")
-)
-
-// These errors can occur when beginning or committing a Tx.
-var (
- // ErrTxNotWritable is returned when performing a write operation on a
- // read-only transaction.
- ErrTxNotWritable = errors.New("tx not writable")
-
- // ErrTxClosed is returned when committing or rolling back a transaction
- // that has already been committed or rolled back.
- ErrTxClosed = errors.New("tx closed")
-
- // ErrDatabaseReadOnly is returned when a mutating transaction is started on a
- // read-only database.
- ErrDatabaseReadOnly = errors.New("database is in read-only mode")
-)
-
-// These errors can occur when putting or deleting a value or a bucket.
-var (
- // ErrBucketNotFound is returned when trying to access a bucket that has
- // not been created yet.
- ErrBucketNotFound = errors.New("bucket not found")
-
- // ErrBucketExists is returned when creating a bucket that already exists.
- ErrBucketExists = errors.New("bucket already exists")
-
- // ErrBucketNameRequired is returned when creating a bucket with a blank name.
- ErrBucketNameRequired = errors.New("bucket name required")
-
- // ErrKeyRequired is returned when inserting a zero-length key.
- ErrKeyRequired = errors.New("key required")
-
- // ErrKeyTooLarge is returned when inserting a key that is larger than MaxKeySize.
- ErrKeyTooLarge = errors.New("key too large")
-
- // ErrValueTooLarge is returned when inserting a value that is larger than MaxValueSize.
- ErrValueTooLarge = errors.New("value too large")
-
- // ErrIncompatibleValue is returned when trying create or delete a bucket
- // on an existing non-bucket key or when trying to create or delete a
- // non-bucket key on an existing bucket key.
- ErrIncompatibleValue = errors.New("incompatible value")
-)
diff --git a/vendor/github.com/boltdb/bolt/freelist.go b/vendor/github.com/boltdb/bolt/freelist.go
deleted file mode 100644
index aba48f5..0000000
--- a/vendor/github.com/boltdb/bolt/freelist.go
+++ /dev/null
@@ -1,252 +0,0 @@
-package bolt
-
-import (
- "fmt"
- "sort"
- "unsafe"
-)
-
-// freelist represents a list of all pages that are available for allocation.
-// It also tracks pages that have been freed but are still in use by open transactions.
-type freelist struct {
- ids []pgid // all free and available free page ids.
- pending map[txid][]pgid // mapping of soon-to-be free page ids by tx.
- cache map[pgid]bool // fast lookup of all free and pending page ids.
-}
-
-// newFreelist returns an empty, initialized freelist.
-func newFreelist() *freelist {
- return &freelist{
- pending: make(map[txid][]pgid),
- cache: make(map[pgid]bool),
- }
-}
-
-// size returns the size of the page after serialization.
-func (f *freelist) size() int {
- n := f.count()
- if n >= 0xFFFF {
- // The first element will be used to store the count. See freelist.write.
- n++
- }
- return pageHeaderSize + (int(unsafe.Sizeof(pgid(0))) * n)
-}
-
-// count returns count of pages on the freelist
-func (f *freelist) count() int {
- return f.free_count() + f.pending_count()
-}
-
-// free_count returns count of free pages
-func (f *freelist) free_count() int {
- return len(f.ids)
-}
-
-// pending_count returns count of pending pages
-func (f *freelist) pending_count() int {
- var count int
- for _, list := range f.pending {
- count += len(list)
- }
- return count
-}
-
-// copyall copies into dst a list of all free ids and all pending ids in one sorted list.
-// f.count returns the minimum length required for dst.
-func (f *freelist) copyall(dst []pgid) {
- m := make(pgids, 0, f.pending_count())
- for _, list := range f.pending {
- m = append(m, list...)
- }
- sort.Sort(m)
- mergepgids(dst, f.ids, m)
-}
-
-// allocate returns the starting page id of a contiguous list of pages of a given size.
-// If a contiguous block cannot be found then 0 is returned.
-func (f *freelist) allocate(n int) pgid {
- if len(f.ids) == 0 {
- return 0
- }
-
- var initial, previd pgid
- for i, id := range f.ids {
- if id <= 1 {
- panic(fmt.Sprintf("invalid page allocation: %d", id))
- }
-
- // Reset initial page if this is not contiguous.
- if previd == 0 || id-previd != 1 {
- initial = id
- }
-
- // If we found a contiguous block then remove it and return it.
- if (id-initial)+1 == pgid(n) {
- // If we're allocating off the beginning then take the fast path
- // and just adjust the existing slice. This will use extra memory
- // temporarily but the append() in free() will realloc the slice
- // as is necessary.
- if (i + 1) == n {
- f.ids = f.ids[i+1:]
- } else {
- copy(f.ids[i-n+1:], f.ids[i+1:])
- f.ids = f.ids[:len(f.ids)-n]
- }
-
- // Remove from the free cache.
- for i := pgid(0); i < pgid(n); i++ {
- delete(f.cache, initial+i)
- }
-
- return initial
- }
-
- previd = id
- }
- return 0
-}
-
-// free releases a page and its overflow for a given transaction id.
-// If the page is already free then a panic will occur.
-func (f *freelist) free(txid txid, p *page) {
- if p.id <= 1 {
- panic(fmt.Sprintf("cannot free page 0 or 1: %d", p.id))
- }
-
- // Free page and all its overflow pages.
- var ids = f.pending[txid]
- for id := p.id; id <= p.id+pgid(p.overflow); id++ {
- // Verify that page is not already free.
- if f.cache[id] {
- panic(fmt.Sprintf("page %d already freed", id))
- }
-
- // Add to the freelist and cache.
- ids = append(ids, id)
- f.cache[id] = true
- }
- f.pending[txid] = ids
-}
-
-// release moves all page ids for a transaction id (or older) to the freelist.
-func (f *freelist) release(txid txid) {
- m := make(pgids, 0)
- for tid, ids := range f.pending {
- if tid <= txid {
- // Move transaction's pending pages to the available freelist.
- // Don't remove from the cache since the page is still free.
- m = append(m, ids...)
- delete(f.pending, tid)
- }
- }
- sort.Sort(m)
- f.ids = pgids(f.ids).merge(m)
-}
-
-// rollback removes the pages from a given pending tx.
-func (f *freelist) rollback(txid txid) {
- // Remove page ids from cache.
- for _, id := range f.pending[txid] {
- delete(f.cache, id)
- }
-
- // Remove pages from pending list.
- delete(f.pending, txid)
-}
-
-// freed returns whether a given page is in the free list.
-func (f *freelist) freed(pgid pgid) bool {
- return f.cache[pgid]
-}
-
-// read initializes the freelist from a freelist page.
-func (f *freelist) read(p *page) {
- // If the page.count is at the max uint16 value (64k) then it's considered
- // an overflow and the size of the freelist is stored as the first element.
- idx, count := 0, int(p.count)
- if count == 0xFFFF {
- idx = 1
- count = int(((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[0])
- }
-
- // Copy the list of page ids from the freelist.
- if count == 0 {
- f.ids = nil
- } else {
- ids := ((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[idx:count]
- f.ids = make([]pgid, len(ids))
- copy(f.ids, ids)
-
- // Make sure they're sorted.
- sort.Sort(pgids(f.ids))
- }
-
- // Rebuild the page cache.
- f.reindex()
-}
-
-// write writes the page ids onto a freelist page. All free and pending ids are
-// saved to disk since in the event of a program crash, all pending ids will
-// become free.
-func (f *freelist) write(p *page) error {
- // Combine the old free pgids and pgids waiting on an open transaction.
-
- // Update the header flag.
- p.flags |= freelistPageFlag
-
- // The page.count can only hold up to 64k elements so if we overflow that
- // number then we handle it by putting the size in the first element.
- lenids := f.count()
- if lenids == 0 {
- p.count = uint16(lenids)
- } else if lenids < 0xFFFF {
- p.count = uint16(lenids)
- f.copyall(((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[:])
- } else {
- p.count = 0xFFFF
- ((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[0] = pgid(lenids)
- f.copyall(((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[1:])
- }
-
- return nil
-}
-
-// reload reads the freelist from a page and filters out pending items.
-func (f *freelist) reload(p *page) {
- f.read(p)
-
- // Build a cache of only pending pages.
- pcache := make(map[pgid]bool)
- for _, pendingIDs := range f.pending {
- for _, pendingID := range pendingIDs {
- pcache[pendingID] = true
- }
- }
-
- // Check each page in the freelist and build a new available freelist
- // with any pages not in the pending lists.
- var a []pgid
- for _, id := range f.ids {
- if !pcache[id] {
- a = append(a, id)
- }
- }
- f.ids = a
-
- // Once the available list is rebuilt then rebuild the free cache so that
- // it includes the available and pending free pages.
- f.reindex()
-}
-
-// reindex rebuilds the free cache based on available and pending free lists.
-func (f *freelist) reindex() {
- f.cache = make(map[pgid]bool, len(f.ids))
- for _, id := range f.ids {
- f.cache[id] = true
- }
- for _, pendingIDs := range f.pending {
- for _, pendingID := range pendingIDs {
- f.cache[pendingID] = true
- }
- }
-}
diff --git a/vendor/github.com/boltdb/bolt/node.go b/vendor/github.com/boltdb/bolt/node.go
deleted file mode 100644
index 159318b..0000000
--- a/vendor/github.com/boltdb/bolt/node.go
+++ /dev/null
@@ -1,604 +0,0 @@
-package bolt
-
-import (
- "bytes"
- "fmt"
- "sort"
- "unsafe"
-)
-
-// node represents an in-memory, deserialized page.
-type node struct {
- bucket *Bucket
- isLeaf bool
- unbalanced bool
- spilled bool
- key []byte
- pgid pgid
- parent *node
- children nodes
- inodes inodes
-}
-
-// root returns the top-level node this node is attached to.
-func (n *node) root() *node {
- if n.parent == nil {
- return n
- }
- return n.parent.root()
-}
-
-// minKeys returns the minimum number of inodes this node should have.
-func (n *node) minKeys() int {
- if n.isLeaf {
- return 1
- }
- return 2
-}
-
-// size returns the size of the node after serialization.
-func (n *node) size() int {
- sz, elsz := pageHeaderSize, n.pageElementSize()
- for i := 0; i < len(n.inodes); i++ {
- item := &n.inodes[i]
- sz += elsz + len(item.key) + len(item.value)
- }
- return sz
-}
-
-// sizeLessThan returns true if the node is less than a given size.
-// This is an optimization to avoid calculating a large node when we only need
-// to know if it fits inside a certain page size.
-func (n *node) sizeLessThan(v int) bool {
- sz, elsz := pageHeaderSize, n.pageElementSize()
- for i := 0; i < len(n.inodes); i++ {
- item := &n.inodes[i]
- sz += elsz + len(item.key) + len(item.value)
- if sz >= v {
- return false
- }
- }
- return true
-}
-
-// pageElementSize returns the size of each page element based on the type of node.
-func (n *node) pageElementSize() int {
- if n.isLeaf {
- return leafPageElementSize
- }
- return branchPageElementSize
-}
-
-// childAt returns the child node at a given index.
-func (n *node) childAt(index int) *node {
- if n.isLeaf {
- panic(fmt.Sprintf("invalid childAt(%d) on a leaf node", index))
- }
- return n.bucket.node(n.inodes[index].pgid, n)
-}
-
-// childIndex returns the index of a given child node.
-func (n *node) childIndex(child *node) int {
- index := sort.Search(len(n.inodes), func(i int) bool { return bytes.Compare(n.inodes[i].key, child.key) != -1 })
- return index
-}
-
-// numChildren returns the number of children.
-func (n *node) numChildren() int {
- return len(n.inodes)
-}
-
-// nextSibling returns the next node with the same parent.
-func (n *node) nextSibling() *node {
- if n.parent == nil {
- return nil
- }
- index := n.parent.childIndex(n)
- if index >= n.parent.numChildren()-1 {
- return nil
- }
- return n.parent.childAt(index + 1)
-}
-
-// prevSibling returns the previous node with the same parent.
-func (n *node) prevSibling() *node {
- if n.parent == nil {
- return nil
- }
- index := n.parent.childIndex(n)
- if index == 0 {
- return nil
- }
- return n.parent.childAt(index - 1)
-}
-
-// put inserts a key/value.
-func (n *node) put(oldKey, newKey, value []byte, pgid pgid, flags uint32) {
- if pgid >= n.bucket.tx.meta.pgid {
- panic(fmt.Sprintf("pgid (%d) above high water mark (%d)", pgid, n.bucket.tx.meta.pgid))
- } else if len(oldKey) <= 0 {
- panic("put: zero-length old key")
- } else if len(newKey) <= 0 {
- panic("put: zero-length new key")
- }
-
- // Find insertion index.
- index := sort.Search(len(n.inodes), func(i int) bool { return bytes.Compare(n.inodes[i].key, oldKey) != -1 })
-
- // Add capacity and shift nodes if we don't have an exact match and need to insert.
- exact := (len(n.inodes) > 0 && index < len(n.inodes) && bytes.Equal(n.inodes[index].key, oldKey))
- if !exact {
- n.inodes = append(n.inodes, inode{})
- copy(n.inodes[index+1:], n.inodes[index:])
- }
-
- inode := &n.inodes[index]
- inode.flags = flags
- inode.key = newKey
- inode.value = value
- inode.pgid = pgid
- _assert(len(inode.key) > 0, "put: zero-length inode key")
-}
-
-// del removes a key from the node.
-func (n *node) del(key []byte) {
- // Find index of key.
- index := sort.Search(len(n.inodes), func(i int) bool { return bytes.Compare(n.inodes[i].key, key) != -1 })
-
- // Exit if the key isn't found.
- if index >= len(n.inodes) || !bytes.Equal(n.inodes[index].key, key) {
- return
- }
-
- // Delete inode from the node.
- n.inodes = append(n.inodes[:index], n.inodes[index+1:]...)
-
- // Mark the node as needing rebalancing.
- n.unbalanced = true
-}
-
-// read initializes the node from a page.
-func (n *node) read(p *page) {
- n.pgid = p.id
- n.isLeaf = ((p.flags & leafPageFlag) != 0)
- n.inodes = make(inodes, int(p.count))
-
- for i := 0; i < int(p.count); i++ {
- inode := &n.inodes[i]
- if n.isLeaf {
- elem := p.leafPageElement(uint16(i))
- inode.flags = elem.flags
- inode.key = elem.key()
- inode.value = elem.value()
- } else {
- elem := p.branchPageElement(uint16(i))
- inode.pgid = elem.pgid
- inode.key = elem.key()
- }
- _assert(len(inode.key) > 0, "read: zero-length inode key")
- }
-
- // Save first key so we can find the node in the parent when we spill.
- if len(n.inodes) > 0 {
- n.key = n.inodes[0].key
- _assert(len(n.key) > 0, "read: zero-length node key")
- } else {
- n.key = nil
- }
-}
-
-// write writes the items onto one or more pages.
-func (n *node) write(p *page) {
- // Initialize page.
- if n.isLeaf {
- p.flags |= leafPageFlag
- } else {
- p.flags |= branchPageFlag
- }
-
- if len(n.inodes) >= 0xFFFF {
- panic(fmt.Sprintf("inode overflow: %d (pgid=%d)", len(n.inodes), p.id))
- }
- p.count = uint16(len(n.inodes))
-
- // Stop here if there are no items to write.
- if p.count == 0 {
- return
- }
-
- // Loop over each item and write it to the page.
- b := (*[maxAllocSize]byte)(unsafe.Pointer(&p.ptr))[n.pageElementSize()*len(n.inodes):]
- for i, item := range n.inodes {
- _assert(len(item.key) > 0, "write: zero-length inode key")
-
- // Write the page element.
- if n.isLeaf {
- elem := p.leafPageElement(uint16(i))
- elem.pos = uint32(uintptr(unsafe.Pointer(&b[0])) - uintptr(unsafe.Pointer(elem)))
- elem.flags = item.flags
- elem.ksize = uint32(len(item.key))
- elem.vsize = uint32(len(item.value))
- } else {
- elem := p.branchPageElement(uint16(i))
- elem.pos = uint32(uintptr(unsafe.Pointer(&b[0])) - uintptr(unsafe.Pointer(elem)))
- elem.ksize = uint32(len(item.key))
- elem.pgid = item.pgid
- _assert(elem.pgid != p.id, "write: circular dependency occurred")
- }
-
- // If the length of key+value is larger than the max allocation size
- // then we need to reallocate the byte array pointer.
- //
- // See: https://github.com/boltdb/bolt/pull/335
- klen, vlen := len(item.key), len(item.value)
- if len(b) < klen+vlen {
- b = (*[maxAllocSize]byte)(unsafe.Pointer(&b[0]))[:]
- }
-
- // Write data for the element to the end of the page.
- copy(b[0:], item.key)
- b = b[klen:]
- copy(b[0:], item.value)
- b = b[vlen:]
- }
-
- // DEBUG ONLY: n.dump()
-}
-
-// split breaks up a node into multiple smaller nodes, if appropriate.
-// This should only be called from the spill() function.
-func (n *node) split(pageSize int) []*node {
- var nodes []*node
-
- node := n
- for {
- // Split node into two.
- a, b := node.splitTwo(pageSize)
- nodes = append(nodes, a)
-
- // If we can't split then exit the loop.
- if b == nil {
- break
- }
-
- // Set node to b so it gets split on the next iteration.
- node = b
- }
-
- return nodes
-}
-
-// splitTwo breaks up a node into two smaller nodes, if appropriate.
-// This should only be called from the split() function.
-func (n *node) splitTwo(pageSize int) (*node, *node) {
- // Ignore the split if the page doesn't have at least enough nodes for
- // two pages or if the nodes can fit in a single page.
- if len(n.inodes) <= (minKeysPerPage*2) || n.sizeLessThan(pageSize) {
- return n, nil
- }
-
- // Determine the threshold before starting a new node.
- var fillPercent = n.bucket.FillPercent
- if fillPercent < minFillPercent {
- fillPercent = minFillPercent
- } else if fillPercent > maxFillPercent {
- fillPercent = maxFillPercent
- }
- threshold := int(float64(pageSize) * fillPercent)
-
- // Determine split position and sizes of the two pages.
- splitIndex, _ := n.splitIndex(threshold)
-
- // Split node into two separate nodes.
- // If there's no parent then we'll need to create one.
- if n.parent == nil {
- n.parent = &node{bucket: n.bucket, children: []*node{n}}
- }
-
- // Create a new node and add it to the parent.
- next := &node{bucket: n.bucket, isLeaf: n.isLeaf, parent: n.parent}
- n.parent.children = append(n.parent.children, next)
-
- // Split inodes across two nodes.
- next.inodes = n.inodes[splitIndex:]
- n.inodes = n.inodes[:splitIndex]
-
- // Update the statistics.
- n.bucket.tx.stats.Split++
-
- return n, next
-}
-
-// splitIndex finds the position where a page will fill a given threshold.
-// It returns the index as well as the size of the first page.
-// This is only be called from split().
-func (n *node) splitIndex(threshold int) (index, sz int) {
- sz = pageHeaderSize
-
- // Loop until we only have the minimum number of keys required for the second page.
- for i := 0; i < len(n.inodes)-minKeysPerPage; i++ {
- index = i
- inode := n.inodes[i]
- elsize := n.pageElementSize() + len(inode.key) + len(inode.value)
-
- // If we have at least the minimum number of keys and adding another
- // node would put us over the threshold then exit and return.
- if i >= minKeysPerPage && sz+elsize > threshold {
- break
- }
-
- // Add the element size to the total size.
- sz += elsize
- }
-
- return
-}
-
-// spill writes the nodes to dirty pages and splits nodes as it goes.
-// Returns an error if dirty pages cannot be allocated.
-func (n *node) spill() error {
- var tx = n.bucket.tx
- if n.spilled {
- return nil
- }
-
- // Spill child nodes first. Child nodes can materialize sibling nodes in
- // the case of split-merge so we cannot use a range loop. We have to check
- // the children size on every loop iteration.
- sort.Sort(n.children)
- for i := 0; i < len(n.children); i++ {
- if err := n.children[i].spill(); err != nil {
- return err
- }
- }
-
- // We no longer need the child list because it's only used for spill tracking.
- n.children = nil
-
- // Split nodes into appropriate sizes. The first node will always be n.
- var nodes = n.split(tx.db.pageSize)
- for _, node := range nodes {
- // Add node's page to the freelist if it's not new.
- if node.pgid > 0 {
- tx.db.freelist.free(tx.meta.txid, tx.page(node.pgid))
- node.pgid = 0
- }
-
- // Allocate contiguous space for the node.
- p, err := tx.allocate((node.size() / tx.db.pageSize) + 1)
- if err != nil {
- return err
- }
-
- // Write the node.
- if p.id >= tx.meta.pgid {
- panic(fmt.Sprintf("pgid (%d) above high water mark (%d)", p.id, tx.meta.pgid))
- }
- node.pgid = p.id
- node.write(p)
- node.spilled = true
-
- // Insert into parent inodes.
- if node.parent != nil {
- var key = node.key
- if key == nil {
- key = node.inodes[0].key
- }
-
- node.parent.put(key, node.inodes[0].key, nil, node.pgid, 0)
- node.key = node.inodes[0].key
- _assert(len(node.key) > 0, "spill: zero-length node key")
- }
-
- // Update the statistics.
- tx.stats.Spill++
- }
-
- // If the root node split and created a new root then we need to spill that
- // as well. We'll clear out the children to make sure it doesn't try to respill.
- if n.parent != nil && n.parent.pgid == 0 {
- n.children = nil
- return n.parent.spill()
- }
-
- return nil
-}
-
-// rebalance attempts to combine the node with sibling nodes if the node fill
-// size is below a threshold or if there are not enough keys.
-func (n *node) rebalance() {
- if !n.unbalanced {
- return
- }
- n.unbalanced = false
-
- // Update statistics.
- n.bucket.tx.stats.Rebalance++
-
- // Ignore if node is above threshold (25%) and has enough keys.
- var threshold = n.bucket.tx.db.pageSize / 4
- if n.size() > threshold && len(n.inodes) > n.minKeys() {
- return
- }
-
- // Root node has special handling.
- if n.parent == nil {
- // If root node is a branch and only has one node then collapse it.
- if !n.isLeaf && len(n.inodes) == 1 {
- // Move root's child up.
- child := n.bucket.node(n.inodes[0].pgid, n)
- n.isLeaf = child.isLeaf
- n.inodes = child.inodes[:]
- n.children = child.children
-
- // Reparent all child nodes being moved.
- for _, inode := range n.inodes {
- if child, ok := n.bucket.nodes[inode.pgid]; ok {
- child.parent = n
- }
- }
-
- // Remove old child.
- child.parent = nil
- delete(n.bucket.nodes, child.pgid)
- child.free()
- }
-
- return
- }
-
- // If node has no keys then just remove it.
- if n.numChildren() == 0 {
- n.parent.del(n.key)
- n.parent.removeChild(n)
- delete(n.bucket.nodes, n.pgid)
- n.free()
- n.parent.rebalance()
- return
- }
-
- _assert(n.parent.numChildren() > 1, "parent must have at least 2 children")
-
- // Destination node is right sibling if idx == 0, otherwise left sibling.
- var target *node
- var useNextSibling = (n.parent.childIndex(n) == 0)
- if useNextSibling {
- target = n.nextSibling()
- } else {
- target = n.prevSibling()
- }
-
- // If both this node and the target node are too small then merge them.
- if useNextSibling {
- // Reparent all child nodes being moved.
- for _, inode := range target.inodes {
- if child, ok := n.bucket.nodes[inode.pgid]; ok {
- child.parent.removeChild(child)
- child.parent = n
- child.parent.children = append(child.parent.children, child)
- }
- }
-
- // Copy over inodes from target and remove target.
- n.inodes = append(n.inodes, target.inodes...)
- n.parent.del(target.key)
- n.parent.removeChild(target)
- delete(n.bucket.nodes, target.pgid)
- target.free()
- } else {
- // Reparent all child nodes being moved.
- for _, inode := range n.inodes {
- if child, ok := n.bucket.nodes[inode.pgid]; ok {
- child.parent.removeChild(child)
- child.parent = target
- child.parent.children = append(child.parent.children, child)
- }
- }
-
- // Copy over inodes to target and remove node.
- target.inodes = append(target.inodes, n.inodes...)
- n.parent.del(n.key)
- n.parent.removeChild(n)
- delete(n.bucket.nodes, n.pgid)
- n.free()
- }
-
- // Either this node or the target node was deleted from the parent so rebalance it.
- n.parent.rebalance()
-}
-
-// removes a node from the list of in-memory children.
-// This does not affect the inodes.
-func (n *node) removeChild(target *node) {
- for i, child := range n.children {
- if child == target {
- n.children = append(n.children[:i], n.children[i+1:]...)
- return
- }
- }
-}
-
-// dereference causes the node to copy all its inode key/value references to heap memory.
-// This is required when the mmap is reallocated so inodes are not pointing to stale data.
-func (n *node) dereference() {
- if n.key != nil {
- key := make([]byte, len(n.key))
- copy(key, n.key)
- n.key = key
- _assert(n.pgid == 0 || len(n.key) > 0, "dereference: zero-length node key on existing node")
- }
-
- for i := range n.inodes {
- inode := &n.inodes[i]
-
- key := make([]byte, len(inode.key))
- copy(key, inode.key)
- inode.key = key
- _assert(len(inode.key) > 0, "dereference: zero-length inode key")
-
- value := make([]byte, len(inode.value))
- copy(value, inode.value)
- inode.value = value
- }
-
- // Recursively dereference children.
- for _, child := range n.children {
- child.dereference()
- }
-
- // Update statistics.
- n.bucket.tx.stats.NodeDeref++
-}
-
-// free adds the node's underlying page to the freelist.
-func (n *node) free() {
- if n.pgid != 0 {
- n.bucket.tx.db.freelist.free(n.bucket.tx.meta.txid, n.bucket.tx.page(n.pgid))
- n.pgid = 0
- }
-}
-
-// dump writes the contents of the node to STDERR for debugging purposes.
-/*
-func (n *node) dump() {
- // Write node header.
- var typ = "branch"
- if n.isLeaf {
- typ = "leaf"
- }
- warnf("[NODE %d {type=%s count=%d}]", n.pgid, typ, len(n.inodes))
-
- // Write out abbreviated version of each item.
- for _, item := range n.inodes {
- if n.isLeaf {
- if item.flags&bucketLeafFlag != 0 {
- bucket := (*bucket)(unsafe.Pointer(&item.value[0]))
- warnf("+L %08x -> (bucket root=%d)", trunc(item.key, 4), bucket.root)
- } else {
- warnf("+L %08x -> %08x", trunc(item.key, 4), trunc(item.value, 4))
- }
- } else {
- warnf("+B %08x -> pgid=%d", trunc(item.key, 4), item.pgid)
- }
- }
- warn("")
-}
-*/
-
-type nodes []*node
-
-func (s nodes) Len() int { return len(s) }
-func (s nodes) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-func (s nodes) Less(i, j int) bool { return bytes.Compare(s[i].inodes[0].key, s[j].inodes[0].key) == -1 }
-
-// inode represents an internal node inside of a node.
-// It can be used to point to elements in a page or point
-// to an element which hasn't been added to a page yet.
-type inode struct {
- flags uint32
- pgid pgid
- key []byte
- value []byte
-}
-
-type inodes []inode
diff --git a/vendor/github.com/boltdb/bolt/page.go b/vendor/github.com/boltdb/bolt/page.go
deleted file mode 100644
index cde403a..0000000
--- a/vendor/github.com/boltdb/bolt/page.go
+++ /dev/null
@@ -1,197 +0,0 @@
-package bolt
-
-import (
- "fmt"
- "os"
- "sort"
- "unsafe"
-)
-
-const pageHeaderSize = int(unsafe.Offsetof(((*page)(nil)).ptr))
-
-const minKeysPerPage = 2
-
-const branchPageElementSize = int(unsafe.Sizeof(branchPageElement{}))
-const leafPageElementSize = int(unsafe.Sizeof(leafPageElement{}))
-
-const (
- branchPageFlag = 0x01
- leafPageFlag = 0x02
- metaPageFlag = 0x04
- freelistPageFlag = 0x10
-)
-
-const (
- bucketLeafFlag = 0x01
-)
-
-type pgid uint64
-
-type page struct {
- id pgid
- flags uint16
- count uint16
- overflow uint32
- ptr uintptr
-}
-
-// typ returns a human readable page type string used for debugging.
-func (p *page) typ() string {
- if (p.flags & branchPageFlag) != 0 {
- return "branch"
- } else if (p.flags & leafPageFlag) != 0 {
- return "leaf"
- } else if (p.flags & metaPageFlag) != 0 {
- return "meta"
- } else if (p.flags & freelistPageFlag) != 0 {
- return "freelist"
- }
- return fmt.Sprintf("unknown<%02x>", p.flags)
-}
-
-// meta returns a pointer to the metadata section of the page.
-func (p *page) meta() *meta {
- return (*meta)(unsafe.Pointer(&p.ptr))
-}
-
-// leafPageElement retrieves the leaf node by index
-func (p *page) leafPageElement(index uint16) *leafPageElement {
- n := &((*[0x7FFFFFF]leafPageElement)(unsafe.Pointer(&p.ptr)))[index]
- return n
-}
-
-// leafPageElements retrieves a list of leaf nodes.
-func (p *page) leafPageElements() []leafPageElement {
- if p.count == 0 {
- return nil
- }
- return ((*[0x7FFFFFF]leafPageElement)(unsafe.Pointer(&p.ptr)))[:]
-}
-
-// branchPageElement retrieves the branch node by index
-func (p *page) branchPageElement(index uint16) *branchPageElement {
- return &((*[0x7FFFFFF]branchPageElement)(unsafe.Pointer(&p.ptr)))[index]
-}
-
-// branchPageElements retrieves a list of branch nodes.
-func (p *page) branchPageElements() []branchPageElement {
- if p.count == 0 {
- return nil
- }
- return ((*[0x7FFFFFF]branchPageElement)(unsafe.Pointer(&p.ptr)))[:]
-}
-
-// dump writes n bytes of the page to STDERR as hex output.
-func (p *page) hexdump(n int) {
- buf := (*[maxAllocSize]byte)(unsafe.Pointer(p))[:n]
- fmt.Fprintf(os.Stderr, "%x\n", buf)
-}
-
-type pages []*page
-
-func (s pages) Len() int { return len(s) }
-func (s pages) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-func (s pages) Less(i, j int) bool { return s[i].id < s[j].id }
-
-// branchPageElement represents a node on a branch page.
-type branchPageElement struct {
- pos uint32
- ksize uint32
- pgid pgid
-}
-
-// key returns a byte slice of the node key.
-func (n *branchPageElement) key() []byte {
- buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
- return (*[maxAllocSize]byte)(unsafe.Pointer(&buf[n.pos]))[:n.ksize]
-}
-
-// leafPageElement represents a node on a leaf page.
-type leafPageElement struct {
- flags uint32
- pos uint32
- ksize uint32
- vsize uint32
-}
-
-// key returns a byte slice of the node key.
-func (n *leafPageElement) key() []byte {
- buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
- return (*[maxAllocSize]byte)(unsafe.Pointer(&buf[n.pos]))[:n.ksize:n.ksize]
-}
-
-// value returns a byte slice of the node value.
-func (n *leafPageElement) value() []byte {
- buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
- return (*[maxAllocSize]byte)(unsafe.Pointer(&buf[n.pos+n.ksize]))[:n.vsize:n.vsize]
-}
-
-// PageInfo represents human readable information about a page.
-type PageInfo struct {
- ID int
- Type string
- Count int
- OverflowCount int
-}
-
-type pgids []pgid
-
-func (s pgids) Len() int { return len(s) }
-func (s pgids) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-func (s pgids) Less(i, j int) bool { return s[i] < s[j] }
-
-// merge returns the sorted union of a and b.
-func (a pgids) merge(b pgids) pgids {
- // Return the opposite slice if one is nil.
- if len(a) == 0 {
- return b
- }
- if len(b) == 0 {
- return a
- }
- merged := make(pgids, len(a)+len(b))
- mergepgids(merged, a, b)
- return merged
-}
-
-// mergepgids copies the sorted union of a and b into dst.
-// If dst is too small, it panics.
-func mergepgids(dst, a, b pgids) {
- if len(dst) < len(a)+len(b) {
- panic(fmt.Errorf("mergepgids bad len %d < %d + %d", len(dst), len(a), len(b)))
- }
- // Copy in the opposite slice if one is nil.
- if len(a) == 0 {
- copy(dst, b)
- return
- }
- if len(b) == 0 {
- copy(dst, a)
- return
- }
-
- // Merged will hold all elements from both lists.
- merged := dst[:0]
-
- // Assign lead to the slice with a lower starting value, follow to the higher value.
- lead, follow := a, b
- if b[0] < a[0] {
- lead, follow = b, a
- }
-
- // Continue while there are elements in the lead.
- for len(lead) > 0 {
- // Merge largest prefix of lead that is ahead of follow[0].
- n := sort.Search(len(lead), func(i int) bool { return lead[i] > follow[0] })
- merged = append(merged, lead[:n]...)
- if n >= len(lead) {
- break
- }
-
- // Swap lead and follow.
- lead, follow = follow, lead[n:]
- }
-
- // Append what's left in follow.
- _ = append(merged, follow...)
-}
diff --git a/vendor/github.com/boltdb/bolt/tx.go b/vendor/github.com/boltdb/bolt/tx.go
deleted file mode 100644
index 6700308..0000000
--- a/vendor/github.com/boltdb/bolt/tx.go
+++ /dev/null
@@ -1,684 +0,0 @@
-package bolt
-
-import (
- "fmt"
- "io"
- "os"
- "sort"
- "strings"
- "time"
- "unsafe"
-)
-
-// txid represents the internal transaction identifier.
-type txid uint64
-
-// Tx represents a read-only or read/write transaction on the database.
-// Read-only transactions can be used for retrieving values for keys and creating cursors.
-// Read/write transactions can create and remove buckets and create and remove keys.
-//
-// IMPORTANT: You must commit or rollback transactions when you are done with
-// them. Pages can not be reclaimed by the writer until no more transactions
-// are using them. A long running read transaction can cause the database to
-// quickly grow.
-type Tx struct {
- writable bool
- managed bool
- db *DB
- meta *meta
- root Bucket
- pages map[pgid]*page
- stats TxStats
- commitHandlers []func()
-
- // WriteFlag specifies the flag for write-related methods like WriteTo().
- // Tx opens the database file with the specified flag to copy the data.
- //
- // By default, the flag is unset, which works well for mostly in-memory
- // workloads. For databases that are much larger than available RAM,
- // set the flag to syscall.O_DIRECT to avoid trashing the page cache.
- WriteFlag int
-}
-
-// init initializes the transaction.
-func (tx *Tx) init(db *DB) {
- tx.db = db
- tx.pages = nil
-
- // Copy the meta page since it can be changed by the writer.
- tx.meta = &meta{}
- db.meta().copy(tx.meta)
-
- // Copy over the root bucket.
- tx.root = newBucket(tx)
- tx.root.bucket = &bucket{}
- *tx.root.bucket = tx.meta.root
-
- // Increment the transaction id and add a page cache for writable transactions.
- if tx.writable {
- tx.pages = make(map[pgid]*page)
- tx.meta.txid += txid(1)
- }
-}
-
-// ID returns the transaction id.
-func (tx *Tx) ID() int {
- return int(tx.meta.txid)
-}
-
-// DB returns a reference to the database that created the transaction.
-func (tx *Tx) DB() *DB {
- return tx.db
-}
-
-// Size returns current database size in bytes as seen by this transaction.
-func (tx *Tx) Size() int64 {
- return int64(tx.meta.pgid) * int64(tx.db.pageSize)
-}
-
-// Writable returns whether the transaction can perform write operations.
-func (tx *Tx) Writable() bool {
- return tx.writable
-}
-
-// Cursor creates a cursor associated with the root bucket.
-// All items in the cursor will return a nil value because all root bucket keys point to buckets.
-// The cursor is only valid as long as the transaction is open.
-// Do not use a cursor after the transaction is closed.
-func (tx *Tx) Cursor() *Cursor {
- return tx.root.Cursor()
-}
-
-// Stats retrieves a copy of the current transaction statistics.
-func (tx *Tx) Stats() TxStats {
- return tx.stats
-}
-
-// Bucket retrieves a bucket by name.
-// Returns nil if the bucket does not exist.
-// The bucket instance is only valid for the lifetime of the transaction.
-func (tx *Tx) Bucket(name []byte) *Bucket {
- return tx.root.Bucket(name)
-}
-
-// CreateBucket creates a new bucket.
-// Returns an error if the bucket already exists, if the bucket name is blank, or if the bucket name is too long.
-// The bucket instance is only valid for the lifetime of the transaction.
-func (tx *Tx) CreateBucket(name []byte) (*Bucket, error) {
- return tx.root.CreateBucket(name)
-}
-
-// CreateBucketIfNotExists creates a new bucket if it doesn't already exist.
-// Returns an error if the bucket name is blank, or if the bucket name is too long.
-// The bucket instance is only valid for the lifetime of the transaction.
-func (tx *Tx) CreateBucketIfNotExists(name []byte) (*Bucket, error) {
- return tx.root.CreateBucketIfNotExists(name)
-}
-
-// DeleteBucket deletes a bucket.
-// Returns an error if the bucket cannot be found or if the key represents a non-bucket value.
-func (tx *Tx) DeleteBucket(name []byte) error {
- return tx.root.DeleteBucket(name)
-}
-
-// ForEach executes a function for each bucket in the root.
-// If the provided function returns an error then the iteration is stopped and
-// the error is returned to the caller.
-func (tx *Tx) ForEach(fn func(name []byte, b *Bucket) error) error {
- return tx.root.ForEach(func(k, v []byte) error {
- if err := fn(k, tx.root.Bucket(k)); err != nil {
- return err
- }
- return nil
- })
-}
-
-// OnCommit adds a handler function to be executed after the transaction successfully commits.
-func (tx *Tx) OnCommit(fn func()) {
- tx.commitHandlers = append(tx.commitHandlers, fn)
-}
-
-// Commit writes all changes to disk and updates the meta page.
-// Returns an error if a disk write error occurs, or if Commit is
-// called on a read-only transaction.
-func (tx *Tx) Commit() error {
- _assert(!tx.managed, "managed tx commit not allowed")
- if tx.db == nil {
- return ErrTxClosed
- } else if !tx.writable {
- return ErrTxNotWritable
- }
-
- // TODO(benbjohnson): Use vectorized I/O to write out dirty pages.
-
- // Rebalance nodes which have had deletions.
- var startTime = time.Now()
- tx.root.rebalance()
- if tx.stats.Rebalance > 0 {
- tx.stats.RebalanceTime += time.Since(startTime)
- }
-
- // spill data onto dirty pages.
- startTime = time.Now()
- if err := tx.root.spill(); err != nil {
- tx.rollback()
- return err
- }
- tx.stats.SpillTime += time.Since(startTime)
-
- // Free the old root bucket.
- tx.meta.root.root = tx.root.root
-
- opgid := tx.meta.pgid
-
- // Free the freelist and allocate new pages for it. This will overestimate
- // the size of the freelist but not underestimate the size (which would be bad).
- tx.db.freelist.free(tx.meta.txid, tx.db.page(tx.meta.freelist))
- p, err := tx.allocate((tx.db.freelist.size() / tx.db.pageSize) + 1)
- if err != nil {
- tx.rollback()
- return err
- }
- if err := tx.db.freelist.write(p); err != nil {
- tx.rollback()
- return err
- }
- tx.meta.freelist = p.id
-
- // If the high water mark has moved up then attempt to grow the database.
- if tx.meta.pgid > opgid {
- if err := tx.db.grow(int(tx.meta.pgid+1) * tx.db.pageSize); err != nil {
- tx.rollback()
- return err
- }
- }
-
- // Write dirty pages to disk.
- startTime = time.Now()
- if err := tx.write(); err != nil {
- tx.rollback()
- return err
- }
-
- // If strict mode is enabled then perform a consistency check.
- // Only the first consistency error is reported in the panic.
- if tx.db.StrictMode {
- ch := tx.Check()
- var errs []string
- for {
- err, ok := <-ch
- if !ok {
- break
- }
- errs = append(errs, err.Error())
- }
- if len(errs) > 0 {
- panic("check fail: " + strings.Join(errs, "\n"))
- }
- }
-
- // Write meta to disk.
- if err := tx.writeMeta(); err != nil {
- tx.rollback()
- return err
- }
- tx.stats.WriteTime += time.Since(startTime)
-
- // Finalize the transaction.
- tx.close()
-
- // Execute commit handlers now that the locks have been removed.
- for _, fn := range tx.commitHandlers {
- fn()
- }
-
- return nil
-}
-
-// Rollback closes the transaction and ignores all previous updates. Read-only
-// transactions must be rolled back and not committed.
-func (tx *Tx) Rollback() error {
- _assert(!tx.managed, "managed tx rollback not allowed")
- if tx.db == nil {
- return ErrTxClosed
- }
- tx.rollback()
- return nil
-}
-
-func (tx *Tx) rollback() {
- if tx.db == nil {
- return
- }
- if tx.writable {
- tx.db.freelist.rollback(tx.meta.txid)
- tx.db.freelist.reload(tx.db.page(tx.db.meta().freelist))
- }
- tx.close()
-}
-
-func (tx *Tx) close() {
- if tx.db == nil {
- return
- }
- if tx.writable {
- // Grab freelist stats.
- var freelistFreeN = tx.db.freelist.free_count()
- var freelistPendingN = tx.db.freelist.pending_count()
- var freelistAlloc = tx.db.freelist.size()
-
- // Remove transaction ref & writer lock.
- tx.db.rwtx = nil
- tx.db.rwlock.Unlock()
-
- // Merge statistics.
- tx.db.statlock.Lock()
- tx.db.stats.FreePageN = freelistFreeN
- tx.db.stats.PendingPageN = freelistPendingN
- tx.db.stats.FreeAlloc = (freelistFreeN + freelistPendingN) * tx.db.pageSize
- tx.db.stats.FreelistInuse = freelistAlloc
- tx.db.stats.TxStats.add(&tx.stats)
- tx.db.statlock.Unlock()
- } else {
- tx.db.removeTx(tx)
- }
-
- // Clear all references.
- tx.db = nil
- tx.meta = nil
- tx.root = Bucket{tx: tx}
- tx.pages = nil
-}
-
-// Copy writes the entire database to a writer.
-// This function exists for backwards compatibility. Use WriteTo() instead.
-func (tx *Tx) Copy(w io.Writer) error {
- _, err := tx.WriteTo(w)
- return err
-}
-
-// WriteTo writes the entire database to a writer.
-// If err == nil then exactly tx.Size() bytes will be written into the writer.
-func (tx *Tx) WriteTo(w io.Writer) (n int64, err error) {
- // Attempt to open reader with WriteFlag
- f, err := os.OpenFile(tx.db.path, os.O_RDONLY|tx.WriteFlag, 0)
- if err != nil {
- return 0, err
- }
- defer func() { _ = f.Close() }()
-
- // Generate a meta page. We use the same page data for both meta pages.
- buf := make([]byte, tx.db.pageSize)
- page := (*page)(unsafe.Pointer(&buf[0]))
- page.flags = metaPageFlag
- *page.meta() = *tx.meta
-
- // Write meta 0.
- page.id = 0
- page.meta().checksum = page.meta().sum64()
- nn, err := w.Write(buf)
- n += int64(nn)
- if err != nil {
- return n, fmt.Errorf("meta 0 copy: %s", err)
- }
-
- // Write meta 1 with a lower transaction id.
- page.id = 1
- page.meta().txid -= 1
- page.meta().checksum = page.meta().sum64()
- nn, err = w.Write(buf)
- n += int64(nn)
- if err != nil {
- return n, fmt.Errorf("meta 1 copy: %s", err)
- }
-
- // Move past the meta pages in the file.
- if _, err := f.Seek(int64(tx.db.pageSize*2), os.SEEK_SET); err != nil {
- return n, fmt.Errorf("seek: %s", err)
- }
-
- // Copy data pages.
- wn, err := io.CopyN(w, f, tx.Size()-int64(tx.db.pageSize*2))
- n += wn
- if err != nil {
- return n, err
- }
-
- return n, f.Close()
-}
-
-// CopyFile copies the entire database to file at the given path.
-// A reader transaction is maintained during the copy so it is safe to continue
-// using the database while a copy is in progress.
-func (tx *Tx) CopyFile(path string, mode os.FileMode) error {
- f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, mode)
- if err != nil {
- return err
- }
-
- err = tx.Copy(f)
- if err != nil {
- _ = f.Close()
- return err
- }
- return f.Close()
-}
-
-// Check performs several consistency checks on the database for this transaction.
-// An error is returned if any inconsistency is found.
-//
-// It can be safely run concurrently on a writable transaction. However, this
-// incurs a high cost for large databases and databases with a lot of subbuckets
-// because of caching. This overhead can be removed if running on a read-only
-// transaction, however, it is not safe to execute other writer transactions at
-// the same time.
-func (tx *Tx) Check() <-chan error {
- ch := make(chan error)
- go tx.check(ch)
- return ch
-}
-
-func (tx *Tx) check(ch chan error) {
- // Check if any pages are double freed.
- freed := make(map[pgid]bool)
- all := make([]pgid, tx.db.freelist.count())
- tx.db.freelist.copyall(all)
- for _, id := range all {
- if freed[id] {
- ch <- fmt.Errorf("page %d: already freed", id)
- }
- freed[id] = true
- }
-
- // Track every reachable page.
- reachable := make(map[pgid]*page)
- reachable[0] = tx.page(0) // meta0
- reachable[1] = tx.page(1) // meta1
- for i := uint32(0); i <= tx.page(tx.meta.freelist).overflow; i++ {
- reachable[tx.meta.freelist+pgid(i)] = tx.page(tx.meta.freelist)
- }
-
- // Recursively check buckets.
- tx.checkBucket(&tx.root, reachable, freed, ch)
-
- // Ensure all pages below high water mark are either reachable or freed.
- for i := pgid(0); i < tx.meta.pgid; i++ {
- _, isReachable := reachable[i]
- if !isReachable && !freed[i] {
- ch <- fmt.Errorf("page %d: unreachable unfreed", int(i))
- }
- }
-
- // Close the channel to signal completion.
- close(ch)
-}
-
-func (tx *Tx) checkBucket(b *Bucket, reachable map[pgid]*page, freed map[pgid]bool, ch chan error) {
- // Ignore inline buckets.
- if b.root == 0 {
- return
- }
-
- // Check every page used by this bucket.
- b.tx.forEachPage(b.root, 0, func(p *page, _ int) {
- if p.id > tx.meta.pgid {
- ch <- fmt.Errorf("page %d: out of bounds: %d", int(p.id), int(b.tx.meta.pgid))
- }
-
- // Ensure each page is only referenced once.
- for i := pgid(0); i <= pgid(p.overflow); i++ {
- var id = p.id + i
- if _, ok := reachable[id]; ok {
- ch <- fmt.Errorf("page %d: multiple references", int(id))
- }
- reachable[id] = p
- }
-
- // We should only encounter un-freed leaf and branch pages.
- if freed[p.id] {
- ch <- fmt.Errorf("page %d: reachable freed", int(p.id))
- } else if (p.flags&branchPageFlag) == 0 && (p.flags&leafPageFlag) == 0 {
- ch <- fmt.Errorf("page %d: invalid type: %s", int(p.id), p.typ())
- }
- })
-
- // Check each bucket within this bucket.
- _ = b.ForEach(func(k, v []byte) error {
- if child := b.Bucket(k); child != nil {
- tx.checkBucket(child, reachable, freed, ch)
- }
- return nil
- })
-}
-
-// allocate returns a contiguous block of memory starting at a given page.
-func (tx *Tx) allocate(count int) (*page, error) {
- p, err := tx.db.allocate(count)
- if err != nil {
- return nil, err
- }
-
- // Save to our page cache.
- tx.pages[p.id] = p
-
- // Update statistics.
- tx.stats.PageCount++
- tx.stats.PageAlloc += count * tx.db.pageSize
-
- return p, nil
-}
-
-// write writes any dirty pages to disk.
-func (tx *Tx) write() error {
- // Sort pages by id.
- pages := make(pages, 0, len(tx.pages))
- for _, p := range tx.pages {
- pages = append(pages, p)
- }
- // Clear out page cache early.
- tx.pages = make(map[pgid]*page)
- sort.Sort(pages)
-
- // Write pages to disk in order.
- for _, p := range pages {
- size := (int(p.overflow) + 1) * tx.db.pageSize
- offset := int64(p.id) * int64(tx.db.pageSize)
-
- // Write out page in "max allocation" sized chunks.
- ptr := (*[maxAllocSize]byte)(unsafe.Pointer(p))
- for {
- // Limit our write to our max allocation size.
- sz := size
- if sz > maxAllocSize-1 {
- sz = maxAllocSize - 1
- }
-
- // Write chunk to disk.
- buf := ptr[:sz]
- if _, err := tx.db.ops.writeAt(buf, offset); err != nil {
- return err
- }
-
- // Update statistics.
- tx.stats.Write++
-
- // Exit inner for loop if we've written all the chunks.
- size -= sz
- if size == 0 {
- break
- }
-
- // Otherwise move offset forward and move pointer to next chunk.
- offset += int64(sz)
- ptr = (*[maxAllocSize]byte)(unsafe.Pointer(&ptr[sz]))
- }
- }
-
- // Ignore file sync if flag is set on DB.
- if !tx.db.NoSync || IgnoreNoSync {
- if err := fdatasync(tx.db); err != nil {
- return err
- }
- }
-
- // Put small pages back to page pool.
- for _, p := range pages {
- // Ignore page sizes over 1 page.
- // These are allocated using make() instead of the page pool.
- if int(p.overflow) != 0 {
- continue
- }
-
- buf := (*[maxAllocSize]byte)(unsafe.Pointer(p))[:tx.db.pageSize]
-
- // See https://go.googlesource.com/go/+/f03c9202c43e0abb130669852082117ca50aa9b1
- for i := range buf {
- buf[i] = 0
- }
- tx.db.pagePool.Put(buf)
- }
-
- return nil
-}
-
-// writeMeta writes the meta to the disk.
-func (tx *Tx) writeMeta() error {
- // Create a temporary buffer for the meta page.
- buf := make([]byte, tx.db.pageSize)
- p := tx.db.pageInBuffer(buf, 0)
- tx.meta.write(p)
-
- // Write the meta page to file.
- if _, err := tx.db.ops.writeAt(buf, int64(p.id)*int64(tx.db.pageSize)); err != nil {
- return err
- }
- if !tx.db.NoSync || IgnoreNoSync {
- if err := fdatasync(tx.db); err != nil {
- return err
- }
- }
-
- // Update statistics.
- tx.stats.Write++
-
- return nil
-}
-
-// page returns a reference to the page with a given id.
-// If page has been written to then a temporary buffered page is returned.
-func (tx *Tx) page(id pgid) *page {
- // Check the dirty pages first.
- if tx.pages != nil {
- if p, ok := tx.pages[id]; ok {
- return p
- }
- }
-
- // Otherwise return directly from the mmap.
- return tx.db.page(id)
-}
-
-// forEachPage iterates over every page within a given page and executes a function.
-func (tx *Tx) forEachPage(pgid pgid, depth int, fn func(*page, int)) {
- p := tx.page(pgid)
-
- // Execute function.
- fn(p, depth)
-
- // Recursively loop over children.
- if (p.flags & branchPageFlag) != 0 {
- for i := 0; i < int(p.count); i++ {
- elem := p.branchPageElement(uint16(i))
- tx.forEachPage(elem.pgid, depth+1, fn)
- }
- }
-}
-
-// Page returns page information for a given page number.
-// This is only safe for concurrent use when used by a writable transaction.
-func (tx *Tx) Page(id int) (*PageInfo, error) {
- if tx.db == nil {
- return nil, ErrTxClosed
- } else if pgid(id) >= tx.meta.pgid {
- return nil, nil
- }
-
- // Build the page info.
- p := tx.db.page(pgid(id))
- info := &PageInfo{
- ID: id,
- Count: int(p.count),
- OverflowCount: int(p.overflow),
- }
-
- // Determine the type (or if it's free).
- if tx.db.freelist.freed(pgid(id)) {
- info.Type = "free"
- } else {
- info.Type = p.typ()
- }
-
- return info, nil
-}
-
-// TxStats represents statistics about the actions performed by the transaction.
-type TxStats struct {
- // Page statistics.
- PageCount int // number of page allocations
- PageAlloc int // total bytes allocated
-
- // Cursor statistics.
- CursorCount int // number of cursors created
-
- // Node statistics
- NodeCount int // number of node allocations
- NodeDeref int // number of node dereferences
-
- // Rebalance statistics.
- Rebalance int // number of node rebalances
- RebalanceTime time.Duration // total time spent rebalancing
-
- // Split/Spill statistics.
- Split int // number of nodes split
- Spill int // number of nodes spilled
- SpillTime time.Duration // total time spent spilling
-
- // Write statistics.
- Write int // number of writes performed
- WriteTime time.Duration // total time spent writing to disk
-}
-
-func (s *TxStats) add(other *TxStats) {
- s.PageCount += other.PageCount
- s.PageAlloc += other.PageAlloc
- s.CursorCount += other.CursorCount
- s.NodeCount += other.NodeCount
- s.NodeDeref += other.NodeDeref
- s.Rebalance += other.Rebalance
- s.RebalanceTime += other.RebalanceTime
- s.Split += other.Split
- s.Spill += other.Spill
- s.SpillTime += other.SpillTime
- s.Write += other.Write
- s.WriteTime += other.WriteTime
-}
-
-// Sub calculates and returns the difference between two sets of transaction stats.
-// This is useful when obtaining stats at two different points and time and
-// you need the performance counters that occurred within that time span.
-func (s *TxStats) Sub(other *TxStats) TxStats {
- var diff TxStats
- diff.PageCount = s.PageCount - other.PageCount
- diff.PageAlloc = s.PageAlloc - other.PageAlloc
- diff.CursorCount = s.CursorCount - other.CursorCount
- diff.NodeCount = s.NodeCount - other.NodeCount
- diff.NodeDeref = s.NodeDeref - other.NodeDeref
- diff.Rebalance = s.Rebalance - other.Rebalance
- diff.RebalanceTime = s.RebalanceTime - other.RebalanceTime
- diff.Split = s.Split - other.Split
- diff.Spill = s.Spill - other.Spill
- diff.SpillTime = s.SpillTime - other.SpillTime
- diff.Write = s.Write - other.Write
- diff.WriteTime = s.WriteTime - other.WriteTime
- return diff
-}
diff --git a/vendor/github.com/garyburd/redigo/LICENSE b/vendor/github.com/garyburd/redigo/LICENSE
deleted file mode 100644
index 67db858..0000000
--- a/vendor/github.com/garyburd/redigo/LICENSE
+++ /dev/null
@@ -1,175 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
diff --git a/vendor/github.com/garyburd/redigo/internal/commandinfo.go b/vendor/github.com/garyburd/redigo/internal/commandinfo.go
deleted file mode 100644
index dbc60fc..0000000
--- a/vendor/github.com/garyburd/redigo/internal/commandinfo.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2014 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package internal
-
-import (
- "strings"
-)
-
-const (
- WatchState = 1 << iota
- MultiState
- SubscribeState
- MonitorState
-)
-
-type CommandInfo struct {
- Set, Clear int
-}
-
-var commandInfos = map[string]CommandInfo{
- "WATCH": {Set: WatchState},
- "UNWATCH": {Clear: WatchState},
- "MULTI": {Set: MultiState},
- "EXEC": {Clear: WatchState | MultiState},
- "DISCARD": {Clear: WatchState | MultiState},
- "PSUBSCRIBE": {Set: SubscribeState},
- "SUBSCRIBE": {Set: SubscribeState},
- "MONITOR": {Set: MonitorState},
-}
-
-func init() {
- for n, ci := range commandInfos {
- commandInfos[strings.ToLower(n)] = ci
- }
-}
-
-func LookupCommandInfo(commandName string) CommandInfo {
- if ci, ok := commandInfos[commandName]; ok {
- return ci
- }
- return commandInfos[strings.ToUpper(commandName)]
-}
diff --git a/vendor/github.com/garyburd/redigo/redis/conn.go b/vendor/github.com/garyburd/redigo/redis/conn.go
deleted file mode 100644
index 84c3b9c..0000000
--- a/vendor/github.com/garyburd/redigo/redis/conn.go
+++ /dev/null
@@ -1,618 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package redis
-
-import (
- "bufio"
- "bytes"
- "crypto/tls"
- "errors"
- "fmt"
- "io"
- "net"
- "net/url"
- "regexp"
- "strconv"
- "sync"
- "time"
-)
-
-// conn is the low-level implementation of Conn
-type conn struct {
-
- // Shared
- mu sync.Mutex
- pending int
- err error
- conn net.Conn
-
- // Read
- readTimeout time.Duration
- br *bufio.Reader
-
- // Write
- writeTimeout time.Duration
- bw *bufio.Writer
-
- // Scratch space for formatting argument length.
- // '*' or '$', length, "\r\n"
- lenScratch [32]byte
-
- // Scratch space for formatting integers and floats.
- numScratch [40]byte
-}
-
-// DialTimeout acts like Dial but takes timeouts for establishing the
-// connection to the server, writing a command and reading a reply.
-//
-// Deprecated: Use Dial with options instead.
-func DialTimeout(network, address string, connectTimeout, readTimeout, writeTimeout time.Duration) (Conn, error) {
- return Dial(network, address,
- DialConnectTimeout(connectTimeout),
- DialReadTimeout(readTimeout),
- DialWriteTimeout(writeTimeout))
-}
-
-// DialOption specifies an option for dialing a Redis server.
-type DialOption struct {
- f func(*dialOptions)
-}
-
-type dialOptions struct {
- readTimeout time.Duration
- writeTimeout time.Duration
- dial func(network, addr string) (net.Conn, error)
- db int
- password string
- dialTLS bool
- skipVerify bool
- tlsConfig *tls.Config
-}
-
-// DialReadTimeout specifies the timeout for reading a single command reply.
-func DialReadTimeout(d time.Duration) DialOption {
- return DialOption{func(do *dialOptions) {
- do.readTimeout = d
- }}
-}
-
-// DialWriteTimeout specifies the timeout for writing a single command.
-func DialWriteTimeout(d time.Duration) DialOption {
- return DialOption{func(do *dialOptions) {
- do.writeTimeout = d
- }}
-}
-
-// DialConnectTimeout specifies the timeout for connecting to the Redis server.
-func DialConnectTimeout(d time.Duration) DialOption {
- return DialOption{func(do *dialOptions) {
- dialer := net.Dialer{Timeout: d}
- do.dial = dialer.Dial
- }}
-}
-
-// DialNetDial specifies a custom dial function for creating TCP
-// connections. If this option is left out, then net.Dial is
-// used. DialNetDial overrides DialConnectTimeout.
-func DialNetDial(dial func(network, addr string) (net.Conn, error)) DialOption {
- return DialOption{func(do *dialOptions) {
- do.dial = dial
- }}
-}
-
-// DialDatabase specifies the database to select when dialing a connection.
-func DialDatabase(db int) DialOption {
- return DialOption{func(do *dialOptions) {
- do.db = db
- }}
-}
-
-// DialPassword specifies the password to use when connecting to
-// the Redis server.
-func DialPassword(password string) DialOption {
- return DialOption{func(do *dialOptions) {
- do.password = password
- }}
-}
-
-// DialTLSConfig specifies the config to use when a TLS connection is dialed.
-// Has no effect when not dialing a TLS connection.
-func DialTLSConfig(c *tls.Config) DialOption {
- return DialOption{func(do *dialOptions) {
- do.tlsConfig = c
- }}
-}
-
-// DialTLSSkipVerify to disable server name verification when connecting
-// over TLS. Has no effect when not dialing a TLS connection.
-func DialTLSSkipVerify(skip bool) DialOption {
- return DialOption{func(do *dialOptions) {
- do.skipVerify = skip
- }}
-}
-
-// Dial connects to the Redis server at the given network and
-// address using the specified options.
-func Dial(network, address string, options ...DialOption) (Conn, error) {
- do := dialOptions{
- dial: net.Dial,
- }
- for _, option := range options {
- option.f(&do)
- }
-
- netConn, err := do.dial(network, address)
- if err != nil {
- return nil, err
- }
-
- if do.dialTLS {
- tlsConfig := cloneTLSClientConfig(do.tlsConfig, do.skipVerify)
- if tlsConfig.ServerName == "" {
- host, _, err := net.SplitHostPort(address)
- if err != nil {
- netConn.Close()
- return nil, err
- }
- tlsConfig.ServerName = host
- }
-
- tlsConn := tls.Client(netConn, tlsConfig)
- if err := tlsConn.Handshake(); err != nil {
- netConn.Close()
- return nil, err
- }
- netConn = tlsConn
- }
-
- c := &conn{
- conn: netConn,
- bw: bufio.NewWriter(netConn),
- br: bufio.NewReader(netConn),
- readTimeout: do.readTimeout,
- writeTimeout: do.writeTimeout,
- }
-
- if do.password != "" {
- if _, err := c.Do("AUTH", do.password); err != nil {
- netConn.Close()
- return nil, err
- }
- }
-
- if do.db != 0 {
- if _, err := c.Do("SELECT", do.db); err != nil {
- netConn.Close()
- return nil, err
- }
- }
-
- return c, nil
-}
-
-func dialTLS(do *dialOptions) {
- do.dialTLS = true
-}
-
-var pathDBRegexp = regexp.MustCompile(`/(\d*)\z`)
-
-// DialURL connects to a Redis server at the given URL using the Redis
-// URI scheme. URLs should follow the draft IANA specification for the
-// scheme (https://www.iana.org/assignments/uri-schemes/prov/redis).
-func DialURL(rawurl string, options ...DialOption) (Conn, error) {
- u, err := url.Parse(rawurl)
- if err != nil {
- return nil, err
- }
-
- if u.Scheme != "redis" && u.Scheme != "rediss" {
- return nil, fmt.Errorf("invalid redis URL scheme: %s", u.Scheme)
- }
-
- // As per the IANA draft spec, the host defaults to localhost and
- // the port defaults to 6379.
- host, port, err := net.SplitHostPort(u.Host)
- if err != nil {
- // assume port is missing
- host = u.Host
- port = "6379"
- }
- if host == "" {
- host = "localhost"
- }
- address := net.JoinHostPort(host, port)
-
- if u.User != nil {
- password, isSet := u.User.Password()
- if isSet {
- options = append(options, DialPassword(password))
- }
- }
-
- match := pathDBRegexp.FindStringSubmatch(u.Path)
- if len(match) == 2 {
- db := 0
- if len(match[1]) > 0 {
- db, err = strconv.Atoi(match[1])
- if err != nil {
- return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
- }
- }
- if db != 0 {
- options = append(options, DialDatabase(db))
- }
- } else if u.Path != "" {
- return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
- }
-
- if u.Scheme == "rediss" {
- options = append([]DialOption{{dialTLS}}, options...)
- }
-
- return Dial("tcp", address, options...)
-}
-
-// NewConn returns a new Redigo connection for the given net connection.
-func NewConn(netConn net.Conn, readTimeout, writeTimeout time.Duration) Conn {
- return &conn{
- conn: netConn,
- bw: bufio.NewWriter(netConn),
- br: bufio.NewReader(netConn),
- readTimeout: readTimeout,
- writeTimeout: writeTimeout,
- }
-}
-
-func (c *conn) Close() error {
- c.mu.Lock()
- err := c.err
- if c.err == nil {
- c.err = errors.New("redigo: closed")
- err = c.conn.Close()
- }
- c.mu.Unlock()
- return err
-}
-
-func (c *conn) fatal(err error) error {
- c.mu.Lock()
- if c.err == nil {
- c.err = err
- // Close connection to force errors on subsequent calls and to unblock
- // other reader or writer.
- c.conn.Close()
- }
- c.mu.Unlock()
- return err
-}
-
-func (c *conn) Err() error {
- c.mu.Lock()
- err := c.err
- c.mu.Unlock()
- return err
-}
-
-func (c *conn) writeLen(prefix byte, n int) error {
- c.lenScratch[len(c.lenScratch)-1] = '\n'
- c.lenScratch[len(c.lenScratch)-2] = '\r'
- i := len(c.lenScratch) - 3
- for {
- c.lenScratch[i] = byte('0' + n%10)
- i -= 1
- n = n / 10
- if n == 0 {
- break
- }
- }
- c.lenScratch[i] = prefix
- _, err := c.bw.Write(c.lenScratch[i:])
- return err
-}
-
-func (c *conn) writeString(s string) error {
- c.writeLen('$', len(s))
- c.bw.WriteString(s)
- _, err := c.bw.WriteString("\r\n")
- return err
-}
-
-func (c *conn) writeBytes(p []byte) error {
- c.writeLen('$', len(p))
- c.bw.Write(p)
- _, err := c.bw.WriteString("\r\n")
- return err
-}
-
-func (c *conn) writeInt64(n int64) error {
- return c.writeBytes(strconv.AppendInt(c.numScratch[:0], n, 10))
-}
-
-func (c *conn) writeFloat64(n float64) error {
- return c.writeBytes(strconv.AppendFloat(c.numScratch[:0], n, 'g', -1, 64))
-}
-
-func (c *conn) writeCommand(cmd string, args []interface{}) (err error) {
- c.writeLen('*', 1+len(args))
- err = c.writeString(cmd)
- for _, arg := range args {
- if err != nil {
- break
- }
- switch arg := arg.(type) {
- case string:
- err = c.writeString(arg)
- case []byte:
- err = c.writeBytes(arg)
- case int:
- err = c.writeInt64(int64(arg))
- case int64:
- err = c.writeInt64(arg)
- case float64:
- err = c.writeFloat64(arg)
- case bool:
- if arg {
- err = c.writeString("1")
- } else {
- err = c.writeString("0")
- }
- case nil:
- err = c.writeString("")
- default:
- var buf bytes.Buffer
- fmt.Fprint(&buf, arg)
- err = c.writeBytes(buf.Bytes())
- }
- }
- return err
-}
-
-type protocolError string
-
-func (pe protocolError) Error() string {
- return fmt.Sprintf("redigo: %s (possible server error or unsupported concurrent read by application)", string(pe))
-}
-
-func (c *conn) readLine() ([]byte, error) {
- p, err := c.br.ReadSlice('\n')
- if err == bufio.ErrBufferFull {
- return nil, protocolError("long response line")
- }
- if err != nil {
- return nil, err
- }
- i := len(p) - 2
- if i < 0 || p[i] != '\r' {
- return nil, protocolError("bad response line terminator")
- }
- return p[:i], nil
-}
-
-// parseLen parses bulk string and array lengths.
-func parseLen(p []byte) (int, error) {
- if len(p) == 0 {
- return -1, protocolError("malformed length")
- }
-
- if p[0] == '-' && len(p) == 2 && p[1] == '1' {
- // handle $-1 and $-1 null replies.
- return -1, nil
- }
-
- var n int
- for _, b := range p {
- n *= 10
- if b < '0' || b > '9' {
- return -1, protocolError("illegal bytes in length")
- }
- n += int(b - '0')
- }
-
- return n, nil
-}
-
-// parseInt parses an integer reply.
-func parseInt(p []byte) (interface{}, error) {
- if len(p) == 0 {
- return 0, protocolError("malformed integer")
- }
-
- var negate bool
- if p[0] == '-' {
- negate = true
- p = p[1:]
- if len(p) == 0 {
- return 0, protocolError("malformed integer")
- }
- }
-
- var n int64
- for _, b := range p {
- n *= 10
- if b < '0' || b > '9' {
- return 0, protocolError("illegal bytes in length")
- }
- n += int64(b - '0')
- }
-
- if negate {
- n = -n
- }
- return n, nil
-}
-
-var (
- okReply interface{} = "OK"
- pongReply interface{} = "PONG"
-)
-
-func (c *conn) readReply() (interface{}, error) {
- line, err := c.readLine()
- if err != nil {
- return nil, err
- }
- if len(line) == 0 {
- return nil, protocolError("short response line")
- }
- switch line[0] {
- case '+':
- switch {
- case len(line) == 3 && line[1] == 'O' && line[2] == 'K':
- // Avoid allocation for frequent "+OK" response.
- return okReply, nil
- case len(line) == 5 && line[1] == 'P' && line[2] == 'O' && line[3] == 'N' && line[4] == 'G':
- // Avoid allocation in PING command benchmarks :)
- return pongReply, nil
- default:
- return string(line[1:]), nil
- }
- case '-':
- return Error(string(line[1:])), nil
- case ':':
- return parseInt(line[1:])
- case '$':
- n, err := parseLen(line[1:])
- if n < 0 || err != nil {
- return nil, err
- }
- p := make([]byte, n)
- _, err = io.ReadFull(c.br, p)
- if err != nil {
- return nil, err
- }
- if line, err := c.readLine(); err != nil {
- return nil, err
- } else if len(line) != 0 {
- return nil, protocolError("bad bulk string format")
- }
- return p, nil
- case '*':
- n, err := parseLen(line[1:])
- if n < 0 || err != nil {
- return nil, err
- }
- r := make([]interface{}, n)
- for i := range r {
- r[i], err = c.readReply()
- if err != nil {
- return nil, err
- }
- }
- return r, nil
- }
- return nil, protocolError("unexpected response line")
-}
-
-func (c *conn) Send(cmd string, args ...interface{}) error {
- c.mu.Lock()
- c.pending += 1
- c.mu.Unlock()
- if c.writeTimeout != 0 {
- c.conn.SetWriteDeadline(time.Now().Add(c.writeTimeout))
- }
- if err := c.writeCommand(cmd, args); err != nil {
- return c.fatal(err)
- }
- return nil
-}
-
-func (c *conn) Flush() error {
- if c.writeTimeout != 0 {
- c.conn.SetWriteDeadline(time.Now().Add(c.writeTimeout))
- }
- if err := c.bw.Flush(); err != nil {
- return c.fatal(err)
- }
- return nil
-}
-
-func (c *conn) Receive() (reply interface{}, err error) {
- if c.readTimeout != 0 {
- c.conn.SetReadDeadline(time.Now().Add(c.readTimeout))
- }
- if reply, err = c.readReply(); err != nil {
- return nil, c.fatal(err)
- }
- // When using pub/sub, the number of receives can be greater than the
- // number of sends. To enable normal use of the connection after
- // unsubscribing from all channels, we do not decrement pending to a
- // negative value.
- //
- // The pending field is decremented after the reply is read to handle the
- // case where Receive is called before Send.
- c.mu.Lock()
- if c.pending > 0 {
- c.pending -= 1
- }
- c.mu.Unlock()
- if err, ok := reply.(Error); ok {
- return nil, err
- }
- return
-}
-
-func (c *conn) Do(cmd string, args ...interface{}) (interface{}, error) {
- c.mu.Lock()
- pending := c.pending
- c.pending = 0
- c.mu.Unlock()
-
- if cmd == "" && pending == 0 {
- return nil, nil
- }
-
- if c.writeTimeout != 0 {
- c.conn.SetWriteDeadline(time.Now().Add(c.writeTimeout))
- }
-
- if cmd != "" {
- if err := c.writeCommand(cmd, args); err != nil {
- return nil, c.fatal(err)
- }
- }
-
- if err := c.bw.Flush(); err != nil {
- return nil, c.fatal(err)
- }
-
- if c.readTimeout != 0 {
- c.conn.SetReadDeadline(time.Now().Add(c.readTimeout))
- }
-
- if cmd == "" {
- reply := make([]interface{}, pending)
- for i := range reply {
- r, e := c.readReply()
- if e != nil {
- return nil, c.fatal(e)
- }
- reply[i] = r
- }
- return reply, nil
- }
-
- var err error
- var reply interface{}
- for i := 0; i <= pending; i++ {
- var e error
- if reply, e = c.readReply(); e != nil {
- return nil, c.fatal(e)
- }
- if e, ok := reply.(Error); ok && err == nil {
- err = e
- }
- }
- return reply, err
-}
diff --git a/vendor/github.com/garyburd/redigo/redis/doc.go b/vendor/github.com/garyburd/redigo/redis/doc.go
deleted file mode 100644
index bf5131a..0000000
--- a/vendor/github.com/garyburd/redigo/redis/doc.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-// Package redis is a client for the Redis database.
-//
-// The Redigo FAQ (https://github.com/garyburd/redigo/wiki/FAQ) contains more
-// documentation about this package.
-//
-// Connections
-//
-// The Conn interface is the primary interface for working with Redis.
-// Applications create connections by calling the Dial, DialWithTimeout or
-// NewConn functions. In the future, functions will be added for creating
-// sharded and other types of connections.
-//
-// The application must call the connection Close method when the application
-// is done with the connection.
-//
-// Executing Commands
-//
-// The Conn interface has a generic method for executing Redis commands:
-//
-// Do(commandName string, args ...interface{}) (reply interface{}, err error)
-//
-// The Redis command reference (http://redis.io/commands) lists the available
-// commands. An example of using the Redis APPEND command is:
-//
-// n, err := conn.Do("APPEND", "key", "value")
-//
-// The Do method converts command arguments to binary strings for transmission
-// to the server as follows:
-//
-// Go Type Conversion
-// []byte Sent as is
-// string Sent as is
-// int, int64 strconv.FormatInt(v)
-// float64 strconv.FormatFloat(v, 'g', -1, 64)
-// bool true -> "1", false -> "0"
-// nil ""
-// all other types fmt.Print(v)
-//
-// Redis command reply types are represented using the following Go types:
-//
-// Redis type Go type
-// error redis.Error
-// integer int64
-// simple string string
-// bulk string []byte or nil if value not present.
-// array []interface{} or nil if value not present.
-//
-// Use type assertions or the reply helper functions to convert from
-// interface{} to the specific Go type for the command result.
-//
-// Pipelining
-//
-// Connections support pipelining using the Send, Flush and Receive methods.
-//
-// Send(commandName string, args ...interface{}) error
-// Flush() error
-// Receive() (reply interface{}, err error)
-//
-// Send writes the command to the connection's output buffer. Flush flushes the
-// connection's output buffer to the server. Receive reads a single reply from
-// the server. The following example shows a simple pipeline.
-//
-// c.Send("SET", "foo", "bar")
-// c.Send("GET", "foo")
-// c.Flush()
-// c.Receive() // reply from SET
-// v, err = c.Receive() // reply from GET
-//
-// The Do method combines the functionality of the Send, Flush and Receive
-// methods. The Do method starts by writing the command and flushing the output
-// buffer. Next, the Do method receives all pending replies including the reply
-// for the command just sent by Do. If any of the received replies is an error,
-// then Do returns the error. If there are no errors, then Do returns the last
-// reply. If the command argument to the Do method is "", then the Do method
-// will flush the output buffer and receive pending replies without sending a
-// command.
-//
-// Use the Send and Do methods to implement pipelined transactions.
-//
-// c.Send("MULTI")
-// c.Send("INCR", "foo")
-// c.Send("INCR", "bar")
-// r, err := c.Do("EXEC")
-// fmt.Println(r) // prints [1, 1]
-//
-// Concurrency
-//
-// Connections support one concurrent caller to the Receive method and one
-// concurrent caller to the Send and Flush methods. No other concurrency is
-// supported including concurrent calls to the Do method.
-//
-// For full concurrent access to Redis, use the thread-safe Pool to get, use
-// and release a connection from within a goroutine. Connections returned from
-// a Pool have the concurrency restrictions described in the previous
-// paragraph.
-//
-// Publish and Subscribe
-//
-// Use the Send, Flush and Receive methods to implement Pub/Sub subscribers.
-//
-// c.Send("SUBSCRIBE", "example")
-// c.Flush()
-// for {
-// reply, err := c.Receive()
-// if err != nil {
-// return err
-// }
-// // process pushed message
-// }
-//
-// The PubSubConn type wraps a Conn with convenience methods for implementing
-// subscribers. The Subscribe, PSubscribe, Unsubscribe and PUnsubscribe methods
-// send and flush a subscription management command. The receive method
-// converts a pushed message to convenient types for use in a type switch.
-//
-// psc := redis.PubSubConn{Conn: c}
-// psc.Subscribe("example")
-// for {
-// switch v := psc.Receive().(type) {
-// case redis.Message:
-// fmt.Printf("%s: message: %s\n", v.Channel, v.Data)
-// case redis.Subscription:
-// fmt.Printf("%s: %s %d\n", v.Channel, v.Kind, v.Count)
-// case error:
-// return v
-// }
-// }
-//
-// Reply Helpers
-//
-// The Bool, Int, Bytes, String, Strings and Values functions convert a reply
-// to a value of a specific type. To allow convenient wrapping of calls to the
-// connection Do and Receive methods, the functions take a second argument of
-// type error. If the error is non-nil, then the helper function returns the
-// error. If the error is nil, the function converts the reply to the specified
-// type:
-//
-// exists, err := redis.Bool(c.Do("EXISTS", "foo"))
-// if err != nil {
-// // handle error return from c.Do or type conversion error.
-// }
-//
-// The Scan function converts elements of a array reply to Go types:
-//
-// var value1 int
-// var value2 string
-// reply, err := redis.Values(c.Do("MGET", "key1", "key2"))
-// if err != nil {
-// // handle error
-// }
-// if _, err := redis.Scan(reply, &value1, &value2); err != nil {
-// // handle error
-// }
-//
-// Errors
-//
-// Connection methods return error replies from the server as type redis.Error.
-//
-// Call the connection Err() method to determine if the connection encountered
-// non-recoverable error such as a network error or protocol parsing error. If
-// Err() returns a non-nil value, then the connection is not usable and should
-// be closed.
-package redis
diff --git a/vendor/github.com/garyburd/redigo/redis/go17.go b/vendor/github.com/garyburd/redigo/redis/go17.go
deleted file mode 100644
index 3f951e5..0000000
--- a/vendor/github.com/garyburd/redigo/redis/go17.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build go1.7
-
-package redis
-
-import "crypto/tls"
-
-// similar cloneTLSClientConfig in the stdlib, but also honor skipVerify for the nil case
-func cloneTLSClientConfig(cfg *tls.Config, skipVerify bool) *tls.Config {
- if cfg == nil {
- return &tls.Config{InsecureSkipVerify: skipVerify}
- }
- return &tls.Config{
- Rand: cfg.Rand,
- Time: cfg.Time,
- Certificates: cfg.Certificates,
- NameToCertificate: cfg.NameToCertificate,
- GetCertificate: cfg.GetCertificate,
- RootCAs: cfg.RootCAs,
- NextProtos: cfg.NextProtos,
- ServerName: cfg.ServerName,
- ClientAuth: cfg.ClientAuth,
- ClientCAs: cfg.ClientCAs,
- InsecureSkipVerify: cfg.InsecureSkipVerify,
- CipherSuites: cfg.CipherSuites,
- PreferServerCipherSuites: cfg.PreferServerCipherSuites,
- ClientSessionCache: cfg.ClientSessionCache,
- MinVersion: cfg.MinVersion,
- MaxVersion: cfg.MaxVersion,
- CurvePreferences: cfg.CurvePreferences,
- DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled,
- Renegotiation: cfg.Renegotiation,
- }
-}
diff --git a/vendor/github.com/garyburd/redigo/redis/log.go b/vendor/github.com/garyburd/redigo/redis/log.go
deleted file mode 100644
index 129b86d..0000000
--- a/vendor/github.com/garyburd/redigo/redis/log.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package redis
-
-import (
- "bytes"
- "fmt"
- "log"
-)
-
-// NewLoggingConn returns a logging wrapper around a connection.
-func NewLoggingConn(conn Conn, logger *log.Logger, prefix string) Conn {
- if prefix != "" {
- prefix = prefix + "."
- }
- return &loggingConn{conn, logger, prefix}
-}
-
-type loggingConn struct {
- Conn
- logger *log.Logger
- prefix string
-}
-
-func (c *loggingConn) Close() error {
- err := c.Conn.Close()
- var buf bytes.Buffer
- fmt.Fprintf(&buf, "%sClose() -> (%v)", c.prefix, err)
- c.logger.Output(2, buf.String())
- return err
-}
-
-func (c *loggingConn) printValue(buf *bytes.Buffer, v interface{}) {
- const chop = 32
- switch v := v.(type) {
- case []byte:
- if len(v) > chop {
- fmt.Fprintf(buf, "%q...", v[:chop])
- } else {
- fmt.Fprintf(buf, "%q", v)
- }
- case string:
- if len(v) > chop {
- fmt.Fprintf(buf, "%q...", v[:chop])
- } else {
- fmt.Fprintf(buf, "%q", v)
- }
- case []interface{}:
- if len(v) == 0 {
- buf.WriteString("[]")
- } else {
- sep := "["
- fin := "]"
- if len(v) > chop {
- v = v[:chop]
- fin = "...]"
- }
- for _, vv := range v {
- buf.WriteString(sep)
- c.printValue(buf, vv)
- sep = ", "
- }
- buf.WriteString(fin)
- }
- default:
- fmt.Fprint(buf, v)
- }
-}
-
-func (c *loggingConn) print(method, commandName string, args []interface{}, reply interface{}, err error) {
- var buf bytes.Buffer
- fmt.Fprintf(&buf, "%s%s(", c.prefix, method)
- if method != "Receive" {
- buf.WriteString(commandName)
- for _, arg := range args {
- buf.WriteString(", ")
- c.printValue(&buf, arg)
- }
- }
- buf.WriteString(") -> (")
- if method != "Send" {
- c.printValue(&buf, reply)
- buf.WriteString(", ")
- }
- fmt.Fprintf(&buf, "%v)", err)
- c.logger.Output(3, buf.String())
-}
-
-func (c *loggingConn) Do(commandName string, args ...interface{}) (interface{}, error) {
- reply, err := c.Conn.Do(commandName, args...)
- c.print("Do", commandName, args, reply, err)
- return reply, err
-}
-
-func (c *loggingConn) Send(commandName string, args ...interface{}) error {
- err := c.Conn.Send(commandName, args...)
- c.print("Send", commandName, args, nil, err)
- return err
-}
-
-func (c *loggingConn) Receive() (interface{}, error) {
- reply, err := c.Conn.Receive()
- c.print("Receive", "", nil, reply, err)
- return reply, err
-}
diff --git a/vendor/github.com/garyburd/redigo/redis/pool.go b/vendor/github.com/garyburd/redigo/redis/pool.go
deleted file mode 100644
index 283a41d..0000000
--- a/vendor/github.com/garyburd/redigo/redis/pool.go
+++ /dev/null
@@ -1,416 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package redis
-
-import (
- "bytes"
- "container/list"
- "crypto/rand"
- "crypto/sha1"
- "errors"
- "io"
- "strconv"
- "sync"
- "time"
-
- "github.com/garyburd/redigo/internal"
-)
-
-var nowFunc = time.Now // for testing
-
-// ErrPoolExhausted is returned from a pool connection method (Do, Send,
-// Receive, Flush, Err) when the maximum number of database connections in the
-// pool has been reached.
-var ErrPoolExhausted = errors.New("redigo: connection pool exhausted")
-
-var (
- errPoolClosed = errors.New("redigo: connection pool closed")
- errConnClosed = errors.New("redigo: connection closed")
-)
-
-// Pool maintains a pool of connections. The application calls the Get method
-// to get a connection from the pool and the connection's Close method to
-// return the connection's resources to the pool.
-//
-// The following example shows how to use a pool in a web application. The
-// application creates a pool at application startup and makes it available to
-// request handlers using a package level variable. The pool configuration used
-// here is an example, not a recommendation.
-//
-// func newPool(addr string) *redis.Pool {
-// return &redis.Pool{
-// MaxIdle: 3,
-// IdleTimeout: 240 * time.Second,
-// Dial: func () (redis.Conn, error) { return redis.Dial("tcp", addr) },
-// }
-// }
-//
-// var (
-// pool *redis.Pool
-// redisServer = flag.String("redisServer", ":6379", "")
-// )
-//
-// func main() {
-// flag.Parse()
-// pool = newPool(*redisServer)
-// ...
-// }
-//
-// A request handler gets a connection from the pool and closes the connection
-// when the handler is done:
-//
-// func serveHome(w http.ResponseWriter, r *http.Request) {
-// conn := pool.Get()
-// defer conn.Close()
-// ...
-// }
-//
-// Use the Dial function to authenticate connections with the AUTH command or
-// select a database with the SELECT command:
-//
-// pool := &redis.Pool{
-// // Other pool configuration not shown in this example.
-// Dial: func () (redis.Conn, error) {
-// c, err := redis.Dial("tcp", server)
-// if err != nil {
-// return nil, err
-// }
-// if _, err := c.Do("AUTH", password); err != nil {
-// c.Close()
-// return nil, err
-// }
-// if _, err := c.Do("SELECT", db); err != nil {
-// c.Close()
-// return nil, err
-// }
-// return c, nil
-// }
-// }
-//
-// Use the TestOnBorrow function to check the health of an idle connection
-// before the connection is returned to the application. This example PINGs
-// connections that have been idle more than a minute:
-//
-// pool := &redis.Pool{
-// // Other pool configuration not shown in this example.
-// TestOnBorrow: func(c redis.Conn, t time.Time) error {
-// if time.Since(t) < time.Minute {
-// return nil
-// }
-// _, err := c.Do("PING")
-// return err
-// },
-// }
-//
-type Pool struct {
-
- // Dial is an application supplied function for creating and configuring a
- // connection.
- //
- // The connection returned from Dial must not be in a special state
- // (subscribed to pubsub channel, transaction started, ...).
- Dial func() (Conn, error)
-
- // TestOnBorrow is an optional application supplied function for checking
- // the health of an idle connection before the connection is used again by
- // the application. Argument t is the time that the connection was returned
- // to the pool. If the function returns an error, then the connection is
- // closed.
- TestOnBorrow func(c Conn, t time.Time) error
-
- // Maximum number of idle connections in the pool.
- MaxIdle int
-
- // Maximum number of connections allocated by the pool at a given time.
- // When zero, there is no limit on the number of connections in the pool.
- MaxActive int
-
- // Close connections after remaining idle for this duration. If the value
- // is zero, then idle connections are not closed. Applications should set
- // the timeout to a value less than the server's timeout.
- IdleTimeout time.Duration
-
- // If Wait is true and the pool is at the MaxActive limit, then Get() waits
- // for a connection to be returned to the pool before returning.
- Wait bool
-
- // mu protects fields defined below.
- mu sync.Mutex
- cond *sync.Cond
- closed bool
- active int
-
- // Stack of idleConn with most recently used at the front.
- idle list.List
-}
-
-type idleConn struct {
- c Conn
- t time.Time
-}
-
-// NewPool creates a new pool.
-//
-// Deprecated: Initialize the Pool directory as shown in the example.
-func NewPool(newFn func() (Conn, error), maxIdle int) *Pool {
- return &Pool{Dial: newFn, MaxIdle: maxIdle}
-}
-
-// Get gets a connection. The application must close the returned connection.
-// This method always returns a valid connection so that applications can defer
-// error handling to the first use of the connection. If there is an error
-// getting an underlying connection, then the connection Err, Do, Send, Flush
-// and Receive methods return that error.
-func (p *Pool) Get() Conn {
- c, err := p.get()
- if err != nil {
- return errorConnection{err}
- }
- return &pooledConnection{p: p, c: c}
-}
-
-// ActiveCount returns the number of active connections in the pool.
-func (p *Pool) ActiveCount() int {
- p.mu.Lock()
- active := p.active
- p.mu.Unlock()
- return active
-}
-
-// Close releases the resources used by the pool.
-func (p *Pool) Close() error {
- p.mu.Lock()
- idle := p.idle
- p.idle.Init()
- p.closed = true
- p.active -= idle.Len()
- if p.cond != nil {
- p.cond.Broadcast()
- }
- p.mu.Unlock()
- for e := idle.Front(); e != nil; e = e.Next() {
- e.Value.(idleConn).c.Close()
- }
- return nil
-}
-
-// release decrements the active count and signals waiters. The caller must
-// hold p.mu during the call.
-func (p *Pool) release() {
- p.active -= 1
- if p.cond != nil {
- p.cond.Signal()
- }
-}
-
-// get prunes stale connections and returns a connection from the idle list or
-// creates a new connection.
-func (p *Pool) get() (Conn, error) {
- p.mu.Lock()
-
- // Prune stale connections.
-
- if timeout := p.IdleTimeout; timeout > 0 {
- for i, n := 0, p.idle.Len(); i < n; i++ {
- e := p.idle.Back()
- if e == nil {
- break
- }
- ic := e.Value.(idleConn)
- if ic.t.Add(timeout).After(nowFunc()) {
- break
- }
- p.idle.Remove(e)
- p.release()
- p.mu.Unlock()
- ic.c.Close()
- p.mu.Lock()
- }
- }
-
- for {
-
- // Get idle connection.
-
- for i, n := 0, p.idle.Len(); i < n; i++ {
- e := p.idle.Front()
- if e == nil {
- break
- }
- ic := e.Value.(idleConn)
- p.idle.Remove(e)
- test := p.TestOnBorrow
- p.mu.Unlock()
- if test == nil || test(ic.c, ic.t) == nil {
- return ic.c, nil
- }
- ic.c.Close()
- p.mu.Lock()
- p.release()
- }
-
- // Check for pool closed before dialing a new connection.
-
- if p.closed {
- p.mu.Unlock()
- return nil, errors.New("redigo: get on closed pool")
- }
-
- // Dial new connection if under limit.
-
- if p.MaxActive == 0 || p.active < p.MaxActive {
- dial := p.Dial
- p.active += 1
- p.mu.Unlock()
- c, err := dial()
- if err != nil {
- p.mu.Lock()
- p.release()
- p.mu.Unlock()
- c = nil
- }
- return c, err
- }
-
- if !p.Wait {
- p.mu.Unlock()
- return nil, ErrPoolExhausted
- }
-
- if p.cond == nil {
- p.cond = sync.NewCond(&p.mu)
- }
- p.cond.Wait()
- }
-}
-
-func (p *Pool) put(c Conn, forceClose bool) error {
- err := c.Err()
- p.mu.Lock()
- if !p.closed && err == nil && !forceClose {
- p.idle.PushFront(idleConn{t: nowFunc(), c: c})
- if p.idle.Len() > p.MaxIdle {
- c = p.idle.Remove(p.idle.Back()).(idleConn).c
- } else {
- c = nil
- }
- }
-
- if c == nil {
- if p.cond != nil {
- p.cond.Signal()
- }
- p.mu.Unlock()
- return nil
- }
-
- p.release()
- p.mu.Unlock()
- return c.Close()
-}
-
-type pooledConnection struct {
- p *Pool
- c Conn
- state int
-}
-
-var (
- sentinel []byte
- sentinelOnce sync.Once
-)
-
-func initSentinel() {
- p := make([]byte, 64)
- if _, err := rand.Read(p); err == nil {
- sentinel = p
- } else {
- h := sha1.New()
- io.WriteString(h, "Oops, rand failed. Use time instead.")
- io.WriteString(h, strconv.FormatInt(time.Now().UnixNano(), 10))
- sentinel = h.Sum(nil)
- }
-}
-
-func (pc *pooledConnection) Close() error {
- c := pc.c
- if _, ok := c.(errorConnection); ok {
- return nil
- }
- pc.c = errorConnection{errConnClosed}
-
- if pc.state&internal.MultiState != 0 {
- c.Send("DISCARD")
- pc.state &^= (internal.MultiState | internal.WatchState)
- } else if pc.state&internal.WatchState != 0 {
- c.Send("UNWATCH")
- pc.state &^= internal.WatchState
- }
- if pc.state&internal.SubscribeState != 0 {
- c.Send("UNSUBSCRIBE")
- c.Send("PUNSUBSCRIBE")
- // To detect the end of the message stream, ask the server to echo
- // a sentinel value and read until we see that value.
- sentinelOnce.Do(initSentinel)
- c.Send("ECHO", sentinel)
- c.Flush()
- for {
- p, err := c.Receive()
- if err != nil {
- break
- }
- if p, ok := p.([]byte); ok && bytes.Equal(p, sentinel) {
- pc.state &^= internal.SubscribeState
- break
- }
- }
- }
- c.Do("")
- pc.p.put(c, pc.state != 0)
- return nil
-}
-
-func (pc *pooledConnection) Err() error {
- return pc.c.Err()
-}
-
-func (pc *pooledConnection) Do(commandName string, args ...interface{}) (reply interface{}, err error) {
- ci := internal.LookupCommandInfo(commandName)
- pc.state = (pc.state | ci.Set) &^ ci.Clear
- return pc.c.Do(commandName, args...)
-}
-
-func (pc *pooledConnection) Send(commandName string, args ...interface{}) error {
- ci := internal.LookupCommandInfo(commandName)
- pc.state = (pc.state | ci.Set) &^ ci.Clear
- return pc.c.Send(commandName, args...)
-}
-
-func (pc *pooledConnection) Flush() error {
- return pc.c.Flush()
-}
-
-func (pc *pooledConnection) Receive() (reply interface{}, err error) {
- return pc.c.Receive()
-}
-
-type errorConnection struct{ err error }
-
-func (ec errorConnection) Do(string, ...interface{}) (interface{}, error) { return nil, ec.err }
-func (ec errorConnection) Send(string, ...interface{}) error { return ec.err }
-func (ec errorConnection) Err() error { return ec.err }
-func (ec errorConnection) Close() error { return ec.err }
-func (ec errorConnection) Flush() error { return ec.err }
-func (ec errorConnection) Receive() (interface{}, error) { return nil, ec.err }
diff --git a/vendor/github.com/garyburd/redigo/redis/pre_go17.go b/vendor/github.com/garyburd/redigo/redis/pre_go17.go
deleted file mode 100644
index 0212f60..0000000
--- a/vendor/github.com/garyburd/redigo/redis/pre_go17.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// +build !go1.7
-
-package redis
-
-import "crypto/tls"
-
-// similar cloneTLSClientConfig in the stdlib, but also honor skipVerify for the nil case
-func cloneTLSClientConfig(cfg *tls.Config, skipVerify bool) *tls.Config {
- if cfg == nil {
- return &tls.Config{InsecureSkipVerify: skipVerify}
- }
- return &tls.Config{
- Rand: cfg.Rand,
- Time: cfg.Time,
- Certificates: cfg.Certificates,
- NameToCertificate: cfg.NameToCertificate,
- GetCertificate: cfg.GetCertificate,
- RootCAs: cfg.RootCAs,
- NextProtos: cfg.NextProtos,
- ServerName: cfg.ServerName,
- ClientAuth: cfg.ClientAuth,
- ClientCAs: cfg.ClientCAs,
- InsecureSkipVerify: cfg.InsecureSkipVerify,
- CipherSuites: cfg.CipherSuites,
- PreferServerCipherSuites: cfg.PreferServerCipherSuites,
- ClientSessionCache: cfg.ClientSessionCache,
- MinVersion: cfg.MinVersion,
- MaxVersion: cfg.MaxVersion,
- CurvePreferences: cfg.CurvePreferences,
- }
-}
diff --git a/vendor/github.com/garyburd/redigo/redis/pubsub.go b/vendor/github.com/garyburd/redigo/redis/pubsub.go
deleted file mode 100644
index c0ecce8..0000000
--- a/vendor/github.com/garyburd/redigo/redis/pubsub.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package redis
-
-import "errors"
-
-// Subscription represents a subscribe or unsubscribe notification.
-type Subscription struct {
-
- // Kind is "subscribe", "unsubscribe", "psubscribe" or "punsubscribe"
- Kind string
-
- // The channel that was changed.
- Channel string
-
- // The current number of subscriptions for connection.
- Count int
-}
-
-// Message represents a message notification.
-type Message struct {
-
- // The originating channel.
- Channel string
-
- // The message data.
- Data []byte
-}
-
-// PMessage represents a pmessage notification.
-type PMessage struct {
-
- // The matched pattern.
- Pattern string
-
- // The originating channel.
- Channel string
-
- // The message data.
- Data []byte
-}
-
-// Pong represents a pubsub pong notification.
-type Pong struct {
- Data string
-}
-
-// PubSubConn wraps a Conn with convenience methods for subscribers.
-type PubSubConn struct {
- Conn Conn
-}
-
-// Close closes the connection.
-func (c PubSubConn) Close() error {
- return c.Conn.Close()
-}
-
-// Subscribe subscribes the connection to the specified channels.
-func (c PubSubConn) Subscribe(channel ...interface{}) error {
- c.Conn.Send("SUBSCRIBE", channel...)
- return c.Conn.Flush()
-}
-
-// PSubscribe subscribes the connection to the given patterns.
-func (c PubSubConn) PSubscribe(channel ...interface{}) error {
- c.Conn.Send("PSUBSCRIBE", channel...)
- return c.Conn.Flush()
-}
-
-// Unsubscribe unsubscribes the connection from the given channels, or from all
-// of them if none is given.
-func (c PubSubConn) Unsubscribe(channel ...interface{}) error {
- c.Conn.Send("UNSUBSCRIBE", channel...)
- return c.Conn.Flush()
-}
-
-// PUnsubscribe unsubscribes the connection from the given patterns, or from all
-// of them if none is given.
-func (c PubSubConn) PUnsubscribe(channel ...interface{}) error {
- c.Conn.Send("PUNSUBSCRIBE", channel...)
- return c.Conn.Flush()
-}
-
-// Ping sends a PING to the server with the specified data.
-func (c PubSubConn) Ping(data string) error {
- c.Conn.Send("PING", data)
- return c.Conn.Flush()
-}
-
-// Receive returns a pushed message as a Subscription, Message, PMessage, Pong
-// or error. The return value is intended to be used directly in a type switch
-// as illustrated in the PubSubConn example.
-func (c PubSubConn) Receive() interface{} {
- reply, err := Values(c.Conn.Receive())
- if err != nil {
- return err
- }
-
- var kind string
- reply, err = Scan(reply, &kind)
- if err != nil {
- return err
- }
-
- switch kind {
- case "message":
- var m Message
- if _, err := Scan(reply, &m.Channel, &m.Data); err != nil {
- return err
- }
- return m
- case "pmessage":
- var pm PMessage
- if _, err := Scan(reply, &pm.Pattern, &pm.Channel, &pm.Data); err != nil {
- return err
- }
- return pm
- case "subscribe", "psubscribe", "unsubscribe", "punsubscribe":
- s := Subscription{Kind: kind}
- if _, err := Scan(reply, &s.Channel, &s.Count); err != nil {
- return err
- }
- return s
- case "pong":
- var p Pong
- if _, err := Scan(reply, &p.Data); err != nil {
- return err
- }
- return p
- }
- return errors.New("redigo: unknown pubsub notification")
-}
diff --git a/vendor/github.com/garyburd/redigo/redis/redis.go b/vendor/github.com/garyburd/redigo/redis/redis.go
deleted file mode 100644
index b729829..0000000
--- a/vendor/github.com/garyburd/redigo/redis/redis.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package redis
-
-// Error represents an error returned in a command reply.
-type Error string
-
-func (err Error) Error() string { return string(err) }
-
-// Conn represents a connection to a Redis server.
-type Conn interface {
- // Close closes the connection.
- Close() error
-
- // Err returns a non-nil value when the connection is not usable.
- Err() error
-
- // Do sends a command to the server and returns the received reply.
- Do(commandName string, args ...interface{}) (reply interface{}, err error)
-
- // Send writes the command to the client's output buffer.
- Send(commandName string, args ...interface{}) error
-
- // Flush flushes the output buffer to the Redis server.
- Flush() error
-
- // Receive receives a single reply from the Redis server
- Receive() (reply interface{}, err error)
-}
diff --git a/vendor/github.com/garyburd/redigo/redis/reply.go b/vendor/github.com/garyburd/redigo/redis/reply.go
deleted file mode 100644
index 5789614..0000000
--- a/vendor/github.com/garyburd/redigo/redis/reply.go
+++ /dev/null
@@ -1,393 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package redis
-
-import (
- "errors"
- "fmt"
- "strconv"
-)
-
-// ErrNil indicates that a reply value is nil.
-var ErrNil = errors.New("redigo: nil returned")
-
-// Int is a helper that converts a command reply to an integer. If err is not
-// equal to nil, then Int returns 0, err. Otherwise, Int converts the
-// reply to an int as follows:
-//
-// Reply type Result
-// integer int(reply), nil
-// bulk string parsed reply, nil
-// nil 0, ErrNil
-// other 0, error
-func Int(reply interface{}, err error) (int, error) {
- if err != nil {
- return 0, err
- }
- switch reply := reply.(type) {
- case int64:
- x := int(reply)
- if int64(x) != reply {
- return 0, strconv.ErrRange
- }
- return x, nil
- case []byte:
- n, err := strconv.ParseInt(string(reply), 10, 0)
- return int(n), err
- case nil:
- return 0, ErrNil
- case Error:
- return 0, reply
- }
- return 0, fmt.Errorf("redigo: unexpected type for Int, got type %T", reply)
-}
-
-// Int64 is a helper that converts a command reply to 64 bit integer. If err is
-// not equal to nil, then Int returns 0, err. Otherwise, Int64 converts the
-// reply to an int64 as follows:
-//
-// Reply type Result
-// integer reply, nil
-// bulk string parsed reply, nil
-// nil 0, ErrNil
-// other 0, error
-func Int64(reply interface{}, err error) (int64, error) {
- if err != nil {
- return 0, err
- }
- switch reply := reply.(type) {
- case int64:
- return reply, nil
- case []byte:
- n, err := strconv.ParseInt(string(reply), 10, 64)
- return n, err
- case nil:
- return 0, ErrNil
- case Error:
- return 0, reply
- }
- return 0, fmt.Errorf("redigo: unexpected type for Int64, got type %T", reply)
-}
-
-var errNegativeInt = errors.New("redigo: unexpected value for Uint64")
-
-// Uint64 is a helper that converts a command reply to 64 bit integer. If err is
-// not equal to nil, then Int returns 0, err. Otherwise, Int64 converts the
-// reply to an int64 as follows:
-//
-// Reply type Result
-// integer reply, nil
-// bulk string parsed reply, nil
-// nil 0, ErrNil
-// other 0, error
-func Uint64(reply interface{}, err error) (uint64, error) {
- if err != nil {
- return 0, err
- }
- switch reply := reply.(type) {
- case int64:
- if reply < 0 {
- return 0, errNegativeInt
- }
- return uint64(reply), nil
- case []byte:
- n, err := strconv.ParseUint(string(reply), 10, 64)
- return n, err
- case nil:
- return 0, ErrNil
- case Error:
- return 0, reply
- }
- return 0, fmt.Errorf("redigo: unexpected type for Uint64, got type %T", reply)
-}
-
-// Float64 is a helper that converts a command reply to 64 bit float. If err is
-// not equal to nil, then Float64 returns 0, err. Otherwise, Float64 converts
-// the reply to an int as follows:
-//
-// Reply type Result
-// bulk string parsed reply, nil
-// nil 0, ErrNil
-// other 0, error
-func Float64(reply interface{}, err error) (float64, error) {
- if err != nil {
- return 0, err
- }
- switch reply := reply.(type) {
- case []byte:
- n, err := strconv.ParseFloat(string(reply), 64)
- return n, err
- case nil:
- return 0, ErrNil
- case Error:
- return 0, reply
- }
- return 0, fmt.Errorf("redigo: unexpected type for Float64, got type %T", reply)
-}
-
-// String is a helper that converts a command reply to a string. If err is not
-// equal to nil, then String returns "", err. Otherwise String converts the
-// reply to a string as follows:
-//
-// Reply type Result
-// bulk string string(reply), nil
-// simple string reply, nil
-// nil "", ErrNil
-// other "", error
-func String(reply interface{}, err error) (string, error) {
- if err != nil {
- return "", err
- }
- switch reply := reply.(type) {
- case []byte:
- return string(reply), nil
- case string:
- return reply, nil
- case nil:
- return "", ErrNil
- case Error:
- return "", reply
- }
- return "", fmt.Errorf("redigo: unexpected type for String, got type %T", reply)
-}
-
-// Bytes is a helper that converts a command reply to a slice of bytes. If err
-// is not equal to nil, then Bytes returns nil, err. Otherwise Bytes converts
-// the reply to a slice of bytes as follows:
-//
-// Reply type Result
-// bulk string reply, nil
-// simple string []byte(reply), nil
-// nil nil, ErrNil
-// other nil, error
-func Bytes(reply interface{}, err error) ([]byte, error) {
- if err != nil {
- return nil, err
- }
- switch reply := reply.(type) {
- case []byte:
- return reply, nil
- case string:
- return []byte(reply), nil
- case nil:
- return nil, ErrNil
- case Error:
- return nil, reply
- }
- return nil, fmt.Errorf("redigo: unexpected type for Bytes, got type %T", reply)
-}
-
-// Bool is a helper that converts a command reply to a boolean. If err is not
-// equal to nil, then Bool returns false, err. Otherwise Bool converts the
-// reply to boolean as follows:
-//
-// Reply type Result
-// integer value != 0, nil
-// bulk string strconv.ParseBool(reply)
-// nil false, ErrNil
-// other false, error
-func Bool(reply interface{}, err error) (bool, error) {
- if err != nil {
- return false, err
- }
- switch reply := reply.(type) {
- case int64:
- return reply != 0, nil
- case []byte:
- return strconv.ParseBool(string(reply))
- case nil:
- return false, ErrNil
- case Error:
- return false, reply
- }
- return false, fmt.Errorf("redigo: unexpected type for Bool, got type %T", reply)
-}
-
-// MultiBulk is a helper that converts an array command reply to a []interface{}.
-//
-// Deprecated: Use Values instead.
-func MultiBulk(reply interface{}, err error) ([]interface{}, error) { return Values(reply, err) }
-
-// Values is a helper that converts an array command reply to a []interface{}.
-// If err is not equal to nil, then Values returns nil, err. Otherwise, Values
-// converts the reply as follows:
-//
-// Reply type Result
-// array reply, nil
-// nil nil, ErrNil
-// other nil, error
-func Values(reply interface{}, err error) ([]interface{}, error) {
- if err != nil {
- return nil, err
- }
- switch reply := reply.(type) {
- case []interface{}:
- return reply, nil
- case nil:
- return nil, ErrNil
- case Error:
- return nil, reply
- }
- return nil, fmt.Errorf("redigo: unexpected type for Values, got type %T", reply)
-}
-
-// Strings is a helper that converts an array command reply to a []string. If
-// err is not equal to nil, then Strings returns nil, err. Nil array items are
-// converted to "" in the output slice. Strings returns an error if an array
-// item is not a bulk string or nil.
-func Strings(reply interface{}, err error) ([]string, error) {
- if err != nil {
- return nil, err
- }
- switch reply := reply.(type) {
- case []interface{}:
- result := make([]string, len(reply))
- for i := range reply {
- if reply[i] == nil {
- continue
- }
- p, ok := reply[i].([]byte)
- if !ok {
- return nil, fmt.Errorf("redigo: unexpected element type for Strings, got type %T", reply[i])
- }
- result[i] = string(p)
- }
- return result, nil
- case nil:
- return nil, ErrNil
- case Error:
- return nil, reply
- }
- return nil, fmt.Errorf("redigo: unexpected type for Strings, got type %T", reply)
-}
-
-// ByteSlices is a helper that converts an array command reply to a [][]byte.
-// If err is not equal to nil, then ByteSlices returns nil, err. Nil array
-// items are stay nil. ByteSlices returns an error if an array item is not a
-// bulk string or nil.
-func ByteSlices(reply interface{}, err error) ([][]byte, error) {
- if err != nil {
- return nil, err
- }
- switch reply := reply.(type) {
- case []interface{}:
- result := make([][]byte, len(reply))
- for i := range reply {
- if reply[i] == nil {
- continue
- }
- p, ok := reply[i].([]byte)
- if !ok {
- return nil, fmt.Errorf("redigo: unexpected element type for ByteSlices, got type %T", reply[i])
- }
- result[i] = p
- }
- return result, nil
- case nil:
- return nil, ErrNil
- case Error:
- return nil, reply
- }
- return nil, fmt.Errorf("redigo: unexpected type for ByteSlices, got type %T", reply)
-}
-
-// Ints is a helper that converts an array command reply to a []int. If
-// err is not equal to nil, then Ints returns nil, err.
-func Ints(reply interface{}, err error) ([]int, error) {
- var ints []int
- values, err := Values(reply, err)
- if err != nil {
- return ints, err
- }
- if err := ScanSlice(values, &ints); err != nil {
- return ints, err
- }
- return ints, nil
-}
-
-// StringMap is a helper that converts an array of strings (alternating key, value)
-// into a map[string]string. The HGETALL and CONFIG GET commands return replies in this format.
-// Requires an even number of values in result.
-func StringMap(result interface{}, err error) (map[string]string, error) {
- values, err := Values(result, err)
- if err != nil {
- return nil, err
- }
- if len(values)%2 != 0 {
- return nil, errors.New("redigo: StringMap expects even number of values result")
- }
- m := make(map[string]string, len(values)/2)
- for i := 0; i < len(values); i += 2 {
- key, okKey := values[i].([]byte)
- value, okValue := values[i+1].([]byte)
- if !okKey || !okValue {
- return nil, errors.New("redigo: ScanMap key not a bulk string value")
- }
- m[string(key)] = string(value)
- }
- return m, nil
-}
-
-// IntMap is a helper that converts an array of strings (alternating key, value)
-// into a map[string]int. The HGETALL commands return replies in this format.
-// Requires an even number of values in result.
-func IntMap(result interface{}, err error) (map[string]int, error) {
- values, err := Values(result, err)
- if err != nil {
- return nil, err
- }
- if len(values)%2 != 0 {
- return nil, errors.New("redigo: IntMap expects even number of values result")
- }
- m := make(map[string]int, len(values)/2)
- for i := 0; i < len(values); i += 2 {
- key, ok := values[i].([]byte)
- if !ok {
- return nil, errors.New("redigo: ScanMap key not a bulk string value")
- }
- value, err := Int(values[i+1], nil)
- if err != nil {
- return nil, err
- }
- m[string(key)] = value
- }
- return m, nil
-}
-
-// Int64Map is a helper that converts an array of strings (alternating key, value)
-// into a map[string]int64. The HGETALL commands return replies in this format.
-// Requires an even number of values in result.
-func Int64Map(result interface{}, err error) (map[string]int64, error) {
- values, err := Values(result, err)
- if err != nil {
- return nil, err
- }
- if len(values)%2 != 0 {
- return nil, errors.New("redigo: Int64Map expects even number of values result")
- }
- m := make(map[string]int64, len(values)/2)
- for i := 0; i < len(values); i += 2 {
- key, ok := values[i].([]byte)
- if !ok {
- return nil, errors.New("redigo: ScanMap key not a bulk string value")
- }
- value, err := Int64(values[i+1], nil)
- if err != nil {
- return nil, err
- }
- m[string(key)] = value
- }
- return m, nil
-}
diff --git a/vendor/github.com/garyburd/redigo/redis/scan.go b/vendor/github.com/garyburd/redigo/redis/scan.go
deleted file mode 100644
index 962e94b..0000000
--- a/vendor/github.com/garyburd/redigo/redis/scan.go
+++ /dev/null
@@ -1,555 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package redis
-
-import (
- "errors"
- "fmt"
- "reflect"
- "strconv"
- "strings"
- "sync"
-)
-
-func ensureLen(d reflect.Value, n int) {
- if n > d.Cap() {
- d.Set(reflect.MakeSlice(d.Type(), n, n))
- } else {
- d.SetLen(n)
- }
-}
-
-func cannotConvert(d reflect.Value, s interface{}) error {
- var sname string
- switch s.(type) {
- case string:
- sname = "Redis simple string"
- case Error:
- sname = "Redis error"
- case int64:
- sname = "Redis integer"
- case []byte:
- sname = "Redis bulk string"
- case []interface{}:
- sname = "Redis array"
- default:
- sname = reflect.TypeOf(s).String()
- }
- return fmt.Errorf("cannot convert from %s to %s", sname, d.Type())
-}
-
-func convertAssignBulkString(d reflect.Value, s []byte) (err error) {
- switch d.Type().Kind() {
- case reflect.Float32, reflect.Float64:
- var x float64
- x, err = strconv.ParseFloat(string(s), d.Type().Bits())
- d.SetFloat(x)
- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
- var x int64
- x, err = strconv.ParseInt(string(s), 10, d.Type().Bits())
- d.SetInt(x)
- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
- var x uint64
- x, err = strconv.ParseUint(string(s), 10, d.Type().Bits())
- d.SetUint(x)
- case reflect.Bool:
- var x bool
- x, err = strconv.ParseBool(string(s))
- d.SetBool(x)
- case reflect.String:
- d.SetString(string(s))
- case reflect.Slice:
- if d.Type().Elem().Kind() != reflect.Uint8 {
- err = cannotConvert(d, s)
- } else {
- d.SetBytes(s)
- }
- default:
- err = cannotConvert(d, s)
- }
- return
-}
-
-func convertAssignInt(d reflect.Value, s int64) (err error) {
- switch d.Type().Kind() {
- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
- d.SetInt(s)
- if d.Int() != s {
- err = strconv.ErrRange
- d.SetInt(0)
- }
- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
- if s < 0 {
- err = strconv.ErrRange
- } else {
- x := uint64(s)
- d.SetUint(x)
- if d.Uint() != x {
- err = strconv.ErrRange
- d.SetUint(0)
- }
- }
- case reflect.Bool:
- d.SetBool(s != 0)
- default:
- err = cannotConvert(d, s)
- }
- return
-}
-
-func convertAssignValue(d reflect.Value, s interface{}) (err error) {
- switch s := s.(type) {
- case []byte:
- err = convertAssignBulkString(d, s)
- case int64:
- err = convertAssignInt(d, s)
- default:
- err = cannotConvert(d, s)
- }
- return err
-}
-
-func convertAssignArray(d reflect.Value, s []interface{}) error {
- if d.Type().Kind() != reflect.Slice {
- return cannotConvert(d, s)
- }
- ensureLen(d, len(s))
- for i := 0; i < len(s); i++ {
- if err := convertAssignValue(d.Index(i), s[i]); err != nil {
- return err
- }
- }
- return nil
-}
-
-func convertAssign(d interface{}, s interface{}) (err error) {
- // Handle the most common destination types using type switches and
- // fall back to reflection for all other types.
- switch s := s.(type) {
- case nil:
- // ingore
- case []byte:
- switch d := d.(type) {
- case *string:
- *d = string(s)
- case *int:
- *d, err = strconv.Atoi(string(s))
- case *bool:
- *d, err = strconv.ParseBool(string(s))
- case *[]byte:
- *d = s
- case *interface{}:
- *d = s
- case nil:
- // skip value
- default:
- if d := reflect.ValueOf(d); d.Type().Kind() != reflect.Ptr {
- err = cannotConvert(d, s)
- } else {
- err = convertAssignBulkString(d.Elem(), s)
- }
- }
- case int64:
- switch d := d.(type) {
- case *int:
- x := int(s)
- if int64(x) != s {
- err = strconv.ErrRange
- x = 0
- }
- *d = x
- case *bool:
- *d = s != 0
- case *interface{}:
- *d = s
- case nil:
- // skip value
- default:
- if d := reflect.ValueOf(d); d.Type().Kind() != reflect.Ptr {
- err = cannotConvert(d, s)
- } else {
- err = convertAssignInt(d.Elem(), s)
- }
- }
- case string:
- switch d := d.(type) {
- case *string:
- *d = string(s)
- default:
- err = cannotConvert(reflect.ValueOf(d), s)
- }
- case []interface{}:
- switch d := d.(type) {
- case *[]interface{}:
- *d = s
- case *interface{}:
- *d = s
- case nil:
- // skip value
- default:
- if d := reflect.ValueOf(d); d.Type().Kind() != reflect.Ptr {
- err = cannotConvert(d, s)
- } else {
- err = convertAssignArray(d.Elem(), s)
- }
- }
- case Error:
- err = s
- default:
- err = cannotConvert(reflect.ValueOf(d), s)
- }
- return
-}
-
-// Scan copies from src to the values pointed at by dest.
-//
-// The values pointed at by dest must be an integer, float, boolean, string,
-// []byte, interface{} or slices of these types. Scan uses the standard strconv
-// package to convert bulk strings to numeric and boolean types.
-//
-// If a dest value is nil, then the corresponding src value is skipped.
-//
-// If a src element is nil, then the corresponding dest value is not modified.
-//
-// To enable easy use of Scan in a loop, Scan returns the slice of src
-// following the copied values.
-func Scan(src []interface{}, dest ...interface{}) ([]interface{}, error) {
- if len(src) < len(dest) {
- return nil, errors.New("redigo.Scan: array short")
- }
- var err error
- for i, d := range dest {
- err = convertAssign(d, src[i])
- if err != nil {
- err = fmt.Errorf("redigo.Scan: cannot assign to dest %d: %v", i, err)
- break
- }
- }
- return src[len(dest):], err
-}
-
-type fieldSpec struct {
- name string
- index []int
- omitEmpty bool
-}
-
-type structSpec struct {
- m map[string]*fieldSpec
- l []*fieldSpec
-}
-
-func (ss *structSpec) fieldSpec(name []byte) *fieldSpec {
- return ss.m[string(name)]
-}
-
-func compileStructSpec(t reflect.Type, depth map[string]int, index []int, ss *structSpec) {
- for i := 0; i < t.NumField(); i++ {
- f := t.Field(i)
- switch {
- case f.PkgPath != "" && !f.Anonymous:
- // Ignore unexported fields.
- case f.Anonymous:
- // TODO: Handle pointers. Requires change to decoder and
- // protection against infinite recursion.
- if f.Type.Kind() == reflect.Struct {
- compileStructSpec(f.Type, depth, append(index, i), ss)
- }
- default:
- fs := &fieldSpec{name: f.Name}
- tag := f.Tag.Get("redis")
- p := strings.Split(tag, ",")
- if len(p) > 0 {
- if p[0] == "-" {
- continue
- }
- if len(p[0]) > 0 {
- fs.name = p[0]
- }
- for _, s := range p[1:] {
- switch s {
- case "omitempty":
- fs.omitEmpty = true
- default:
- panic(fmt.Errorf("redigo: unknown field tag %s for type %s", s, t.Name()))
- }
- }
- }
- d, found := depth[fs.name]
- if !found {
- d = 1 << 30
- }
- switch {
- case len(index) == d:
- // At same depth, remove from result.
- delete(ss.m, fs.name)
- j := 0
- for i := 0; i < len(ss.l); i++ {
- if fs.name != ss.l[i].name {
- ss.l[j] = ss.l[i]
- j += 1
- }
- }
- ss.l = ss.l[:j]
- case len(index) < d:
- fs.index = make([]int, len(index)+1)
- copy(fs.index, index)
- fs.index[len(index)] = i
- depth[fs.name] = len(index)
- ss.m[fs.name] = fs
- ss.l = append(ss.l, fs)
- }
- }
- }
-}
-
-var (
- structSpecMutex sync.RWMutex
- structSpecCache = make(map[reflect.Type]*structSpec)
- defaultFieldSpec = &fieldSpec{}
-)
-
-func structSpecForType(t reflect.Type) *structSpec {
-
- structSpecMutex.RLock()
- ss, found := structSpecCache[t]
- structSpecMutex.RUnlock()
- if found {
- return ss
- }
-
- structSpecMutex.Lock()
- defer structSpecMutex.Unlock()
- ss, found = structSpecCache[t]
- if found {
- return ss
- }
-
- ss = &structSpec{m: make(map[string]*fieldSpec)}
- compileStructSpec(t, make(map[string]int), nil, ss)
- structSpecCache[t] = ss
- return ss
-}
-
-var errScanStructValue = errors.New("redigo.ScanStruct: value must be non-nil pointer to a struct")
-
-// ScanStruct scans alternating names and values from src to a struct. The
-// HGETALL and CONFIG GET commands return replies in this format.
-//
-// ScanStruct uses exported field names to match values in the response. Use
-// 'redis' field tag to override the name:
-//
-// Field int `redis:"myName"`
-//
-// Fields with the tag redis:"-" are ignored.
-//
-// Integer, float, boolean, string and []byte fields are supported. Scan uses the
-// standard strconv package to convert bulk string values to numeric and
-// boolean types.
-//
-// If a src element is nil, then the corresponding field is not modified.
-func ScanStruct(src []interface{}, dest interface{}) error {
- d := reflect.ValueOf(dest)
- if d.Kind() != reflect.Ptr || d.IsNil() {
- return errScanStructValue
- }
- d = d.Elem()
- if d.Kind() != reflect.Struct {
- return errScanStructValue
- }
- ss := structSpecForType(d.Type())
-
- if len(src)%2 != 0 {
- return errors.New("redigo.ScanStruct: number of values not a multiple of 2")
- }
-
- for i := 0; i < len(src); i += 2 {
- s := src[i+1]
- if s == nil {
- continue
- }
- name, ok := src[i].([]byte)
- if !ok {
- return fmt.Errorf("redigo.ScanStruct: key %d not a bulk string value", i)
- }
- fs := ss.fieldSpec(name)
- if fs == nil {
- continue
- }
- if err := convertAssignValue(d.FieldByIndex(fs.index), s); err != nil {
- return fmt.Errorf("redigo.ScanStruct: cannot assign field %s: %v", fs.name, err)
- }
- }
- return nil
-}
-
-var (
- errScanSliceValue = errors.New("redigo.ScanSlice: dest must be non-nil pointer to a struct")
-)
-
-// ScanSlice scans src to the slice pointed to by dest. The elements the dest
-// slice must be integer, float, boolean, string, struct or pointer to struct
-// values.
-//
-// Struct fields must be integer, float, boolean or string values. All struct
-// fields are used unless a subset is specified using fieldNames.
-func ScanSlice(src []interface{}, dest interface{}, fieldNames ...string) error {
- d := reflect.ValueOf(dest)
- if d.Kind() != reflect.Ptr || d.IsNil() {
- return errScanSliceValue
- }
- d = d.Elem()
- if d.Kind() != reflect.Slice {
- return errScanSliceValue
- }
-
- isPtr := false
- t := d.Type().Elem()
- if t.Kind() == reflect.Ptr && t.Elem().Kind() == reflect.Struct {
- isPtr = true
- t = t.Elem()
- }
-
- if t.Kind() != reflect.Struct {
- ensureLen(d, len(src))
- for i, s := range src {
- if s == nil {
- continue
- }
- if err := convertAssignValue(d.Index(i), s); err != nil {
- return fmt.Errorf("redigo.ScanSlice: cannot assign element %d: %v", i, err)
- }
- }
- return nil
- }
-
- ss := structSpecForType(t)
- fss := ss.l
- if len(fieldNames) > 0 {
- fss = make([]*fieldSpec, len(fieldNames))
- for i, name := range fieldNames {
- fss[i] = ss.m[name]
- if fss[i] == nil {
- return fmt.Errorf("redigo.ScanSlice: ScanSlice bad field name %s", name)
- }
- }
- }
-
- if len(fss) == 0 {
- return errors.New("redigo.ScanSlice: no struct fields")
- }
-
- n := len(src) / len(fss)
- if n*len(fss) != len(src) {
- return errors.New("redigo.ScanSlice: length not a multiple of struct field count")
- }
-
- ensureLen(d, n)
- for i := 0; i < n; i++ {
- d := d.Index(i)
- if isPtr {
- if d.IsNil() {
- d.Set(reflect.New(t))
- }
- d = d.Elem()
- }
- for j, fs := range fss {
- s := src[i*len(fss)+j]
- if s == nil {
- continue
- }
- if err := convertAssignValue(d.FieldByIndex(fs.index), s); err != nil {
- return fmt.Errorf("redigo.ScanSlice: cannot assign element %d to field %s: %v", i*len(fss)+j, fs.name, err)
- }
- }
- }
- return nil
-}
-
-// Args is a helper for constructing command arguments from structured values.
-type Args []interface{}
-
-// Add returns the result of appending value to args.
-func (args Args) Add(value ...interface{}) Args {
- return append(args, value...)
-}
-
-// AddFlat returns the result of appending the flattened value of v to args.
-//
-// Maps are flattened by appending the alternating keys and map values to args.
-//
-// Slices are flattened by appending the slice elements to args.
-//
-// Structs are flattened by appending the alternating names and values of
-// exported fields to args. If v is a nil struct pointer, then nothing is
-// appended. The 'redis' field tag overrides struct field names. See ScanStruct
-// for more information on the use of the 'redis' field tag.
-//
-// Other types are appended to args as is.
-func (args Args) AddFlat(v interface{}) Args {
- rv := reflect.ValueOf(v)
- switch rv.Kind() {
- case reflect.Struct:
- args = flattenStruct(args, rv)
- case reflect.Slice:
- for i := 0; i < rv.Len(); i++ {
- args = append(args, rv.Index(i).Interface())
- }
- case reflect.Map:
- for _, k := range rv.MapKeys() {
- args = append(args, k.Interface(), rv.MapIndex(k).Interface())
- }
- case reflect.Ptr:
- if rv.Type().Elem().Kind() == reflect.Struct {
- if !rv.IsNil() {
- args = flattenStruct(args, rv.Elem())
- }
- } else {
- args = append(args, v)
- }
- default:
- args = append(args, v)
- }
- return args
-}
-
-func flattenStruct(args Args, v reflect.Value) Args {
- ss := structSpecForType(v.Type())
- for _, fs := range ss.l {
- fv := v.FieldByIndex(fs.index)
- if fs.omitEmpty {
- var empty = false
- switch fv.Kind() {
- case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
- empty = fv.Len() == 0
- case reflect.Bool:
- empty = !fv.Bool()
- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
- empty = fv.Int() == 0
- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
- empty = fv.Uint() == 0
- case reflect.Float32, reflect.Float64:
- empty = fv.Float() == 0
- case reflect.Interface, reflect.Ptr:
- empty = fv.IsNil()
- }
- if empty {
- continue
- }
- }
- args = append(args, fs.name, fv.Interface())
- }
- return args
-}
diff --git a/vendor/github.com/garyburd/redigo/redis/script.go b/vendor/github.com/garyburd/redigo/redis/script.go
deleted file mode 100644
index 78605a9..0000000
--- a/vendor/github.com/garyburd/redigo/redis/script.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package redis
-
-import (
- "crypto/sha1"
- "encoding/hex"
- "io"
- "strings"
-)
-
-// Script encapsulates the source, hash and key count for a Lua script. See
-// http://redis.io/commands/eval for information on scripts in Redis.
-type Script struct {
- keyCount int
- src string
- hash string
-}
-
-// NewScript returns a new script object. If keyCount is greater than or equal
-// to zero, then the count is automatically inserted in the EVAL command
-// argument list. If keyCount is less than zero, then the application supplies
-// the count as the first value in the keysAndArgs argument to the Do, Send and
-// SendHash methods.
-func NewScript(keyCount int, src string) *Script {
- h := sha1.New()
- io.WriteString(h, src)
- return &Script{keyCount, src, hex.EncodeToString(h.Sum(nil))}
-}
-
-func (s *Script) args(spec string, keysAndArgs []interface{}) []interface{} {
- var args []interface{}
- if s.keyCount < 0 {
- args = make([]interface{}, 1+len(keysAndArgs))
- args[0] = spec
- copy(args[1:], keysAndArgs)
- } else {
- args = make([]interface{}, 2+len(keysAndArgs))
- args[0] = spec
- args[1] = s.keyCount
- copy(args[2:], keysAndArgs)
- }
- return args
-}
-
-// Do evaluates the script. Under the covers, Do optimistically evaluates the
-// script using the EVALSHA command. If the command fails because the script is
-// not loaded, then Do evaluates the script using the EVAL command (thus
-// causing the script to load).
-func (s *Script) Do(c Conn, keysAndArgs ...interface{}) (interface{}, error) {
- v, err := c.Do("EVALSHA", s.args(s.hash, keysAndArgs)...)
- if e, ok := err.(Error); ok && strings.HasPrefix(string(e), "NOSCRIPT ") {
- v, err = c.Do("EVAL", s.args(s.src, keysAndArgs)...)
- }
- return v, err
-}
-
-// SendHash evaluates the script without waiting for the reply. The script is
-// evaluated with the EVALSHA command. The application must ensure that the
-// script is loaded by a previous call to Send, Do or Load methods.
-func (s *Script) SendHash(c Conn, keysAndArgs ...interface{}) error {
- return c.Send("EVALSHA", s.args(s.hash, keysAndArgs)...)
-}
-
-// Send evaluates the script without waiting for the reply.
-func (s *Script) Send(c Conn, keysAndArgs ...interface{}) error {
- return c.Send("EVAL", s.args(s.src, keysAndArgs)...)
-}
-
-// Load loads the script without evaluating it.
-func (s *Script) Load(c Conn) error {
- _, err := c.Do("SCRIPT", "LOAD", s.src)
- return err
-}
diff --git a/vendor/github.com/gin-gonic/contrib/sessions/README.md b/vendor/github.com/gin-gonic/contrib/sessions/README.md
deleted file mode 100644
index 16966b3..0000000
--- a/vendor/github.com/gin-gonic/contrib/sessions/README.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# sessions
-
-Gin middleware for session management with multi-backend support (currently cookie, Redis).
-
-## EOL-warning
-
-**This package has been abandoned on 2016-12-07. Please use [gin-contrib/sessions](https://github.com/gin-contrib/sessions) instead.**
-
-## Examples
-
-#### cookie-based
-
-```go
-package main
-
-import (
- "github.com/gin-gonic/contrib/sessions"
- "github.com/gin-gonic/gin"
-)
-
-func main() {
- r := gin.Default()
- store := sessions.NewCookieStore([]byte("secret"))
- r.Use(sessions.Sessions("mysession", store))
-
- r.GET("/incr", func(c *gin.Context) {
- session := sessions.Default(c)
- var count int
- v := session.Get("count")
- if v == nil {
- count = 0
- } else {
- count = v.(int)
- count += 1
- }
- session.Set("count", count)
- session.Save()
- c.JSON(200, gin.H{"count": count})
- })
- r.Run(":8000")
-}
-```
-
-#### Redis
-
-```go
-package main
-
-import (
- "github.com/gin-gonic/contrib/sessions"
- "github.com/gin-gonic/gin"
-)
-
-func main() {
- r := gin.Default()
- store, _ := sessions.NewRedisStore(10, "tcp", "localhost:6379", "", []byte("secret"))
- r.Use(sessions.Sessions("session", store))
-
- r.GET("/incr", func(c *gin.Context) {
- session := sessions.Default(c)
- var count int
- v := session.Get("count")
- if v == nil {
- count = 0
- } else {
- count = v.(int)
- count += 1
- }
- session.Set("count", count)
- session.Save()
- c.JSON(200, gin.H{"count": count})
- })
- r.Run(":8000")
-}
-```
diff --git a/vendor/github.com/gin-gonic/contrib/sessions/cookie.go b/vendor/github.com/gin-gonic/contrib/sessions/cookie.go
deleted file mode 100644
index c1f66a9..0000000
--- a/vendor/github.com/gin-gonic/contrib/sessions/cookie.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package sessions
-
-import (
- "github.com/gorilla/sessions"
-)
-
-type CookieStore interface {
- Store
-}
-
-// Keys are defined in pairs to allow key rotation, but the common case is to set a single
-// authentication key and optionally an encryption key.
-//
-// The first key in a pair is used for authentication and the second for encryption. The
-// encryption key can be set to nil or omitted in the last pair, but the authentication key
-// is required in all pairs.
-//
-// It is recommended to use an authentication key with 32 or 64 bytes. The encryption key,
-// if set, must be either 16, 24, or 32 bytes to select AES-128, AES-192, or AES-256 modes.
-func NewCookieStore(keyPairs ...[]byte) CookieStore {
- return &cookieStore{sessions.NewCookieStore(keyPairs...)}
-}
-
-type cookieStore struct {
- *sessions.CookieStore
-}
-
-func (c *cookieStore) Options(options Options) {
- c.CookieStore.Options = &sessions.Options{
- Path: options.Path,
- Domain: options.Domain,
- MaxAge: options.MaxAge,
- Secure: options.Secure,
- HttpOnly: options.HttpOnly,
- }
-}
diff --git a/vendor/github.com/gin-gonic/contrib/sessions/redis.go b/vendor/github.com/gin-gonic/contrib/sessions/redis.go
deleted file mode 100644
index 8110ec8..0000000
--- a/vendor/github.com/gin-gonic/contrib/sessions/redis.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package sessions
-
-import (
- "github.com/boj/redistore"
- "github.com/gorilla/sessions"
-)
-
-type RedisStore interface {
- Store
-}
-
-// size: maximum number of idle connections.
-// network: tcp or udp
-// address: host:port
-// password: redis-password
-// Keys are defined in pairs to allow key rotation, but the common case is to set a single
-// authentication key and optionally an encryption key.
-//
-// The first key in a pair is used for authentication and the second for encryption. The
-// encryption key can be set to nil or omitted in the last pair, but the authentication key
-// is required in all pairs.
-//
-// It is recommended to use an authentication key with 32 or 64 bytes. The encryption key,
-// if set, must be either 16, 24, or 32 bytes to select AES-128, AES-192, or AES-256 modes.
-func NewRedisStore(size int, network, address, password string, keyPairs ...[]byte) (RedisStore, error) {
- store, err := redistore.NewRediStore(size, network, address, password, keyPairs...)
- if err != nil {
- return nil, err
- }
- return &redisStore{store}, nil
-}
-
-type redisStore struct {
- *redistore.RediStore
-}
-
-func (c *redisStore) Options(options Options) {
- c.RediStore.Options = &sessions.Options{
- Path: options.Path,
- Domain: options.Domain,
- MaxAge: options.MaxAge,
- Secure: options.Secure,
- HttpOnly: options.HttpOnly,
- }
-}
diff --git a/vendor/github.com/gin-gonic/contrib/sessions/sessions.go b/vendor/github.com/gin-gonic/contrib/sessions/sessions.go
deleted file mode 100644
index ca26513..0000000
--- a/vendor/github.com/gin-gonic/contrib/sessions/sessions.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package sessions
-
-import (
- "log"
- "net/http"
-
- "github.com/gin-gonic/gin"
- "github.com/gorilla/context"
- "github.com/gorilla/sessions"
-)
-
-const (
- DefaultKey = "github.com/gin-gonic/contrib/sessions"
- errorFormat = "[sessions] ERROR! %s\n"
-)
-
-type Store interface {
- sessions.Store
- Options(Options)
-}
-
-// Options stores configuration for a session or session store.
-// Fields are a subset of http.Cookie fields.
-type Options struct {
- Path string
- Domain string
- // MaxAge=0 means no 'Max-Age' attribute specified.
- // MaxAge<0 means delete cookie now, equivalently 'Max-Age: 0'.
- // MaxAge>0 means Max-Age attribute present and given in seconds.
- MaxAge int
- Secure bool
- HttpOnly bool
-}
-
-// Wraps thinly gorilla-session methods.
-// Session stores the values and optional configuration for a session.
-type Session interface {
- // Get returns the session value associated to the given key.
- Get(key interface{}) interface{}
- // Set sets the session value associated to the given key.
- Set(key interface{}, val interface{})
- // Delete removes the session value associated to the given key.
- Delete(key interface{})
- // Clear deletes all values in the session.
- Clear()
- // AddFlash adds a flash message to the session.
- // A single variadic argument is accepted, and it is optional: it defines the flash key.
- // If not defined "_flash" is used by default.
- AddFlash(value interface{}, vars ...string)
- // Flashes returns a slice of flash messages from the session.
- // A single variadic argument is accepted, and it is optional: it defines the flash key.
- // If not defined "_flash" is used by default.
- Flashes(vars ...string) []interface{}
- // Options sets confuguration for a session.
- Options(Options)
- // Save saves all sessions used during the current request.
- Save() error
-}
-
-func Sessions(name string, store Store) gin.HandlerFunc {
- return func(c *gin.Context) {
- s := &session{name, c.Request, store, nil, false, c.Writer}
- c.Set(DefaultKey, s)
- defer context.Clear(c.Request)
- c.Next()
- }
-}
-
-type session struct {
- name string
- request *http.Request
- store Store
- session *sessions.Session
- written bool
- writer http.ResponseWriter
-}
-
-func (s *session) Get(key interface{}) interface{} {
- return s.Session().Values[key]
-}
-
-func (s *session) Set(key interface{}, val interface{}) {
- s.Session().Values[key] = val
- s.written = true
-}
-
-func (s *session) Delete(key interface{}) {
- delete(s.Session().Values, key)
- s.written = true
-}
-
-func (s *session) Clear() {
- for key := range s.Session().Values {
- s.Delete(key)
- }
-}
-
-func (s *session) AddFlash(value interface{}, vars ...string) {
- s.Session().AddFlash(value, vars...)
- s.written = true
-}
-
-func (s *session) Flashes(vars ...string) []interface{} {
- s.written = true
- return s.Session().Flashes(vars...)
-}
-
-func (s *session) Options(options Options) {
- s.Session().Options = &sessions.Options{
- Path: options.Path,
- Domain: options.Domain,
- MaxAge: options.MaxAge,
- Secure: options.Secure,
- HttpOnly: options.HttpOnly,
- }
-}
-
-func (s *session) Save() error {
- if s.Written() {
- e := s.Session().Save(s.request, s.writer)
- if e == nil {
- s.written = false
- }
- return e
- }
- return nil
-}
-
-func (s *session) Session() *sessions.Session {
- if s.session == nil {
- var err error
- s.session, err = s.store.Get(s.request, s.name)
- if err != nil {
- log.Printf(errorFormat, err)
- }
- }
- return s.session
-}
-
-func (s *session) Written() bool {
- return s.written
-}
-
-// shortcut to get session
-func Default(c *gin.Context) Session {
- return c.MustGet(DefaultKey).(Session)
-}
diff --git a/vendor/github.com/gin-gonic/gin/.gitignore b/vendor/github.com/gin-gonic/gin/.gitignore
deleted file mode 100644
index 9f48f14..0000000
--- a/vendor/github.com/gin-gonic/gin/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Godeps/*
-!Godeps/Godeps.json
-coverage.out
-count.out
diff --git a/vendor/github.com/gin-gonic/gin/.travis.yml b/vendor/github.com/gin-gonic/gin/.travis.yml
deleted file mode 100644
index e6a05bd..0000000
--- a/vendor/github.com/gin-gonic/gin/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-language: go
-sudo: false
-go:
- - 1.6.4
- - 1.7.4
- - tip
-
-git:
- depth: 3
-
-install:
- - go get -v github.com/kardianos/govendor
- - govendor sync
-
-script:
- - go test -v -covermode=count -coverprofile=coverage.out
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
-
-notifications:
- webhooks:
- urls:
- - https://webhooks.gitter.im/e/7f95bf605c4d356372f4
- on_success: change # options: [always|never|change] default: always
- on_failure: always # options: [always|never|change] default: always
- on_start: false # default: false
diff --git a/vendor/github.com/gin-gonic/gin/AUTHORS.md b/vendor/github.com/gin-gonic/gin/AUTHORS.md
deleted file mode 100644
index 2feaf46..0000000
--- a/vendor/github.com/gin-gonic/gin/AUTHORS.md
+++ /dev/null
@@ -1,229 +0,0 @@
-List of all the awesome people working to make Gin the best Web Framework in Go.
-
-
-
-##gin 0.x series authors
-
-**Maintainer:** Manu Martinez-Almeida (@manucorporat), Javier Provecho (@javierprovecho)
-
-People and companies, who have contributed, in alphabetical order.
-
-**@858806258 (杰哥)**
-- Fix typo in example
-
-
-**@achedeuzot (Klemen Sever)**
-- Fix newline debug printing
-
-
-**@adammck (Adam Mckaig)**
-- Add MIT license
-
-
-**@AlexanderChen1989 (Alexander)**
-- Typos in README
-
-
-**@alexanderdidenko (Aleksandr Didenko)**
-- Add support multipart/form-data
-
-
-**@alexandernyquist (Alexander Nyquist)**
-- Using template.Must to fix multiple return issue
-- ★ Added support for OPTIONS verb
-- ★ Setting response headers before calling WriteHeader
-- Improved documentation for model binding
-- ★ Added Content.Redirect()
-- ★ Added tons of Unit tests
-
-
-**@austinheap (Austin Heap)**
-- Added travis CI integration
-
-
-**@andredublin (Andre Dublin)**
-- Fix typo in comment
-
-
-**@bredov (Ludwig Valda Vasquez)**
-- Fix html templating in debug mode
-
-
-**@bluele (Jun Kimura)**
-- Fixes code examples in README
-
-
-**@chad-russell**
-- ★ Support for serializing gin.H into XML
-
-
-**@dickeyxxx (Jeff Dickey)**
-- Typos in README
-- Add example about serving static files
-
-
-**@donileo (Adonis)**
-- Add NoMethod handler
-
-
-**@dutchcoders (DutchCoders)**
-- ★ Fix security bug that allows client to spoof ip
-- Fix typo. r.HTMLTemplates -> SetHTMLTemplate
-
-
-**@el3ctro- (Joshua Loper)**
-- Fix typo in example
-
-
-**@ethankan (Ethan Kan)**
-- Unsigned integers in binding
-
-
-**(Evgeny Persienko)**
-- Validate sub structures
-
-
-**@frankbille (Frank Bille)**
-- Add support for HTTP Realm Auth
-
-
-**@fmd (Fareed Dudhia)**
-- Fix typo. SetHTTPTemplate -> SetHTMLTemplate
-
-
-**@ironiridis (Christopher Harrington)**
-- Remove old reference
-
-
-**@jammie-stackhouse (Jamie Stackhouse)**
-- Add more shortcuts for router methods
-
-
-**@jasonrhansen**
-- Fix spelling and grammar errors in documentation
-
-
-**@JasonSoft (Jason Lee)**
-- Fix typo in comment
-
-
-**@joiggama (Ignacio Galindo)**
-- Add utf-8 charset header on renders
-
-
-**@julienschmidt (Julien Schmidt)**
-- gofmt the code examples
-
-
-**@kelcecil (Kel Cecil)**
-- Fix readme typo
-
-
-**@kyledinh (Kyle Dinh)**
-- Adds RunTLS()
-
-
-**@LinusU (Linus Unnebäck)**
-- Small fixes in README
-
-
-**@loongmxbt (Saint Asky)**
-- Fix typo in example
-
-
-**@lucas-clemente (Lucas Clemente)**
-- ★ work around path.Join removing trailing slashes from routes
-
-
-**@mattn (Yasuhiro Matsumoto)**
-- Improve color logger
-
-
-**@mdigger (Dmitry Sedykh)**
-- Fixes Form binding when content-type is x-www-form-urlencoded
-- No repeat call c.Writer.Status() in gin.Logger
-- Fixes Content-Type for json render
-
-
-**@mirzac (Mirza Ceric)**
-- Fix debug printing
-
-
-**@mopemope (Yutaka Matsubara)**
-- ★ Adds Godep support (Dependencies Manager)
-- Fix variadic parameter in the flexible render API
-- Fix Corrupted plain render
-- Add Pluggable View Renderer Example
-
-
-**@msemenistyi (Mykyta Semenistyi)**
-- update Readme.md. Add code to String method
-
-
-**@msoedov (Sasha Myasoedov)**
-- ★ Adds tons of unit tests.
-
-
-**@ngerakines (Nick Gerakines)**
-- ★ Improves API, c.GET() doesn't panic
-- Adds MustGet() method
-
-
-**@r8k (Rajiv Kilaparti)**
-- Fix Port usage in README.
-
-
-**@rayrod2030 (Ray Rodriguez)**
-- Fix typo in example
-
-
-**@rns**
-- Fix typo in example
-
-
-**@RobAWilkinson (Robert Wilkinson)**
-- Add example of forms and params
-
-
-**@rogierlommers (Rogier Lommers)**
-- Add updated static serve example
-
-
-**@se77en (Damon Zhao)**
-- Improve color logging
-
-
-**@silasb (Silas Baronda)**
-- Fixing quotes in README
-
-
-**@SkuliOskarsson (Skuli Oskarsson)**
-- Fixes some texts in README II
-
-
-**@slimmy (Jimmy Pettersson)**
-- Added messages for required bindings
-
-
-**@smira (Andrey Smirnov)**
-- Add support for ignored/unexported fields in binding
-
-
-**@superalsrk (SRK.Lyu)**
-- Update httprouter godeps
-
-
-**@tebeka (Miki Tebeka)**
-- Use net/http constants instead of numeric values
-
-
-**@techjanitor**
-- Update context.go reserved IPs
-
-
-**@yosssi (Keiji Yoshida)**
-- Fix link in README
-
-
-**@yuyabee**
-- Fixed README
\ No newline at end of file
diff --git a/vendor/github.com/gin-gonic/gin/BENCHMARKS.md b/vendor/github.com/gin-gonic/gin/BENCHMARKS.md
deleted file mode 100644
index 181f75b..0000000
--- a/vendor/github.com/gin-gonic/gin/BENCHMARKS.md
+++ /dev/null
@@ -1,298 +0,0 @@
-**Machine:** intel i7 ivy bridge quad-core. 8GB RAM.
-**Date:** June 4th, 2015
-[https://github.com/gin-gonic/go-http-routing-benchmark](https://github.com/gin-gonic/go-http-routing-benchmark)
-
-```
-BenchmarkAce_Param 5000000 372 ns/op 32 B/op 1 allocs/op
-BenchmarkBear_Param 1000000 1165 ns/op 424 B/op 5 allocs/op
-BenchmarkBeego_Param 1000000 2440 ns/op 720 B/op 10 allocs/op
-BenchmarkBone_Param 1000000 1067 ns/op 384 B/op 3 allocs/op
-BenchmarkDenco_Param 5000000 240 ns/op 32 B/op 1 allocs/op
-BenchmarkEcho_Param 10000000 130 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_Param 10000000 133 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_Param 1000000 1826 ns/op 656 B/op 9 allocs/op
-BenchmarkGoji_Param 2000000 957 ns/op 336 B/op 2 allocs/op
-BenchmarkGoJsonRest_Param 1000000 2021 ns/op 657 B/op 14 allocs/op
-BenchmarkGoRestful_Param 200000 8825 ns/op 2496 B/op 31 allocs/op
-BenchmarkGorillaMux_Param 500000 3340 ns/op 784 B/op 9 allocs/op
-BenchmarkHttpRouter_Param 10000000 152 ns/op 32 B/op 1 allocs/op
-BenchmarkHttpTreeMux_Param 2000000 717 ns/op 336 B/op 2 allocs/op
-BenchmarkKocha_Param 3000000 423 ns/op 56 B/op 3 allocs/op
-BenchmarkMacaron_Param 1000000 3410 ns/op 1104 B/op 11 allocs/op
-BenchmarkMartini_Param 200000 7101 ns/op 1152 B/op 12 allocs/op
-BenchmarkPat_Param 1000000 2040 ns/op 656 B/op 14 allocs/op
-BenchmarkPossum_Param 1000000 2048 ns/op 624 B/op 7 allocs/op
-BenchmarkR2router_Param 1000000 1144 ns/op 432 B/op 6 allocs/op
-BenchmarkRevel_Param 200000 6725 ns/op 1672 B/op 28 allocs/op
-BenchmarkRivet_Param 1000000 1121 ns/op 464 B/op 5 allocs/op
-BenchmarkTango_Param 1000000 1479 ns/op 256 B/op 10 allocs/op
-BenchmarkTigerTonic_Param 1000000 3393 ns/op 992 B/op 19 allocs/op
-BenchmarkTraffic_Param 300000 5525 ns/op 1984 B/op 23 allocs/op
-BenchmarkVulcan_Param 2000000 924 ns/op 98 B/op 3 allocs/op
-BenchmarkZeus_Param 1000000 1084 ns/op 368 B/op 3 allocs/op
-BenchmarkAce_Param5 3000000 614 ns/op 160 B/op 1 allocs/op
-BenchmarkBear_Param5 1000000 1617 ns/op 469 B/op 5 allocs/op
-BenchmarkBeego_Param5 1000000 3373 ns/op 992 B/op 13 allocs/op
-BenchmarkBone_Param5 1000000 1478 ns/op 432 B/op 3 allocs/op
-BenchmarkDenco_Param5 3000000 570 ns/op 160 B/op 1 allocs/op
-BenchmarkEcho_Param5 5000000 256 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_Param5 10000000 222 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_Param5 1000000 2789 ns/op 928 B/op 12 allocs/op
-BenchmarkGoji_Param5 1000000 1287 ns/op 336 B/op 2 allocs/op
-BenchmarkGoJsonRest_Param5 1000000 3670 ns/op 1105 B/op 17 allocs/op
-BenchmarkGoRestful_Param5 200000 10756 ns/op 2672 B/op 31 allocs/op
-BenchmarkGorillaMux_Param5 300000 5543 ns/op 912 B/op 9 allocs/op
-BenchmarkHttpRouter_Param5 5000000 403 ns/op 160 B/op 1 allocs/op
-BenchmarkHttpTreeMux_Param5 1000000 1089 ns/op 336 B/op 2 allocs/op
-BenchmarkKocha_Param5 1000000 1682 ns/op 440 B/op 10 allocs/op
-BenchmarkMacaron_Param5 300000 4596 ns/op 1376 B/op 14 allocs/op
-BenchmarkMartini_Param5 100000 15703 ns/op 1280 B/op 12 allocs/op
-BenchmarkPat_Param5 300000 5320 ns/op 1008 B/op 42 allocs/op
-BenchmarkPossum_Param5 1000000 2155 ns/op 624 B/op 7 allocs/op
-BenchmarkR2router_Param5 1000000 1559 ns/op 432 B/op 6 allocs/op
-BenchmarkRevel_Param5 200000 8184 ns/op 2024 B/op 35 allocs/op
-BenchmarkRivet_Param5 1000000 1914 ns/op 528 B/op 9 allocs/op
-BenchmarkTango_Param5 1000000 3280 ns/op 944 B/op 18 allocs/op
-BenchmarkTigerTonic_Param5 200000 11638 ns/op 2519 B/op 53 allocs/op
-BenchmarkTraffic_Param5 200000 8941 ns/op 2280 B/op 31 allocs/op
-BenchmarkVulcan_Param5 1000000 1279 ns/op 98 B/op 3 allocs/op
-BenchmarkZeus_Param5 1000000 1574 ns/op 416 B/op 3 allocs/op
-BenchmarkAce_Param20 1000000 1528 ns/op 640 B/op 1 allocs/op
-BenchmarkBear_Param20 300000 4906 ns/op 1633 B/op 5 allocs/op
-BenchmarkBeego_Param20 200000 10529 ns/op 3868 B/op 17 allocs/op
-BenchmarkBone_Param20 300000 7362 ns/op 2539 B/op 5 allocs/op
-BenchmarkDenco_Param20 1000000 1884 ns/op 640 B/op 1 allocs/op
-BenchmarkEcho_Param20 2000000 689 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_Param20 3000000 545 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_Param20 200000 9437 ns/op 3804 B/op 16 allocs/op
-BenchmarkGoji_Param20 500000 3987 ns/op 1246 B/op 2 allocs/op
-BenchmarkGoJsonRest_Param20 100000 12799 ns/op 4492 B/op 21 allocs/op
-BenchmarkGoRestful_Param20 100000 19451 ns/op 5244 B/op 33 allocs/op
-BenchmarkGorillaMux_Param20 100000 12456 ns/op 3275 B/op 11 allocs/op
-BenchmarkHttpRouter_Param20 1000000 1333 ns/op 640 B/op 1 allocs/op
-BenchmarkHttpTreeMux_Param20 300000 6490 ns/op 2187 B/op 4 allocs/op
-BenchmarkKocha_Param20 300000 5335 ns/op 1808 B/op 27 allocs/op
-BenchmarkMacaron_Param20 200000 11325 ns/op 4252 B/op 18 allocs/op
-BenchmarkMartini_Param20 20000 64419 ns/op 3644 B/op 14 allocs/op
-BenchmarkPat_Param20 50000 24672 ns/op 4888 B/op 151 allocs/op
-BenchmarkPossum_Param20 1000000 2085 ns/op 624 B/op 7 allocs/op
-BenchmarkR2router_Param20 300000 6809 ns/op 2283 B/op 8 allocs/op
-BenchmarkRevel_Param20 100000 16600 ns/op 5551 B/op 54 allocs/op
-BenchmarkRivet_Param20 200000 8428 ns/op 2620 B/op 26 allocs/op
-BenchmarkTango_Param20 100000 16302 ns/op 8224 B/op 48 allocs/op
-BenchmarkTigerTonic_Param20 30000 46828 ns/op 10538 B/op 178 allocs/op
-BenchmarkTraffic_Param20 50000 28871 ns/op 7998 B/op 66 allocs/op
-BenchmarkVulcan_Param20 1000000 2267 ns/op 98 B/op 3 allocs/op
-BenchmarkZeus_Param20 300000 6828 ns/op 2507 B/op 5 allocs/op
-BenchmarkAce_ParamWrite 3000000 502 ns/op 40 B/op 2 allocs/op
-BenchmarkBear_ParamWrite 1000000 1303 ns/op 424 B/op 5 allocs/op
-BenchmarkBeego_ParamWrite 1000000 2489 ns/op 728 B/op 11 allocs/op
-BenchmarkBone_ParamWrite 1000000 1181 ns/op 384 B/op 3 allocs/op
-BenchmarkDenco_ParamWrite 5000000 315 ns/op 32 B/op 1 allocs/op
-BenchmarkEcho_ParamWrite 10000000 237 ns/op 8 B/op 1 allocs/op
-BenchmarkGin_ParamWrite 5000000 336 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_ParamWrite 1000000 2079 ns/op 664 B/op 10 allocs/op
-BenchmarkGoji_ParamWrite 1000000 1092 ns/op 336 B/op 2 allocs/op
-BenchmarkGoJsonRest_ParamWrite 1000000 3329 ns/op 1136 B/op 19 allocs/op
-BenchmarkGoRestful_ParamWrite 200000 9273 ns/op 2504 B/op 32 allocs/op
-BenchmarkGorillaMux_ParamWrite 500000 3919 ns/op 792 B/op 10 allocs/op
-BenchmarkHttpRouter_ParamWrite 10000000 223 ns/op 32 B/op 1 allocs/op
-BenchmarkHttpTreeMux_ParamWrite 2000000 788 ns/op 336 B/op 2 allocs/op
-BenchmarkKocha_ParamWrite 3000000 549 ns/op 56 B/op 3 allocs/op
-BenchmarkMacaron_ParamWrite 500000 4558 ns/op 1216 B/op 16 allocs/op
-BenchmarkMartini_ParamWrite 200000 8850 ns/op 1256 B/op 16 allocs/op
-BenchmarkPat_ParamWrite 500000 3679 ns/op 1088 B/op 19 allocs/op
-BenchmarkPossum_ParamWrite 1000000 2114 ns/op 624 B/op 7 allocs/op
-BenchmarkR2router_ParamWrite 1000000 1320 ns/op 432 B/op 6 allocs/op
-BenchmarkRevel_ParamWrite 200000 8048 ns/op 2128 B/op 33 allocs/op
-BenchmarkRivet_ParamWrite 1000000 1393 ns/op 472 B/op 6 allocs/op
-BenchmarkTango_ParamWrite 2000000 819 ns/op 136 B/op 5 allocs/op
-BenchmarkTigerTonic_ParamWrite 300000 5860 ns/op 1440 B/op 25 allocs/op
-BenchmarkTraffic_ParamWrite 200000 7429 ns/op 2400 B/op 27 allocs/op
-BenchmarkVulcan_ParamWrite 2000000 972 ns/op 98 B/op 3 allocs/op
-BenchmarkZeus_ParamWrite 1000000 1226 ns/op 368 B/op 3 allocs/op
-BenchmarkAce_GithubStatic 5000000 294 ns/op 0 B/op 0 allocs/op
-BenchmarkBear_GithubStatic 3000000 575 ns/op 88 B/op 3 allocs/op
-BenchmarkBeego_GithubStatic 1000000 1561 ns/op 368 B/op 7 allocs/op
-BenchmarkBone_GithubStatic 200000 12301 ns/op 2880 B/op 60 allocs/op
-BenchmarkDenco_GithubStatic 20000000 74.6 ns/op 0 B/op 0 allocs/op
-BenchmarkEcho_GithubStatic 10000000 176 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_GithubStatic 10000000 159 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_GithubStatic 1000000 1116 ns/op 304 B/op 6 allocs/op
-BenchmarkGoji_GithubStatic 5000000 413 ns/op 0 B/op 0 allocs/op
-BenchmarkGoRestful_GithubStatic 30000 55200 ns/op 3520 B/op 36 allocs/op
-BenchmarkGoJsonRest_GithubStatic 1000000 1504 ns/op 337 B/op 12 allocs/op
-BenchmarkGorillaMux_GithubStatic 100000 23620 ns/op 464 B/op 8 allocs/op
-BenchmarkHttpRouter_GithubStatic 20000000 78.3 ns/op 0 B/op 0 allocs/op
-BenchmarkHttpTreeMux_GithubStatic 20000000 84.9 ns/op 0 B/op 0 allocs/op
-BenchmarkKocha_GithubStatic 20000000 111 ns/op 0 B/op 0 allocs/op
-BenchmarkMacaron_GithubStatic 1000000 2686 ns/op 752 B/op 8 allocs/op
-BenchmarkMartini_GithubStatic 100000 22244 ns/op 832 B/op 11 allocs/op
-BenchmarkPat_GithubStatic 100000 13278 ns/op 3648 B/op 76 allocs/op
-BenchmarkPossum_GithubStatic 1000000 1429 ns/op 480 B/op 4 allocs/op
-BenchmarkR2router_GithubStatic 2000000 726 ns/op 144 B/op 5 allocs/op
-BenchmarkRevel_GithubStatic 300000 6271 ns/op 1288 B/op 25 allocs/op
-BenchmarkRivet_GithubStatic 3000000 474 ns/op 112 B/op 2 allocs/op
-BenchmarkTango_GithubStatic 1000000 1842 ns/op 256 B/op 10 allocs/op
-BenchmarkTigerTonic_GithubStatic 5000000 361 ns/op 48 B/op 1 allocs/op
-BenchmarkTraffic_GithubStatic 30000 47197 ns/op 18920 B/op 149 allocs/op
-BenchmarkVulcan_GithubStatic 1000000 1415 ns/op 98 B/op 3 allocs/op
-BenchmarkZeus_GithubStatic 1000000 2522 ns/op 512 B/op 11 allocs/op
-BenchmarkAce_GithubParam 3000000 578 ns/op 96 B/op 1 allocs/op
-BenchmarkBear_GithubParam 1000000 1592 ns/op 464 B/op 5 allocs/op
-BenchmarkBeego_GithubParam 1000000 2891 ns/op 784 B/op 11 allocs/op
-BenchmarkBone_GithubParam 300000 6440 ns/op 1456 B/op 16 allocs/op
-BenchmarkDenco_GithubParam 3000000 514 ns/op 128 B/op 1 allocs/op
-BenchmarkEcho_GithubParam 5000000 292 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_GithubParam 10000000 242 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_GithubParam 1000000 2343 ns/op 720 B/op 10 allocs/op
-BenchmarkGoji_GithubParam 1000000 1566 ns/op 336 B/op 2 allocs/op
-BenchmarkGoJsonRest_GithubParam 1000000 2828 ns/op 721 B/op 15 allocs/op
-BenchmarkGoRestful_GithubParam 10000 177711 ns/op 2816 B/op 35 allocs/op
-BenchmarkGorillaMux_GithubParam 100000 13591 ns/op 816 B/op 9 allocs/op
-BenchmarkHttpRouter_GithubParam 5000000 352 ns/op 96 B/op 1 allocs/op
-BenchmarkHttpTreeMux_GithubParam 2000000 973 ns/op 336 B/op 2 allocs/op
-BenchmarkKocha_GithubParam 2000000 889 ns/op 128 B/op 5 allocs/op
-BenchmarkMacaron_GithubParam 500000 4047 ns/op 1168 B/op 12 allocs/op
-BenchmarkMartini_GithubParam 50000 28982 ns/op 1184 B/op 12 allocs/op
-BenchmarkPat_GithubParam 200000 8747 ns/op 2480 B/op 56 allocs/op
-BenchmarkPossum_GithubParam 1000000 2158 ns/op 624 B/op 7 allocs/op
-BenchmarkR2router_GithubParam 1000000 1352 ns/op 432 B/op 6 allocs/op
-BenchmarkRevel_GithubParam 200000 7673 ns/op 1784 B/op 30 allocs/op
-BenchmarkRivet_GithubParam 1000000 1573 ns/op 480 B/op 6 allocs/op
-BenchmarkTango_GithubParam 1000000 2418 ns/op 480 B/op 13 allocs/op
-BenchmarkTigerTonic_GithubParam 300000 6048 ns/op 1440 B/op 28 allocs/op
-BenchmarkTraffic_GithubParam 100000 20143 ns/op 6024 B/op 55 allocs/op
-BenchmarkVulcan_GithubParam 1000000 2224 ns/op 98 B/op 3 allocs/op
-BenchmarkZeus_GithubParam 500000 4156 ns/op 1312 B/op 12 allocs/op
-BenchmarkAce_GithubAll 10000 109482 ns/op 13792 B/op 167 allocs/op
-BenchmarkBear_GithubAll 10000 287490 ns/op 79952 B/op 943 allocs/op
-BenchmarkBeego_GithubAll 3000 562184 ns/op 146272 B/op 2092 allocs/op
-BenchmarkBone_GithubAll 500 2578716 ns/op 648016 B/op 8119 allocs/op
-BenchmarkDenco_GithubAll 20000 94955 ns/op 20224 B/op 167 allocs/op
-BenchmarkEcho_GithubAll 30000 58705 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_GithubAll 30000 50991 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_GithubAll 5000 449648 ns/op 133280 B/op 1889 allocs/op
-BenchmarkGoji_GithubAll 2000 689748 ns/op 56113 B/op 334 allocs/op
-BenchmarkGoJsonRest_GithubAll 5000 537769 ns/op 135995 B/op 2940 allocs/op
-BenchmarkGoRestful_GithubAll 100 18410628 ns/op 797236 B/op 7725 allocs/op
-BenchmarkGorillaMux_GithubAll 200 8036360 ns/op 153137 B/op 1791 allocs/op
-BenchmarkHttpRouter_GithubAll 20000 63506 ns/op 13792 B/op 167 allocs/op
-BenchmarkHttpTreeMux_GithubAll 10000 165927 ns/op 56112 B/op 334 allocs/op
-BenchmarkKocha_GithubAll 10000 171362 ns/op 23304 B/op 843 allocs/op
-BenchmarkMacaron_GithubAll 2000 817008 ns/op 224960 B/op 2315 allocs/op
-BenchmarkMartini_GithubAll 100 12609209 ns/op 237952 B/op 2686 allocs/op
-BenchmarkPat_GithubAll 300 4830398 ns/op 1504101 B/op 32222 allocs/op
-BenchmarkPossum_GithubAll 10000 301716 ns/op 97440 B/op 812 allocs/op
-BenchmarkR2router_GithubAll 10000 270691 ns/op 77328 B/op 1182 allocs/op
-BenchmarkRevel_GithubAll 1000 1491919 ns/op 345553 B/op 5918 allocs/op
-BenchmarkRivet_GithubAll 10000 283860 ns/op 84272 B/op 1079 allocs/op
-BenchmarkTango_GithubAll 5000 473821 ns/op 87078 B/op 2470 allocs/op
-BenchmarkTigerTonic_GithubAll 2000 1120131 ns/op 241088 B/op 6052 allocs/op
-BenchmarkTraffic_GithubAll 200 8708979 ns/op 2664762 B/op 22390 allocs/op
-BenchmarkVulcan_GithubAll 5000 353392 ns/op 19894 B/op 609 allocs/op
-BenchmarkZeus_GithubAll 2000 944234 ns/op 300688 B/op 2648 allocs/op
-BenchmarkAce_GPlusStatic 5000000 251 ns/op 0 B/op 0 allocs/op
-BenchmarkBear_GPlusStatic 3000000 415 ns/op 72 B/op 3 allocs/op
-BenchmarkBeego_GPlusStatic 1000000 1416 ns/op 352 B/op 7 allocs/op
-BenchmarkBone_GPlusStatic 10000000 192 ns/op 32 B/op 1 allocs/op
-BenchmarkDenco_GPlusStatic 30000000 47.6 ns/op 0 B/op 0 allocs/op
-BenchmarkEcho_GPlusStatic 10000000 131 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_GPlusStatic 10000000 131 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_GPlusStatic 1000000 1035 ns/op 288 B/op 6 allocs/op
-BenchmarkGoji_GPlusStatic 5000000 304 ns/op 0 B/op 0 allocs/op
-BenchmarkGoJsonRest_GPlusStatic 1000000 1286 ns/op 337 B/op 12 allocs/op
-BenchmarkGoRestful_GPlusStatic 200000 9649 ns/op 2160 B/op 30 allocs/op
-BenchmarkGorillaMux_GPlusStatic 1000000 2346 ns/op 464 B/op 8 allocs/op
-BenchmarkHttpRouter_GPlusStatic 30000000 42.7 ns/op 0 B/op 0 allocs/op
-BenchmarkHttpTreeMux_GPlusStatic 30000000 49.5 ns/op 0 B/op 0 allocs/op
-BenchmarkKocha_GPlusStatic 20000000 74.8 ns/op 0 B/op 0 allocs/op
-BenchmarkMacaron_GPlusStatic 1000000 2520 ns/op 736 B/op 8 allocs/op
-BenchmarkMartini_GPlusStatic 300000 5310 ns/op 832 B/op 11 allocs/op
-BenchmarkPat_GPlusStatic 5000000 398 ns/op 96 B/op 2 allocs/op
-BenchmarkPossum_GPlusStatic 1000000 1434 ns/op 480 B/op 4 allocs/op
-BenchmarkR2router_GPlusStatic 2000000 646 ns/op 144 B/op 5 allocs/op
-BenchmarkRevel_GPlusStatic 300000 6172 ns/op 1272 B/op 25 allocs/op
-BenchmarkRivet_GPlusStatic 3000000 444 ns/op 112 B/op 2 allocs/op
-BenchmarkTango_GPlusStatic 1000000 1400 ns/op 208 B/op 10 allocs/op
-BenchmarkTigerTonic_GPlusStatic 10000000 213 ns/op 32 B/op 1 allocs/op
-BenchmarkTraffic_GPlusStatic 1000000 3091 ns/op 1208 B/op 16 allocs/op
-BenchmarkVulcan_GPlusStatic 2000000 863 ns/op 98 B/op 3 allocs/op
-BenchmarkZeus_GPlusStatic 10000000 237 ns/op 16 B/op 1 allocs/op
-BenchmarkAce_GPlusParam 3000000 435 ns/op 64 B/op 1 allocs/op
-BenchmarkBear_GPlusParam 1000000 1205 ns/op 448 B/op 5 allocs/op
-BenchmarkBeego_GPlusParam 1000000 2494 ns/op 720 B/op 10 allocs/op
-BenchmarkBone_GPlusParam 1000000 1126 ns/op 384 B/op 3 allocs/op
-BenchmarkDenco_GPlusParam 5000000 325 ns/op 64 B/op 1 allocs/op
-BenchmarkEcho_GPlusParam 10000000 168 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_GPlusParam 10000000 170 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_GPlusParam 1000000 1895 ns/op 656 B/op 9 allocs/op
-BenchmarkGoji_GPlusParam 1000000 1071 ns/op 336 B/op 2 allocs/op
-BenchmarkGoJsonRest_GPlusParam 1000000 2282 ns/op 657 B/op 14 allocs/op
-BenchmarkGoRestful_GPlusParam 100000 19400 ns/op 2560 B/op 33 allocs/op
-BenchmarkGorillaMux_GPlusParam 500000 5001 ns/op 784 B/op 9 allocs/op
-BenchmarkHttpRouter_GPlusParam 10000000 240 ns/op 64 B/op 1 allocs/op
-BenchmarkHttpTreeMux_GPlusParam 2000000 797 ns/op 336 B/op 2 allocs/op
-BenchmarkKocha_GPlusParam 3000000 505 ns/op 56 B/op 3 allocs/op
-BenchmarkMacaron_GPlusParam 1000000 3668 ns/op 1104 B/op 11 allocs/op
-BenchmarkMartini_GPlusParam 200000 10672 ns/op 1152 B/op 12 allocs/op
-BenchmarkPat_GPlusParam 1000000 2376 ns/op 704 B/op 14 allocs/op
-BenchmarkPossum_GPlusParam 1000000 2090 ns/op 624 B/op 7 allocs/op
-BenchmarkR2router_GPlusParam 1000000 1233 ns/op 432 B/op 6 allocs/op
-BenchmarkRevel_GPlusParam 200000 6778 ns/op 1704 B/op 28 allocs/op
-BenchmarkRivet_GPlusParam 1000000 1279 ns/op 464 B/op 5 allocs/op
-BenchmarkTango_GPlusParam 1000000 1981 ns/op 272 B/op 10 allocs/op
-BenchmarkTigerTonic_GPlusParam 500000 3893 ns/op 1064 B/op 19 allocs/op
-BenchmarkTraffic_GPlusParam 200000 6585 ns/op 2000 B/op 23 allocs/op
-BenchmarkVulcan_GPlusParam 1000000 1233 ns/op 98 B/op 3 allocs/op
-BenchmarkZeus_GPlusParam 1000000 1350 ns/op 368 B/op 3 allocs/op
-BenchmarkAce_GPlus2Params 3000000 512 ns/op 64 B/op 1 allocs/op
-BenchmarkBear_GPlus2Params 1000000 1564 ns/op 464 B/op 5 allocs/op
-BenchmarkBeego_GPlus2Params 1000000 3043 ns/op 784 B/op 11 allocs/op
-BenchmarkBone_GPlus2Params 1000000 3152 ns/op 736 B/op 7 allocs/op
-BenchmarkDenco_GPlus2Params 3000000 431 ns/op 64 B/op 1 allocs/op
-BenchmarkEcho_GPlus2Params 5000000 247 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_GPlus2Params 10000000 219 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_GPlus2Params 1000000 2363 ns/op 720 B/op 10 allocs/op
-BenchmarkGoji_GPlus2Params 1000000 1540 ns/op 336 B/op 2 allocs/op
-BenchmarkGoJsonRest_GPlus2Params 1000000 2872 ns/op 721 B/op 15 allocs/op
-BenchmarkGoRestful_GPlus2Params 100000 23030 ns/op 2720 B/op 35 allocs/op
-BenchmarkGorillaMux_GPlus2Params 200000 10516 ns/op 816 B/op 9 allocs/op
-BenchmarkHttpRouter_GPlus2Params 5000000 273 ns/op 64 B/op 1 allocs/op
-BenchmarkHttpTreeMux_GPlus2Params 2000000 939 ns/op 336 B/op 2 allocs/op
-BenchmarkKocha_GPlus2Params 2000000 844 ns/op 128 B/op 5 allocs/op
-BenchmarkMacaron_GPlus2Params 500000 3914 ns/op 1168 B/op 12 allocs/op
-BenchmarkMartini_GPlus2Params 50000 35759 ns/op 1280 B/op 16 allocs/op
-BenchmarkPat_GPlus2Params 200000 7089 ns/op 2304 B/op 41 allocs/op
-BenchmarkPossum_GPlus2Params 1000000 2093 ns/op 624 B/op 7 allocs/op
-BenchmarkR2router_GPlus2Params 1000000 1320 ns/op 432 B/op 6 allocs/op
-BenchmarkRevel_GPlus2Params 200000 7351 ns/op 1800 B/op 30 allocs/op
-BenchmarkRivet_GPlus2Params 1000000 1485 ns/op 480 B/op 6 allocs/op
-BenchmarkTango_GPlus2Params 1000000 2111 ns/op 448 B/op 12 allocs/op
-BenchmarkTigerTonic_GPlus2Params 300000 6271 ns/op 1528 B/op 28 allocs/op
-BenchmarkTraffic_GPlus2Params 100000 14886 ns/op 3312 B/op 34 allocs/op
-BenchmarkVulcan_GPlus2Params 1000000 1883 ns/op 98 B/op 3 allocs/op
-BenchmarkZeus_GPlus2Params 1000000 2686 ns/op 784 B/op 6 allocs/op
-BenchmarkAce_GPlusAll 300000 5912 ns/op 640 B/op 11 allocs/op
-BenchmarkBear_GPlusAll 100000 16448 ns/op 5072 B/op 61 allocs/op
-BenchmarkBeego_GPlusAll 50000 32916 ns/op 8976 B/op 129 allocs/op
-BenchmarkBone_GPlusAll 50000 25836 ns/op 6992 B/op 76 allocs/op
-BenchmarkDenco_GPlusAll 500000 4462 ns/op 672 B/op 11 allocs/op
-BenchmarkEcho_GPlusAll 500000 2806 ns/op 0 B/op 0 allocs/op
-BenchmarkGin_GPlusAll 500000 2579 ns/op 0 B/op 0 allocs/op
-BenchmarkGocraftWeb_GPlusAll 50000 25223 ns/op 8144 B/op 116 allocs/op
-BenchmarkGoji_GPlusAll 100000 14237 ns/op 3696 B/op 22 allocs/op
-BenchmarkGoJsonRest_GPlusAll 50000 29227 ns/op 8221 B/op 183 allocs/op
-BenchmarkGoRestful_GPlusAll 10000 203144 ns/op 36064 B/op 441 allocs/op
-BenchmarkGorillaMux_GPlusAll 20000 80906 ns/op 9712 B/op 115 allocs/op
-BenchmarkHttpRouter_GPlusAll 500000 3040 ns/op 640 B/op 11 allocs/op
-BenchmarkHttpTreeMux_GPlusAll 200000 9627 ns/op 3696 B/op 22 allocs/op
-BenchmarkKocha_GPlusAll 200000 8108 ns/op 976 B/op 43 allocs/op
-BenchmarkMacaron_GPlusAll 30000 48083 ns/op 13968 B/op 142 allocs/op
-BenchmarkMartini_GPlusAll 10000 196978 ns/op 15072 B/op 178 allocs/op
-BenchmarkPat_GPlusAll 30000 58865 ns/op 16880 B/op 343 allocs/op
-BenchmarkPossum_GPlusAll 100000 19685 ns/op 6240 B/op 52 allocs/op
-BenchmarkR2router_GPlusAll 100000 16251 ns/op 5040 B/op 76 allocs/op
-BenchmarkRevel_GPlusAll 20000 93489 ns/op 21656 B/op 368 allocs/op
-BenchmarkRivet_GPlusAll 100000 16907 ns/op 5408 B/op 64 allocs/op
-```
\ No newline at end of file
diff --git a/vendor/github.com/gin-gonic/gin/CHANGELOG.md b/vendor/github.com/gin-gonic/gin/CHANGELOG.md
deleted file mode 100644
index 82f1bea..0000000
--- a/vendor/github.com/gin-gonic/gin/CHANGELOG.md
+++ /dev/null
@@ -1,150 +0,0 @@
-#CHANGELOG
-
-###Gin 1.0rc2 (...)
-
-- [PERFORMANCE] Fast path for writing Content-Type.
-- [PERFORMANCE] Much faster 404 routing
-- [PERFORMANCE] Allocation optimizations
-- [PERFORMANCE] Faster root tree lookup
-- [PERFORMANCE] Zero overhead, String() and JSON() rendering.
-- [PERFORMANCE] Faster ClientIP parsing
-- [PERFORMANCE] Much faster SSE implementation
-- [NEW] Benchmarks suite
-- [NEW] Bind validation can be disabled and replaced with custom validators.
-- [NEW] More flexible HTML render
-- [NEW] Multipart and PostForm bindings
-- [NEW] Adds method to return all the registered routes
-- [NEW] Context.HandlerName() returns the main handler's name
-- [NEW] Adds Error.IsType() helper
-- [FIX] Binding multipart form
-- [FIX] Integration tests
-- [FIX] Crash when binding non struct object in Context.
-- [FIX] RunTLS() implementation
-- [FIX] Logger() unit tests
-- [FIX] Adds SetHTMLTemplate() warning
-- [FIX] Context.IsAborted()
-- [FIX] More unit tests
-- [FIX] JSON, XML, HTML renders accept custom content-types
-- [FIX] gin.AbortIndex is unexported
-- [FIX] Better approach to avoid directory listing in StaticFS()
-- [FIX] Context.ClientIP() always returns the IP with trimmed spaces.
-- [FIX] Better warning when running in debug mode.
-- [FIX] Google App Engine integration. debugPrint does not use os.Stdout
-- [FIX] Fixes integer overflow in error type
-- [FIX] Error implements the json.Marshaller interface
-- [FIX] MIT license in every file
-
-
-###Gin 1.0rc1 (May 22, 2015)
-
-- [PERFORMANCE] Zero allocation router
-- [PERFORMANCE] Faster JSON, XML and text rendering
-- [PERFORMANCE] Custom hand optimized HttpRouter for Gin
-- [PERFORMANCE] Misc code optimizations. Inlining, tail call optimizations
-- [NEW] Built-in support for golang.org/x/net/context
-- [NEW] Any(path, handler). Create a route that matches any path
-- [NEW] Refactored rendering pipeline (faster and static typeded)
-- [NEW] Refactored errors API
-- [NEW] IndentedJSON() prints pretty JSON
-- [NEW] Added gin.DefaultWriter
-- [NEW] UNIX socket support
-- [NEW] RouterGroup.BasePath is exposed
-- [NEW] JSON validation using go-validate-yourself (very powerful options)
-- [NEW] Completed suite of unit tests
-- [NEW] HTTP streaming with c.Stream()
-- [NEW] StaticFile() creates a router for serving just one file.
-- [NEW] StaticFS() has an option to disable directory listing.
-- [NEW] StaticFS() for serving static files through virtual filesystems
-- [NEW] Server-Sent Events native support
-- [NEW] WrapF() and WrapH() helpers for wrapping http.HandlerFunc and http.Handler
-- [NEW] Added LoggerWithWriter() middleware
-- [NEW] Added RecoveryWithWriter() middleware
-- [NEW] Added DefaultPostFormValue()
-- [NEW] Added DefaultFormValue()
-- [NEW] Added DefaultParamValue()
-- [FIX] BasicAuth() when using custom realm
-- [FIX] Bug when serving static files in nested routing group
-- [FIX] Redirect using built-in http.Redirect()
-- [FIX] Logger when printing the requested path
-- [FIX] Documentation typos
-- [FIX] Context.Engine renamed to Context.engine
-- [FIX] Better debugging messages
-- [FIX] ErrorLogger
-- [FIX] Debug HTTP render
-- [FIX] Refactored binding and render modules
-- [FIX] Refactored Context initialization
-- [FIX] Refactored BasicAuth()
-- [FIX] NoMethod/NoRoute handlers
-- [FIX] Hijacking http
-- [FIX] Better support for Google App Engine (using log instead of fmt)
-
-
-###Gin 0.6 (Mar 9, 2015)
-
-- [NEW] Support multipart/form-data
-- [NEW] NoMethod handler
-- [NEW] Validate sub structures
-- [NEW] Support for HTTP Realm Auth
-- [FIX] Unsigned integers in binding
-- [FIX] Improve color logger
-
-
-###Gin 0.5 (Feb 7, 2015)
-
-- [NEW] Content Negotiation
-- [FIX] Solved security bug that allow a client to spoof ip
-- [FIX] Fix unexported/ignored fields in binding
-
-
-###Gin 0.4 (Aug 21, 2014)
-
-- [NEW] Development mode
-- [NEW] Unit tests
-- [NEW] Add Content.Redirect()
-- [FIX] Deferring WriteHeader()
-- [FIX] Improved documentation for model binding
-
-
-###Gin 0.3 (Jul 18, 2014)
-
-- [PERFORMANCE] Normal log and error log are printed in the same call.
-- [PERFORMANCE] Improve performance of NoRouter()
-- [PERFORMANCE] Improve context's memory locality, reduce CPU cache faults.
-- [NEW] Flexible rendering API
-- [NEW] Add Context.File()
-- [NEW] Add shorcut RunTLS() for http.ListenAndServeTLS
-- [FIX] Rename NotFound404() to NoRoute()
-- [FIX] Errors in context are purged
-- [FIX] Adds HEAD method in Static file serving
-- [FIX] Refactors Static() file serving
-- [FIX] Using keyed initialization to fix app-engine integration
-- [FIX] Can't unmarshal JSON array, #63
-- [FIX] Renaming Context.Req to Context.Request
-- [FIX] Check application/x-www-form-urlencoded when parsing form
-
-
-###Gin 0.2b (Jul 08, 2014)
-- [PERFORMANCE] Using sync.Pool to allocatio/gc overhead
-- [NEW] Travis CI integration
-- [NEW] Completely new logger
-- [NEW] New API for serving static files. gin.Static()
-- [NEW] gin.H() can be serialized into XML
-- [NEW] Typed errors. Errors can be typed. Internet/external/custom.
-- [NEW] Support for Godeps
-- [NEW] Travis/Godocs badges in README
-- [NEW] New Bind() and BindWith() methods for parsing request body.
-- [NEW] Add Content.Copy()
-- [NEW] Add context.LastError()
-- [NEW] Add shorcut for OPTIONS HTTP method
-- [FIX] Tons of README fixes
-- [FIX] Header is written before body
-- [FIX] BasicAuth() and changes API a little bit
-- [FIX] Recovery() middleware only prints panics
-- [FIX] Context.Get() does not panic anymore. Use MustGet() instead.
-- [FIX] Multiple http.WriteHeader() in NotFound handlers
-- [FIX] Engine.Run() panics if http server can't be setted up
-- [FIX] Crash when route path doesn't start with '/'
-- [FIX] Do not update header when status code is negative
-- [FIX] Setting response headers before calling WriteHeader in context.String()
-- [FIX] Add MIT license
-- [FIX] Changes behaviour of ErrorLogger() and Logger()
diff --git a/vendor/github.com/gin-gonic/gin/LICENSE b/vendor/github.com/gin-gonic/gin/LICENSE
deleted file mode 100644
index 1ff7f37..0000000
--- a/vendor/github.com/gin-gonic/gin/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Manuel Martínez-Almeida
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/gin-gonic/gin/README.md b/vendor/github.com/gin-gonic/gin/README.md
deleted file mode 100644
index c940a10..0000000
--- a/vendor/github.com/gin-gonic/gin/README.md
+++ /dev/null
@@ -1,814 +0,0 @@
-
-#Gin Web Framework
-
-
-[](https://travis-ci.org/gin-gonic/gin)
-[](https://codecov.io/gh/gin-gonic/gin)
-[](https://goreportcard.com/report/github.com/gin-gonic/gin)
-[](https://godoc.org/github.com/gin-gonic/gin)
-[](https://gitter.im/gin-gonic/gin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-Gin is a web framework written in Go (Golang). It features a martini-like API with much better performance, up to 40 times faster thanks to [httprouter](https://github.com/julienschmidt/httprouter). If you need performance and good productivity, you will love Gin.
-
-
-
-```sh
-$ cat test.go
-```
-```go
-package main
-
-import "gopkg.in/gin-gonic/gin.v1"
-
-func main() {
- r := gin.Default()
- r.GET("/ping", func(c *gin.Context) {
- c.JSON(200, gin.H{
- "message": "pong",
- })
- })
- r.Run() // listen and serve on 0.0.0.0:8080
-}
-```
-
-## Benchmarks
-
-Gin uses a custom version of [HttpRouter](https://github.com/julienschmidt/httprouter)
-
-[See all benchmarks](/BENCHMARKS.md)
-
-
-Benchmark name | (1) | (2) | (3) | (4)
---------------------------------|----------:|----------:|----------:|------:
-BenchmarkAce_GithubAll | 10000 | 109482 | 13792 | 167
-BenchmarkBear_GithubAll | 10000 | 287490 | 79952 | 943
-BenchmarkBeego_GithubAll | 3000 | 562184 | 146272 | 2092
-BenchmarkBone_GithubAll | 500 | 2578716 | 648016 | 8119
-BenchmarkDenco_GithubAll | 20000 | 94955 | 20224 | 167
-BenchmarkEcho_GithubAll | 30000 | 58705 | 0 | 0
-**BenchmarkGin_GithubAll** | **30000** | **50991** | **0** | **0**
-BenchmarkGocraftWeb_GithubAll | 5000 | 449648 | 133280 | 1889
-BenchmarkGoji_GithubAll | 2000 | 689748 | 56113 | 334
-BenchmarkGoJsonRest_GithubAll | 5000 | 537769 | 135995 | 2940
-BenchmarkGoRestful_GithubAll | 100 | 18410628 | 797236 | 7725
-BenchmarkGorillaMux_GithubAll | 200 | 8036360 | 153137 | 1791
-BenchmarkHttpRouter_GithubAll | 20000 | 63506 | 13792 | 167
-BenchmarkHttpTreeMux_GithubAll | 10000 | 165927 | 56112 | 334
-BenchmarkKocha_GithubAll | 10000 | 171362 | 23304 | 843
-BenchmarkMacaron_GithubAll | 2000 | 817008 | 224960 | 2315
-BenchmarkMartini_GithubAll | 100 | 12609209 | 237952 | 2686
-BenchmarkPat_GithubAll | 300 | 4830398 | 1504101 | 32222
-BenchmarkPossum_GithubAll | 10000 | 301716 | 97440 | 812
-BenchmarkR2router_GithubAll | 10000 | 270691 | 77328 | 1182
-BenchmarkRevel_GithubAll | 1000 | 1491919 | 345553 | 5918
-BenchmarkRivet_GithubAll | 10000 | 283860 | 84272 | 1079
-BenchmarkTango_GithubAll | 5000 | 473821 | 87078 | 2470
-BenchmarkTigerTonic_GithubAll | 2000 | 1120131 | 241088 | 6052
-BenchmarkTraffic_GithubAll | 200 | 8708979 | 2664762 | 22390
-BenchmarkVulcan_GithubAll | 5000 | 353392 | 19894 | 609
-BenchmarkZeus_GithubAll | 2000 | 944234 | 300688 | 2648
-
-(1): Total Repetitions
-(2): Single Repetition Duration (ns/op)
-(3): Heap Memory (B/op)
-(4): Average Allocations per Repetition (allocs/op)
-
-## Gin v1. stable
-
-- [x] Zero allocation router.
-- [x] Still the fastest http router and framework. From routing to writing.
-- [x] Complete suite of unit tests
-- [x] Battle tested
-- [x] API frozen, new releases will not break your code.
-
-
-## Start using it
-
-1. Download and install it:
-
- ```sh
- $ go get gopkg.in/gin-gonic/gin.v1
- ```
-
-2. Import it in your code:
-
- ```go
- import "gopkg.in/gin-gonic/gin.v1"
- ```
-
-3. (Optional) Import `net/http`. This is required for example if using constants such as `http.StatusOK`.
-
- ```go
- import "net/http"
- ```
-
-4. (Optional) Use latest changes (note: they may be broken and/or unstable):
- ```sh
- $ GIN_PATH=$GOPATH/src/gopkg.in/gin-gonic/gin.v1
- $ git -C $GIN_PATH checkout develop
- $ git -C $GIN_PATH pull origin develop
- ```
-
-## API Examples
-
-### Using GET, POST, PUT, PATCH, DELETE and OPTIONS
-
-```go
-func main() {
- // Disable Console Color
- // gin.DisableConsoleColor()
-
- // Creates a gin router with default middleware:
- // logger and recovery (crash-free) middleware
- router := gin.Default()
-
- router.GET("/someGet", getting)
- router.POST("/somePost", posting)
- router.PUT("/somePut", putting)
- router.DELETE("/someDelete", deleting)
- router.PATCH("/somePatch", patching)
- router.HEAD("/someHead", head)
- router.OPTIONS("/someOptions", options)
-
- // By default it serves on :8080 unless a
- // PORT environment variable was defined.
- router.Run()
- // router.Run(":3000") for a hard coded port
-}
-```
-
-### Parameters in path
-
-```go
-func main() {
- router := gin.Default()
-
- // This handler will match /user/john but will not match neither /user/ or /user
- router.GET("/user/:name", func(c *gin.Context) {
- name := c.Param("name")
- c.String(http.StatusOK, "Hello %s", name)
- })
-
- // However, this one will match /user/john/ and also /user/john/send
- // If no other routers match /user/john, it will redirect to /user/john/
- router.GET("/user/:name/*action", func(c *gin.Context) {
- name := c.Param("name")
- action := c.Param("action")
- message := name + " is " + action
- c.String(http.StatusOK, message)
- })
-
- router.Run(":8080")
-}
-```
-
-### Querystring parameters
-```go
-func main() {
- router := gin.Default()
-
- // Query string parameters are parsed using the existing underlying request object.
- // The request responds to a url matching: /welcome?firstname=Jane&lastname=Doe
- router.GET("/welcome", func(c *gin.Context) {
- firstname := c.DefaultQuery("firstname", "Guest")
- lastname := c.Query("lastname") // shortcut for c.Request.URL.Query().Get("lastname")
-
- c.String(http.StatusOK, "Hello %s %s", firstname, lastname)
- })
- router.Run(":8080")
-}
-```
-
-### Multipart/Urlencoded Form
-
-```go
-func main() {
- router := gin.Default()
-
- router.POST("/form_post", func(c *gin.Context) {
- message := c.PostForm("message")
- nick := c.DefaultPostForm("nick", "anonymous")
-
- c.JSON(200, gin.H{
- "status": "posted",
- "message": message,
- "nick": nick,
- })
- })
- router.Run(":8080")
-}
-```
-
-### Another example: query + post form
-
-```
-POST /post?id=1234&page=1 HTTP/1.1
-Content-Type: application/x-www-form-urlencoded
-
-name=manu&message=this_is_great
-```
-
-```go
-func main() {
- router := gin.Default()
-
- router.POST("/post", func(c *gin.Context) {
-
- id := c.Query("id")
- page := c.DefaultQuery("page", "0")
- name := c.PostForm("name")
- message := c.PostForm("message")
-
- fmt.Printf("id: %s; page: %s; name: %s; message: %s", id, page, name, message)
- })
- router.Run(":8080")
-}
-```
-
-```
-id: 1234; page: 1; name: manu; message: this_is_great
-```
-
-### Upload files
-
-#### Single file
-
-References issue [#774](https://github.com/gin-gonic/gin/issues/774) and detail [example code](examples/upload-file/single).
-
-```go
-func main() {
- router := gin.Default()
- router.POST("/upload", func(c *gin.Context) {
- // single file
- file, _ := c.FormFile("file")
- log.Println(file.Filename)
-
- c.String(http.StatusOK, fmt.Printf("'%s' uploaded!", file.Filename))
- })
- router.Run(":8080")
-}
-```
-
-How to `curl`:
-
-```bash
-curl -X POST http://localhost:8080/upload \
- -F "file=@/Users/appleboy/test.zip" \
- -H "Content-Type: multipart/form-data"
-```
-
-#### Multiple files
-
-See the detail [example code](examples/upload-file/multiple).
-
-```go
-func main() {
- router := gin.Default()
- router.POST("/upload", func(c *gin.Context) {
- // Multipart form
- form, _ := c.MultipartForm()
- files := form.File["upload[]"]
-
- for _, file := range files {
- log.Println(file.Filename)
- }
- c.String(http.StatusOK, fmt.Printf("%d files uploaded!", len(files)))
- })
- router.Run(":8080")
-}
-```
-
-How to `curl`:
-
-```bash
-curl -X POST http://localhost:8080/upload \
- -F "upload[]=@/Users/appleboy/test1.zip" \
- -F "upload[]=@/Users/appleboy/test2.zip" \
- -H "Content-Type: multipart/form-data"
-```
-
-### Grouping routes
-
-```go
-func main() {
- router := gin.Default()
-
- // Simple group: v1
- v1 := router.Group("/v1")
- {
- v1.POST("/login", loginEndpoint)
- v1.POST("/submit", submitEndpoint)
- v1.POST("/read", readEndpoint)
- }
-
- // Simple group: v2
- v2 := router.Group("/v2")
- {
- v2.POST("/login", loginEndpoint)
- v2.POST("/submit", submitEndpoint)
- v2.POST("/read", readEndpoint)
- }
-
- router.Run(":8080")
-}
-```
-
-
-### Blank Gin without middleware by default
-
-Use
-
-```go
-r := gin.New()
-```
-instead of
-
-```go
-r := gin.Default()
-```
-
-
-### Using middleware
-```go
-func main() {
- // Creates a router without any middleware by default
- r := gin.New()
-
- // Global middleware
- r.Use(gin.Logger())
- r.Use(gin.Recovery())
-
- // Per route middleware, you can add as many as you desire.
- r.GET("/benchmark", MyBenchLogger(), benchEndpoint)
-
- // Authorization group
- // authorized := r.Group("/", AuthRequired())
- // exactly the same as:
- authorized := r.Group("/")
- // per group middleware! in this case we use the custom created
- // AuthRequired() middleware just in the "authorized" group.
- authorized.Use(AuthRequired())
- {
- authorized.POST("/login", loginEndpoint)
- authorized.POST("/submit", submitEndpoint)
- authorized.POST("/read", readEndpoint)
-
- // nested group
- testing := authorized.Group("testing")
- testing.GET("/analytics", analyticsEndpoint)
- }
-
- // Listen and serve on 0.0.0.0:8080
- r.Run(":8080")
-}
-```
-
-### Model binding and validation
-
-To bind a request body into a type, use model binding. We currently support binding of JSON, XML and standard form values (foo=bar&boo=baz).
-
-Note that you need to set the corresponding binding tag on all fields you want to bind. For example, when binding from JSON, set `json:"fieldname"`.
-
-When using the Bind-method, Gin tries to infer the binder depending on the Content-Type header. If you are sure what you are binding, you can use BindWith.
-
-You can also specify that specific fields are required. If a field is decorated with `binding:"required"` and has a empty value when binding, the current request will fail with an error.
-
-```go
-// Binding from JSON
-type Login struct {
- User string `form:"user" json:"user" binding:"required"`
- Password string `form:"password" json:"password" binding:"required"`
-}
-
-func main() {
- router := gin.Default()
-
- // Example for binding JSON ({"user": "manu", "password": "123"})
- router.POST("/loginJSON", func(c *gin.Context) {
- var json Login
- if c.BindJSON(&json) == nil {
- if json.User == "manu" && json.Password == "123" {
- c.JSON(http.StatusOK, gin.H{"status": "you are logged in"})
- } else {
- c.JSON(http.StatusUnauthorized, gin.H{"status": "unauthorized"})
- }
- }
- })
-
- // Example for binding a HTML form (user=manu&password=123)
- router.POST("/loginForm", func(c *gin.Context) {
- var form Login
- // This will infer what binder to use depending on the content-type header.
- if c.Bind(&form) == nil {
- if form.User == "manu" && form.Password == "123" {
- c.JSON(http.StatusOK, gin.H{"status": "you are logged in"})
- } else {
- c.JSON(http.StatusUnauthorized, gin.H{"status": "unauthorized"})
- }
- }
- })
-
- // Listen and serve on 0.0.0.0:8080
- router.Run(":8080")
-}
-```
-
-### Bind Query String
-
-See the [detail information](https://github.com/gin-gonic/gin/issues/742#issuecomment-264681292).
-
-```go
-package main
-
-import "log"
-import "github.com/gin-gonic/gin"
-
-type Person struct {
- Name string `form:"name"`
- Address string `form:"address"`
-}
-
-func main() {
- route := gin.Default()
- route.GET("/testing", startPage)
- route.Run(":8085")
-}
-
-func startPage(c *gin.Context) {
- var person Person
- // If `GET`, only `Form` binding engine (`query`) used.
- // If `POST`, first checks the `content-type` for `JSON` or `XML`, then uses `Form` (`form-data`).
- // See more at https://github.com/gin-gonic/gin/blob/develop/binding/binding.go#L45
- if c.Bind(&person) == nil {
- log.Println(person.Name)
- log.Println(person.Address)
- }
-
- c.String(200, "Success")
-}
-```
-
-
-### Multipart/Urlencoded binding
-
-```go
-package main
-
-import (
- "gopkg.in/gin-gonic/gin.v1"
-)
-
-type LoginForm struct {
- User string `form:"user" binding:"required"`
- Password string `form:"password" binding:"required"`
-}
-
-func main() {
- router := gin.Default()
- router.POST("/login", func(c *gin.Context) {
- // you can bind multipart form with explicit binding declaration:
- // c.BindWith(&form, binding.Form)
- // or you can simply use autobinding with Bind method:
- var form LoginForm
- // in this case proper binding will be automatically selected
- if c.Bind(&form) == nil {
- if form.User == "user" && form.Password == "password" {
- c.JSON(200, gin.H{"status": "you are logged in"})
- } else {
- c.JSON(401, gin.H{"status": "unauthorized"})
- }
- }
- })
- router.Run(":8080")
-}
-```
-
-Test it with:
-```sh
-$ curl -v --form user=user --form password=password http://localhost:8080/login
-```
-
-
-### XML, JSON and YAML rendering
-
-```go
-func main() {
- r := gin.Default()
-
- // gin.H is a shortcut for map[string]interface{}
- r.GET("/someJSON", func(c *gin.Context) {
- c.JSON(http.StatusOK, gin.H{"message": "hey", "status": http.StatusOK})
- })
-
- r.GET("/moreJSON", func(c *gin.Context) {
- // You also can use a struct
- var msg struct {
- Name string `json:"user"`
- Message string
- Number int
- }
- msg.Name = "Lena"
- msg.Message = "hey"
- msg.Number = 123
- // Note that msg.Name becomes "user" in the JSON
- // Will output : {"user": "Lena", "Message": "hey", "Number": 123}
- c.JSON(http.StatusOK, msg)
- })
-
- r.GET("/someXML", func(c *gin.Context) {
- c.XML(http.StatusOK, gin.H{"message": "hey", "status": http.StatusOK})
- })
-
- r.GET("/someYAML", func(c *gin.Context) {
- c.YAML(http.StatusOK, gin.H{"message": "hey", "status": http.StatusOK})
- })
-
- // Listen and serve on 0.0.0.0:8080
- r.Run(":8080")
-}
-```
-
-### Serving static files
-
-```go
-func main() {
- router := gin.Default()
- router.Static("/assets", "./assets")
- router.StaticFS("/more_static", http.Dir("my_file_system"))
- router.StaticFile("/favicon.ico", "./resources/favicon.ico")
-
- // Listen and serve on 0.0.0.0:8080
- router.Run(":8080")
-}
-```
-
-### HTML rendering
-
-Using LoadHTMLGlob() or LoadHTMLFiles()
-
-```go
-func main() {
- router := gin.Default()
- router.LoadHTMLGlob("templates/*")
- //router.LoadHTMLFiles("templates/template1.html", "templates/template2.html")
- router.GET("/index", func(c *gin.Context) {
- c.HTML(http.StatusOK, "index.tmpl", gin.H{
- "title": "Main website",
- })
- })
- router.Run(":8080")
-}
-```
-templates/index.tmpl
-```html
-
- map_field = N;
- is encoded in the same way as
- message MapFieldEntry {
- key_type key = 1;
- value_type value = 2;
- }
- repeated MapFieldEntry map_field = N;
- */
-
- v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
- if v.Len() == 0 {
- return nil
- }
-
- keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
- enc := func() error {
- if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
- return err
- }
- if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil && err != ErrNil {
- return err
- }
- return nil
- }
-
- // Don't sort map keys. It is not required by the spec, and C++ doesn't do it.
- for _, key := range v.MapKeys() {
- val := v.MapIndex(key)
-
- keycopy.Set(key)
- valcopy.Set(val)
-
- o.buf = append(o.buf, p.tagcode...)
- if err := o.enc_len_thing(enc, &state); err != nil {
- return err
- }
- }
- return nil
-}
-
-func size_new_map(p *Properties, base structPointer) int {
- v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-
- keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
- n := 0
- for _, key := range v.MapKeys() {
- val := v.MapIndex(key)
- keycopy.Set(key)
- valcopy.Set(val)
-
- // Tag codes for key and val are the responsibility of the sub-sizer.
- keysize := p.mkeyprop.size(p.mkeyprop, keybase)
- valsize := p.mvalprop.size(p.mvalprop, valbase)
- entry := keysize + valsize
- // Add on tag code and length of map entry itself.
- n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
- }
- return n
-}
-
-// mapEncodeScratch returns a new reflect.Value matching the map's value type,
-// and a structPointer suitable for passing to an encoder or sizer.
-func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
- // Prepare addressable doubly-indirect placeholders for the key and value types.
- // This is needed because the element-type encoders expect **T, but the map iteration produces T.
-
- keycopy = reflect.New(mapType.Key()).Elem() // addressable K
- keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
- keyptr.Set(keycopy.Addr()) //
- keybase = toStructPointer(keyptr.Addr()) // **K
-
- // Value types are more varied and require special handling.
- switch mapType.Elem().Kind() {
- case reflect.Slice:
- // []byte
- var dummy []byte
- valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
- valbase = toStructPointer(valcopy.Addr())
- case reflect.Ptr:
- // message; the generated field type is map[K]*Msg (so V is *Msg),
- // so we only need one level of indirection.
- valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
- valbase = toStructPointer(valcopy.Addr())
- default:
- // everything else
- valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
- valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
- valptr.Set(valcopy.Addr()) //
- valbase = toStructPointer(valptr.Addr()) // **V
- }
- return
-}
-
-// Encode a struct.
-func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
- var state errorState
- // Encode fields in tag order so that decoders may use optimizations
- // that depend on the ordering.
- // https://developers.google.com/protocol-buffers/docs/encoding#order
- for _, i := range prop.order {
- p := prop.Prop[i]
- if p.enc != nil {
- err := p.enc(o, p, base)
- if err != nil {
- if err == ErrNil {
- if p.Required && state.err == nil {
- state.err = &RequiredNotSetError{p.Name}
- }
- } else if err == errRepeatedHasNil {
- // Give more context to nil values in repeated fields.
- return errors.New("repeated field " + p.OrigName + " has nil element")
- } else if !state.shouldContinue(err, p) {
- return err
- }
- }
- if len(o.buf) > maxMarshalSize {
- return ErrTooLarge
- }
- }
- }
-
- // Do oneof fields.
- if prop.oneofMarshaler != nil {
- m := structPointer_Interface(base, prop.stype).(Message)
- if err := prop.oneofMarshaler(m, o); err == ErrNil {
- return errOneofHasNil
- } else if err != nil {
- return err
- }
- }
-
- // Add unrecognized fields at the end.
- if prop.unrecField.IsValid() {
- v := *structPointer_Bytes(base, prop.unrecField)
- if len(o.buf)+len(v) > maxMarshalSize {
- return ErrTooLarge
- }
- if len(v) > 0 {
- o.buf = append(o.buf, v...)
- }
- }
-
- return state.err
-}
-
-func size_struct(prop *StructProperties, base structPointer) (n int) {
- for _, i := range prop.order {
- p := prop.Prop[i]
- if p.size != nil {
- n += p.size(p, base)
- }
- }
-
- // Add unrecognized fields at the end.
- if prop.unrecField.IsValid() {
- v := *structPointer_Bytes(base, prop.unrecField)
- n += len(v)
- }
-
- // Factor in any oneof fields.
- if prop.oneofSizer != nil {
- m := structPointer_Interface(base, prop.stype).(Message)
- n += prop.oneofSizer(m)
- }
-
- return
-}
-
-var zeroes [20]byte // longer than any conceivable sizeVarint
-
-// Encode a struct, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
- return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
-}
-
-// Encode something, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
- iLen := len(o.buf)
- o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
- iMsg := len(o.buf)
- err := enc()
- if err != nil && !state.shouldContinue(err, nil) {
- return err
- }
- lMsg := len(o.buf) - iMsg
- lLen := sizeVarint(uint64(lMsg))
- switch x := lLen - (iMsg - iLen); {
- case x > 0: // actual length is x bytes larger than the space we reserved
- // Move msg x bytes right.
- o.buf = append(o.buf, zeroes[:x]...)
- copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
- case x < 0: // actual length is x bytes smaller than the space we reserved
- // Move msg x bytes left.
- copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
- o.buf = o.buf[:len(o.buf)+x] // x is negative
- }
- // Encode the length in the reserved space.
- o.buf = o.buf[:iLen]
- o.EncodeVarint(uint64(lMsg))
- o.buf = o.buf[:len(o.buf)+lMsg]
- return state.err
-}
-
-// errorState maintains the first error that occurs and updates that error
-// with additional context.
-type errorState struct {
- err error
-}
-
-// shouldContinue reports whether encoding should continue upon encountering the
-// given error. If the error is RequiredNotSetError, shouldContinue returns true
-// and, if this is the first appearance of that error, remembers it for future
-// reporting.
-//
-// If prop is not nil, it may update any error with additional context about the
-// field with the error.
-func (s *errorState) shouldContinue(err error, prop *Properties) bool {
- // Ignore unset required fields.
- reqNotSet, ok := err.(*RequiredNotSetError)
- if !ok {
- return false
- }
- if s.err == nil {
- if prop != nil {
- err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
- }
- s.err = err
- }
- return true
-}
diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go
deleted file mode 100644
index 2ed1cf5..0000000
--- a/vendor/github.com/golang/protobuf/proto/equal.go
+++ /dev/null
@@ -1,300 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Protocol buffer comparison.
-
-package proto
-
-import (
- "bytes"
- "log"
- "reflect"
- "strings"
-)
-
-/*
-Equal returns true iff protocol buffers a and b are equal.
-The arguments must both be pointers to protocol buffer structs.
-
-Equality is defined in this way:
- - Two messages are equal iff they are the same type,
- corresponding fields are equal, unknown field sets
- are equal, and extensions sets are equal.
- - Two set scalar fields are equal iff their values are equal.
- If the fields are of a floating-point type, remember that
- NaN != x for all x, including NaN. If the message is defined
- in a proto3 .proto file, fields are not "set"; specifically,
- zero length proto3 "bytes" fields are equal (nil == {}).
- - Two repeated fields are equal iff their lengths are the same,
- and their corresponding elements are equal. Note a "bytes" field,
- although represented by []byte, is not a repeated field and the
- rule for the scalar fields described above applies.
- - Two unset fields are equal.
- - Two unknown field sets are equal if their current
- encoded state is equal.
- - Two extension sets are equal iff they have corresponding
- elements that are pairwise equal.
- - Two map fields are equal iff their lengths are the same,
- and they contain the same set of elements. Zero-length map
- fields are equal.
- - Every other combination of things are not equal.
-
-The return value is undefined if a and b are not protocol buffers.
-*/
-func Equal(a, b Message) bool {
- if a == nil || b == nil {
- return a == b
- }
- v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
- if v1.Type() != v2.Type() {
- return false
- }
- if v1.Kind() == reflect.Ptr {
- if v1.IsNil() {
- return v2.IsNil()
- }
- if v2.IsNil() {
- return false
- }
- v1, v2 = v1.Elem(), v2.Elem()
- }
- if v1.Kind() != reflect.Struct {
- return false
- }
- return equalStruct(v1, v2)
-}
-
-// v1 and v2 are known to have the same type.
-func equalStruct(v1, v2 reflect.Value) bool {
- sprop := GetProperties(v1.Type())
- for i := 0; i < v1.NumField(); i++ {
- f := v1.Type().Field(i)
- if strings.HasPrefix(f.Name, "XXX_") {
- continue
- }
- f1, f2 := v1.Field(i), v2.Field(i)
- if f.Type.Kind() == reflect.Ptr {
- if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
- // both unset
- continue
- } else if n1 != n2 {
- // set/unset mismatch
- return false
- }
- b1, ok := f1.Interface().(raw)
- if ok {
- b2 := f2.Interface().(raw)
- // RawMessage
- if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
- return false
- }
- continue
- }
- f1, f2 = f1.Elem(), f2.Elem()
- }
- if !equalAny(f1, f2, sprop.Prop[i]) {
- return false
- }
- }
-
- if em1 := v1.FieldByName("XXX_InternalExtensions"); em1.IsValid() {
- em2 := v2.FieldByName("XXX_InternalExtensions")
- if !equalExtensions(v1.Type(), em1.Interface().(XXX_InternalExtensions), em2.Interface().(XXX_InternalExtensions)) {
- return false
- }
- }
-
- if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
- em2 := v2.FieldByName("XXX_extensions")
- if !equalExtMap(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
- return false
- }
- }
-
- uf := v1.FieldByName("XXX_unrecognized")
- if !uf.IsValid() {
- return true
- }
-
- u1 := uf.Bytes()
- u2 := v2.FieldByName("XXX_unrecognized").Bytes()
- if !bytes.Equal(u1, u2) {
- return false
- }
-
- return true
-}
-
-// v1 and v2 are known to have the same type.
-// prop may be nil.
-func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
- if v1.Type() == protoMessageType {
- m1, _ := v1.Interface().(Message)
- m2, _ := v2.Interface().(Message)
- return Equal(m1, m2)
- }
- switch v1.Kind() {
- case reflect.Bool:
- return v1.Bool() == v2.Bool()
- case reflect.Float32, reflect.Float64:
- return v1.Float() == v2.Float()
- case reflect.Int32, reflect.Int64:
- return v1.Int() == v2.Int()
- case reflect.Interface:
- // Probably a oneof field; compare the inner values.
- n1, n2 := v1.IsNil(), v2.IsNil()
- if n1 || n2 {
- return n1 == n2
- }
- e1, e2 := v1.Elem(), v2.Elem()
- if e1.Type() != e2.Type() {
- return false
- }
- return equalAny(e1, e2, nil)
- case reflect.Map:
- if v1.Len() != v2.Len() {
- return false
- }
- for _, key := range v1.MapKeys() {
- val2 := v2.MapIndex(key)
- if !val2.IsValid() {
- // This key was not found in the second map.
- return false
- }
- if !equalAny(v1.MapIndex(key), val2, nil) {
- return false
- }
- }
- return true
- case reflect.Ptr:
- // Maps may have nil values in them, so check for nil.
- if v1.IsNil() && v2.IsNil() {
- return true
- }
- if v1.IsNil() != v2.IsNil() {
- return false
- }
- return equalAny(v1.Elem(), v2.Elem(), prop)
- case reflect.Slice:
- if v1.Type().Elem().Kind() == reflect.Uint8 {
- // short circuit: []byte
-
- // Edge case: if this is in a proto3 message, a zero length
- // bytes field is considered the zero value.
- if prop != nil && prop.proto3 && v1.Len() == 0 && v2.Len() == 0 {
- return true
- }
- if v1.IsNil() != v2.IsNil() {
- return false
- }
- return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
- }
-
- if v1.Len() != v2.Len() {
- return false
- }
- for i := 0; i < v1.Len(); i++ {
- if !equalAny(v1.Index(i), v2.Index(i), prop) {
- return false
- }
- }
- return true
- case reflect.String:
- return v1.Interface().(string) == v2.Interface().(string)
- case reflect.Struct:
- return equalStruct(v1, v2)
- case reflect.Uint32, reflect.Uint64:
- return v1.Uint() == v2.Uint()
- }
-
- // unknown type, so not a protocol buffer
- log.Printf("proto: don't know how to compare %v", v1)
- return false
-}
-
-// base is the struct type that the extensions are based on.
-// x1 and x2 are InternalExtensions.
-func equalExtensions(base reflect.Type, x1, x2 XXX_InternalExtensions) bool {
- em1, _ := x1.extensionsRead()
- em2, _ := x2.extensionsRead()
- return equalExtMap(base, em1, em2)
-}
-
-func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool {
- if len(em1) != len(em2) {
- return false
- }
-
- for extNum, e1 := range em1 {
- e2, ok := em2[extNum]
- if !ok {
- return false
- }
-
- m1, m2 := e1.value, e2.value
-
- if m1 != nil && m2 != nil {
- // Both are unencoded.
- if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
- return false
- }
- continue
- }
-
- // At least one is encoded. To do a semantically correct comparison
- // we need to unmarshal them first.
- var desc *ExtensionDesc
- if m := extensionMaps[base]; m != nil {
- desc = m[extNum]
- }
- if desc == nil {
- log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
- continue
- }
- var err error
- if m1 == nil {
- m1, err = decodeExtension(e1.enc, desc)
- }
- if m2 == nil && err == nil {
- m2, err = decodeExtension(e2.enc, desc)
- }
- if err != nil {
- // The encoded form is invalid.
- log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
- return false
- }
- if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
- return false
- }
- }
-
- return true
-}
diff --git a/vendor/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go
deleted file mode 100644
index eaad218..0000000
--- a/vendor/github.com/golang/protobuf/proto/extensions.go
+++ /dev/null
@@ -1,587 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Types and routines for supporting protocol buffer extensions.
- */
-
-import (
- "errors"
- "fmt"
- "reflect"
- "strconv"
- "sync"
-)
-
-// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
-var ErrMissingExtension = errors.New("proto: missing extension")
-
-// ExtensionRange represents a range of message extensions for a protocol buffer.
-// Used in code generated by the protocol compiler.
-type ExtensionRange struct {
- Start, End int32 // both inclusive
-}
-
-// extendableProto is an interface implemented by any protocol buffer generated by the current
-// proto compiler that may be extended.
-type extendableProto interface {
- Message
- ExtensionRangeArray() []ExtensionRange
- extensionsWrite() map[int32]Extension
- extensionsRead() (map[int32]Extension, sync.Locker)
-}
-
-// extendableProtoV1 is an interface implemented by a protocol buffer generated by the previous
-// version of the proto compiler that may be extended.
-type extendableProtoV1 interface {
- Message
- ExtensionRangeArray() []ExtensionRange
- ExtensionMap() map[int32]Extension
-}
-
-// extensionAdapter is a wrapper around extendableProtoV1 that implements extendableProto.
-type extensionAdapter struct {
- extendableProtoV1
-}
-
-func (e extensionAdapter) extensionsWrite() map[int32]Extension {
- return e.ExtensionMap()
-}
-
-func (e extensionAdapter) extensionsRead() (map[int32]Extension, sync.Locker) {
- return e.ExtensionMap(), notLocker{}
-}
-
-// notLocker is a sync.Locker whose Lock and Unlock methods are nops.
-type notLocker struct{}
-
-func (n notLocker) Lock() {}
-func (n notLocker) Unlock() {}
-
-// extendable returns the extendableProto interface for the given generated proto message.
-// If the proto message has the old extension format, it returns a wrapper that implements
-// the extendableProto interface.
-func extendable(p interface{}) (extendableProto, bool) {
- if ep, ok := p.(extendableProto); ok {
- return ep, ok
- }
- if ep, ok := p.(extendableProtoV1); ok {
- return extensionAdapter{ep}, ok
- }
- return nil, false
-}
-
-// XXX_InternalExtensions is an internal representation of proto extensions.
-//
-// Each generated message struct type embeds an anonymous XXX_InternalExtensions field,
-// thus gaining the unexported 'extensions' method, which can be called only from the proto package.
-//
-// The methods of XXX_InternalExtensions are not concurrency safe in general,
-// but calls to logically read-only methods such as has and get may be executed concurrently.
-type XXX_InternalExtensions struct {
- // The struct must be indirect so that if a user inadvertently copies a
- // generated message and its embedded XXX_InternalExtensions, they
- // avoid the mayhem of a copied mutex.
- //
- // The mutex serializes all logically read-only operations to p.extensionMap.
- // It is up to the client to ensure that write operations to p.extensionMap are
- // mutually exclusive with other accesses.
- p *struct {
- mu sync.Mutex
- extensionMap map[int32]Extension
- }
-}
-
-// extensionsWrite returns the extension map, creating it on first use.
-func (e *XXX_InternalExtensions) extensionsWrite() map[int32]Extension {
- if e.p == nil {
- e.p = new(struct {
- mu sync.Mutex
- extensionMap map[int32]Extension
- })
- e.p.extensionMap = make(map[int32]Extension)
- }
- return e.p.extensionMap
-}
-
-// extensionsRead returns the extensions map for read-only use. It may be nil.
-// The caller must hold the returned mutex's lock when accessing Elements within the map.
-func (e *XXX_InternalExtensions) extensionsRead() (map[int32]Extension, sync.Locker) {
- if e.p == nil {
- return nil, nil
- }
- return e.p.extensionMap, &e.p.mu
-}
-
-var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
-var extendableProtoV1Type = reflect.TypeOf((*extendableProtoV1)(nil)).Elem()
-
-// ExtensionDesc represents an extension specification.
-// Used in generated code from the protocol compiler.
-type ExtensionDesc struct {
- ExtendedType Message // nil pointer to the type that is being extended
- ExtensionType interface{} // nil pointer to the extension type
- Field int32 // field number
- Name string // fully-qualified name of extension, for text formatting
- Tag string // protobuf tag style
- Filename string // name of the file in which the extension is defined
-}
-
-func (ed *ExtensionDesc) repeated() bool {
- t := reflect.TypeOf(ed.ExtensionType)
- return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
-}
-
-// Extension represents an extension in a message.
-type Extension struct {
- // When an extension is stored in a message using SetExtension
- // only desc and value are set. When the message is marshaled
- // enc will be set to the encoded form of the message.
- //
- // When a message is unmarshaled and contains extensions, each
- // extension will have only enc set. When such an extension is
- // accessed using GetExtension (or GetExtensions) desc and value
- // will be set.
- desc *ExtensionDesc
- value interface{}
- enc []byte
-}
-
-// SetRawExtension is for testing only.
-func SetRawExtension(base Message, id int32, b []byte) {
- epb, ok := extendable(base)
- if !ok {
- return
- }
- extmap := epb.extensionsWrite()
- extmap[id] = Extension{enc: b}
-}
-
-// isExtensionField returns true iff the given field number is in an extension range.
-func isExtensionField(pb extendableProto, field int32) bool {
- for _, er := range pb.ExtensionRangeArray() {
- if er.Start <= field && field <= er.End {
- return true
- }
- }
- return false
-}
-
-// checkExtensionTypes checks that the given extension is valid for pb.
-func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
- var pbi interface{} = pb
- // Check the extended type.
- if ea, ok := pbi.(extensionAdapter); ok {
- pbi = ea.extendableProtoV1
- }
- if a, b := reflect.TypeOf(pbi), reflect.TypeOf(extension.ExtendedType); a != b {
- return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
- }
- // Check the range.
- if !isExtensionField(pb, extension.Field) {
- return errors.New("proto: bad extension number; not in declared ranges")
- }
- return nil
-}
-
-// extPropKey is sufficient to uniquely identify an extension.
-type extPropKey struct {
- base reflect.Type
- field int32
-}
-
-var extProp = struct {
- sync.RWMutex
- m map[extPropKey]*Properties
-}{
- m: make(map[extPropKey]*Properties),
-}
-
-func extensionProperties(ed *ExtensionDesc) *Properties {
- key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
-
- extProp.RLock()
- if prop, ok := extProp.m[key]; ok {
- extProp.RUnlock()
- return prop
- }
- extProp.RUnlock()
-
- extProp.Lock()
- defer extProp.Unlock()
- // Check again.
- if prop, ok := extProp.m[key]; ok {
- return prop
- }
-
- prop := new(Properties)
- prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
- extProp.m[key] = prop
- return prop
-}
-
-// encode encodes any unmarshaled (unencoded) extensions in e.
-func encodeExtensions(e *XXX_InternalExtensions) error {
- m, mu := e.extensionsRead()
- if m == nil {
- return nil // fast path
- }
- mu.Lock()
- defer mu.Unlock()
- return encodeExtensionsMap(m)
-}
-
-// encode encodes any unmarshaled (unencoded) extensions in e.
-func encodeExtensionsMap(m map[int32]Extension) error {
- for k, e := range m {
- if e.value == nil || e.desc == nil {
- // Extension is only in its encoded form.
- continue
- }
-
- // We don't skip extensions that have an encoded form set,
- // because the extension value may have been mutated after
- // the last time this function was called.
-
- et := reflect.TypeOf(e.desc.ExtensionType)
- props := extensionProperties(e.desc)
-
- p := NewBuffer(nil)
- // If e.value has type T, the encoder expects a *struct{ X T }.
- // Pass a *T with a zero field and hope it all works out.
- x := reflect.New(et)
- x.Elem().Set(reflect.ValueOf(e.value))
- if err := props.enc(p, props, toStructPointer(x)); err != nil {
- return err
- }
- e.enc = p.buf
- m[k] = e
- }
- return nil
-}
-
-func extensionsSize(e *XXX_InternalExtensions) (n int) {
- m, mu := e.extensionsRead()
- if m == nil {
- return 0
- }
- mu.Lock()
- defer mu.Unlock()
- return extensionsMapSize(m)
-}
-
-func extensionsMapSize(m map[int32]Extension) (n int) {
- for _, e := range m {
- if e.value == nil || e.desc == nil {
- // Extension is only in its encoded form.
- n += len(e.enc)
- continue
- }
-
- // We don't skip extensions that have an encoded form set,
- // because the extension value may have been mutated after
- // the last time this function was called.
-
- et := reflect.TypeOf(e.desc.ExtensionType)
- props := extensionProperties(e.desc)
-
- // If e.value has type T, the encoder expects a *struct{ X T }.
- // Pass a *T with a zero field and hope it all works out.
- x := reflect.New(et)
- x.Elem().Set(reflect.ValueOf(e.value))
- n += props.size(props, toStructPointer(x))
- }
- return
-}
-
-// HasExtension returns whether the given extension is present in pb.
-func HasExtension(pb Message, extension *ExtensionDesc) bool {
- // TODO: Check types, field numbers, etc.?
- epb, ok := extendable(pb)
- if !ok {
- return false
- }
- extmap, mu := epb.extensionsRead()
- if extmap == nil {
- return false
- }
- mu.Lock()
- _, ok = extmap[extension.Field]
- mu.Unlock()
- return ok
-}
-
-// ClearExtension removes the given extension from pb.
-func ClearExtension(pb Message, extension *ExtensionDesc) {
- epb, ok := extendable(pb)
- if !ok {
- return
- }
- // TODO: Check types, field numbers, etc.?
- extmap := epb.extensionsWrite()
- delete(extmap, extension.Field)
-}
-
-// GetExtension parses and returns the given extension of pb.
-// If the extension is not present and has no default value it returns ErrMissingExtension.
-func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
- epb, ok := extendable(pb)
- if !ok {
- return nil, errors.New("proto: not an extendable proto")
- }
-
- if err := checkExtensionTypes(epb, extension); err != nil {
- return nil, err
- }
-
- emap, mu := epb.extensionsRead()
- if emap == nil {
- return defaultExtensionValue(extension)
- }
- mu.Lock()
- defer mu.Unlock()
- e, ok := emap[extension.Field]
- if !ok {
- // defaultExtensionValue returns the default value or
- // ErrMissingExtension if there is no default.
- return defaultExtensionValue(extension)
- }
-
- if e.value != nil {
- // Already decoded. Check the descriptor, though.
- if e.desc != extension {
- // This shouldn't happen. If it does, it means that
- // GetExtension was called twice with two different
- // descriptors with the same field number.
- return nil, errors.New("proto: descriptor conflict")
- }
- return e.value, nil
- }
-
- v, err := decodeExtension(e.enc, extension)
- if err != nil {
- return nil, err
- }
-
- // Remember the decoded version and drop the encoded version.
- // That way it is safe to mutate what we return.
- e.value = v
- e.desc = extension
- e.enc = nil
- emap[extension.Field] = e
- return e.value, nil
-}
-
-// defaultExtensionValue returns the default value for extension.
-// If no default for an extension is defined ErrMissingExtension is returned.
-func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
- t := reflect.TypeOf(extension.ExtensionType)
- props := extensionProperties(extension)
-
- sf, _, err := fieldDefault(t, props)
- if err != nil {
- return nil, err
- }
-
- if sf == nil || sf.value == nil {
- // There is no default value.
- return nil, ErrMissingExtension
- }
-
- if t.Kind() != reflect.Ptr {
- // We do not need to return a Ptr, we can directly return sf.value.
- return sf.value, nil
- }
-
- // We need to return an interface{} that is a pointer to sf.value.
- value := reflect.New(t).Elem()
- value.Set(reflect.New(value.Type().Elem()))
- if sf.kind == reflect.Int32 {
- // We may have an int32 or an enum, but the underlying data is int32.
- // Since we can't set an int32 into a non int32 reflect.value directly
- // set it as a int32.
- value.Elem().SetInt(int64(sf.value.(int32)))
- } else {
- value.Elem().Set(reflect.ValueOf(sf.value))
- }
- return value.Interface(), nil
-}
-
-// decodeExtension decodes an extension encoded in b.
-func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
- o := NewBuffer(b)
-
- t := reflect.TypeOf(extension.ExtensionType)
-
- props := extensionProperties(extension)
-
- // t is a pointer to a struct, pointer to basic type or a slice.
- // Allocate a "field" to store the pointer/slice itself; the
- // pointer/slice will be stored here. We pass
- // the address of this field to props.dec.
- // This passes a zero field and a *t and lets props.dec
- // interpret it as a *struct{ x t }.
- value := reflect.New(t).Elem()
-
- for {
- // Discard wire type and field number varint. It isn't needed.
- if _, err := o.DecodeVarint(); err != nil {
- return nil, err
- }
-
- if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
- return nil, err
- }
-
- if o.index >= len(o.buf) {
- break
- }
- }
- return value.Interface(), nil
-}
-
-// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
-// The returned slice has the same length as es; missing extensions will appear as nil elements.
-func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
- epb, ok := extendable(pb)
- if !ok {
- return nil, errors.New("proto: not an extendable proto")
- }
- extensions = make([]interface{}, len(es))
- for i, e := range es {
- extensions[i], err = GetExtension(epb, e)
- if err == ErrMissingExtension {
- err = nil
- }
- if err != nil {
- return
- }
- }
- return
-}
-
-// ExtensionDescs returns a new slice containing pb's extension descriptors, in undefined order.
-// For non-registered extensions, ExtensionDescs returns an incomplete descriptor containing
-// just the Field field, which defines the extension's field number.
-func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
- epb, ok := extendable(pb)
- if !ok {
- return nil, fmt.Errorf("proto: %T is not an extendable proto.Message", pb)
- }
- registeredExtensions := RegisteredExtensions(pb)
-
- emap, mu := epb.extensionsRead()
- if emap == nil {
- return nil, nil
- }
- mu.Lock()
- defer mu.Unlock()
- extensions := make([]*ExtensionDesc, 0, len(emap))
- for extid, e := range emap {
- desc := e.desc
- if desc == nil {
- desc = registeredExtensions[extid]
- if desc == nil {
- desc = &ExtensionDesc{Field: extid}
- }
- }
-
- extensions = append(extensions, desc)
- }
- return extensions, nil
-}
-
-// SetExtension sets the specified extension of pb to the specified value.
-func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error {
- epb, ok := extendable(pb)
- if !ok {
- return errors.New("proto: not an extendable proto")
- }
- if err := checkExtensionTypes(epb, extension); err != nil {
- return err
- }
- typ := reflect.TypeOf(extension.ExtensionType)
- if typ != reflect.TypeOf(value) {
- return errors.New("proto: bad extension value type")
- }
- // nil extension values need to be caught early, because the
- // encoder can't distinguish an ErrNil due to a nil extension
- // from an ErrNil due to a missing field. Extensions are
- // always optional, so the encoder would just swallow the error
- // and drop all the extensions from the encoded message.
- if reflect.ValueOf(value).IsNil() {
- return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
- }
-
- extmap := epb.extensionsWrite()
- extmap[extension.Field] = Extension{desc: extension, value: value}
- return nil
-}
-
-// ClearAllExtensions clears all extensions from pb.
-func ClearAllExtensions(pb Message) {
- epb, ok := extendable(pb)
- if !ok {
- return
- }
- m := epb.extensionsWrite()
- for k := range m {
- delete(m, k)
- }
-}
-
-// A global registry of extensions.
-// The generated code will register the generated descriptors by calling RegisterExtension.
-
-var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
-
-// RegisterExtension is called from the generated code.
-func RegisterExtension(desc *ExtensionDesc) {
- st := reflect.TypeOf(desc.ExtendedType).Elem()
- m := extensionMaps[st]
- if m == nil {
- m = make(map[int32]*ExtensionDesc)
- extensionMaps[st] = m
- }
- if _, ok := m[desc.Field]; ok {
- panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
- }
- m[desc.Field] = desc
-}
-
-// RegisteredExtensions returns a map of the registered extensions of a
-// protocol buffer struct, indexed by the extension number.
-// The argument pb should be a nil pointer to the struct type.
-func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
- return extensionMaps[reflect.TypeOf(pb).Elem()]
-}
diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go
deleted file mode 100644
index ac4ddbc..0000000
--- a/vendor/github.com/golang/protobuf/proto/lib.go
+++ /dev/null
@@ -1,898 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-Package proto converts data structures to and from the wire format of
-protocol buffers. It works in concert with the Go source code generated
-for .proto files by the protocol compiler.
-
-A summary of the properties of the protocol buffer interface
-for a protocol buffer variable v:
-
- - Names are turned from camel_case to CamelCase for export.
- - There are no methods on v to set fields; just treat
- them as structure fields.
- - There are getters that return a field's value if set,
- and return the field's default value if unset.
- The getters work even if the receiver is a nil message.
- - The zero value for a struct is its correct initialization state.
- All desired fields must be set before marshaling.
- - A Reset() method will restore a protobuf struct to its zero state.
- - Non-repeated fields are pointers to the values; nil means unset.
- That is, optional or required field int32 f becomes F *int32.
- - Repeated fields are slices.
- - Helper functions are available to aid the setting of fields.
- msg.Foo = proto.String("hello") // set field
- - Constants are defined to hold the default values of all fields that
- have them. They have the form Default_StructName_FieldName.
- Because the getter methods handle defaulted values,
- direct use of these constants should be rare.
- - Enums are given type names and maps from names to values.
- Enum values are prefixed by the enclosing message's name, or by the
- enum's type name if it is a top-level enum. Enum types have a String
- method, and a Enum method to assist in message construction.
- - Nested messages, groups and enums have type names prefixed with the name of
- the surrounding message type.
- - Extensions are given descriptor names that start with E_,
- followed by an underscore-delimited list of the nested messages
- that contain it (if any) followed by the CamelCased name of the
- extension field itself. HasExtension, ClearExtension, GetExtension
- and SetExtension are functions for manipulating extensions.
- - Oneof field sets are given a single field in their message,
- with distinguished wrapper types for each possible field value.
- - Marshal and Unmarshal are functions to encode and decode the wire format.
-
-When the .proto file specifies `syntax="proto3"`, there are some differences:
-
- - Non-repeated fields of non-message type are values instead of pointers.
- - Getters are only generated for message and oneof fields.
- - Enum types do not get an Enum method.
-
-The simplest way to describe this is to see an example.
-Given file test.proto, containing
-
- package example;
-
- enum FOO { X = 17; }
-
- message Test {
- required string label = 1;
- optional int32 type = 2 [default=77];
- repeated int64 reps = 3;
- optional group OptionalGroup = 4 {
- required string RequiredField = 5;
- }
- oneof union {
- int32 number = 6;
- string name = 7;
- }
- }
-
-The resulting file, test.pb.go, is:
-
- package example
-
- import proto "github.com/golang/protobuf/proto"
- import math "math"
-
- type FOO int32
- const (
- FOO_X FOO = 17
- )
- var FOO_name = map[int32]string{
- 17: "X",
- }
- var FOO_value = map[string]int32{
- "X": 17,
- }
-
- func (x FOO) Enum() *FOO {
- p := new(FOO)
- *p = x
- return p
- }
- func (x FOO) String() string {
- return proto.EnumName(FOO_name, int32(x))
- }
- func (x *FOO) UnmarshalJSON(data []byte) error {
- value, err := proto.UnmarshalJSONEnum(FOO_value, data)
- if err != nil {
- return err
- }
- *x = FOO(value)
- return nil
- }
-
- type Test struct {
- Label *string `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
- Type *int32 `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
- Reps []int64 `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
- Optionalgroup *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
- // Types that are valid to be assigned to Union:
- // *Test_Number
- // *Test_Name
- Union isTest_Union `protobuf_oneof:"union"`
- XXX_unrecognized []byte `json:"-"`
- }
- func (m *Test) Reset() { *m = Test{} }
- func (m *Test) String() string { return proto.CompactTextString(m) }
- func (*Test) ProtoMessage() {}
-
- type isTest_Union interface {
- isTest_Union()
- }
-
- type Test_Number struct {
- Number int32 `protobuf:"varint,6,opt,name=number"`
- }
- type Test_Name struct {
- Name string `protobuf:"bytes,7,opt,name=name"`
- }
-
- func (*Test_Number) isTest_Union() {}
- func (*Test_Name) isTest_Union() {}
-
- func (m *Test) GetUnion() isTest_Union {
- if m != nil {
- return m.Union
- }
- return nil
- }
- const Default_Test_Type int32 = 77
-
- func (m *Test) GetLabel() string {
- if m != nil && m.Label != nil {
- return *m.Label
- }
- return ""
- }
-
- func (m *Test) GetType() int32 {
- if m != nil && m.Type != nil {
- return *m.Type
- }
- return Default_Test_Type
- }
-
- func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
- if m != nil {
- return m.Optionalgroup
- }
- return nil
- }
-
- type Test_OptionalGroup struct {
- RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
- }
- func (m *Test_OptionalGroup) Reset() { *m = Test_OptionalGroup{} }
- func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
-
- func (m *Test_OptionalGroup) GetRequiredField() string {
- if m != nil && m.RequiredField != nil {
- return *m.RequiredField
- }
- return ""
- }
-
- func (m *Test) GetNumber() int32 {
- if x, ok := m.GetUnion().(*Test_Number); ok {
- return x.Number
- }
- return 0
- }
-
- func (m *Test) GetName() string {
- if x, ok := m.GetUnion().(*Test_Name); ok {
- return x.Name
- }
- return ""
- }
-
- func init() {
- proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
- }
-
-To create and play with a Test object:
-
- package main
-
- import (
- "log"
-
- "github.com/golang/protobuf/proto"
- pb "./example.pb"
- )
-
- func main() {
- test := &pb.Test{
- Label: proto.String("hello"),
- Type: proto.Int32(17),
- Reps: []int64{1, 2, 3},
- Optionalgroup: &pb.Test_OptionalGroup{
- RequiredField: proto.String("good bye"),
- },
- Union: &pb.Test_Name{"fred"},
- }
- data, err := proto.Marshal(test)
- if err != nil {
- log.Fatal("marshaling error: ", err)
- }
- newTest := &pb.Test{}
- err = proto.Unmarshal(data, newTest)
- if err != nil {
- log.Fatal("unmarshaling error: ", err)
- }
- // Now test and newTest contain the same data.
- if test.GetLabel() != newTest.GetLabel() {
- log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
- }
- // Use a type switch to determine which oneof was set.
- switch u := test.Union.(type) {
- case *pb.Test_Number: // u.Number contains the number.
- case *pb.Test_Name: // u.Name contains the string.
- }
- // etc.
- }
-*/
-package proto
-
-import (
- "encoding/json"
- "fmt"
- "log"
- "reflect"
- "sort"
- "strconv"
- "sync"
-)
-
-// Message is implemented by generated protocol buffer messages.
-type Message interface {
- Reset()
- String() string
- ProtoMessage()
-}
-
-// Stats records allocation details about the protocol buffer encoders
-// and decoders. Useful for tuning the library itself.
-type Stats struct {
- Emalloc uint64 // mallocs in encode
- Dmalloc uint64 // mallocs in decode
- Encode uint64 // number of encodes
- Decode uint64 // number of decodes
- Chit uint64 // number of cache hits
- Cmiss uint64 // number of cache misses
- Size uint64 // number of sizes
-}
-
-// Set to true to enable stats collection.
-const collectStats = false
-
-var stats Stats
-
-// GetStats returns a copy of the global Stats structure.
-func GetStats() Stats { return stats }
-
-// A Buffer is a buffer manager for marshaling and unmarshaling
-// protocol buffers. It may be reused between invocations to
-// reduce memory usage. It is not necessary to use a Buffer;
-// the global functions Marshal and Unmarshal create a
-// temporary Buffer and are fine for most applications.
-type Buffer struct {
- buf []byte // encode/decode byte stream
- index int // read point
-
- // pools of basic types to amortize allocation.
- bools []bool
- uint32s []uint32
- uint64s []uint64
-
- // extra pools, only used with pointer_reflect.go
- int32s []int32
- int64s []int64
- float32s []float32
- float64s []float64
-}
-
-// NewBuffer allocates a new Buffer and initializes its internal data to
-// the contents of the argument slice.
-func NewBuffer(e []byte) *Buffer {
- return &Buffer{buf: e}
-}
-
-// Reset resets the Buffer, ready for marshaling a new protocol buffer.
-func (p *Buffer) Reset() {
- p.buf = p.buf[0:0] // for reading/writing
- p.index = 0 // for reading
-}
-
-// SetBuf replaces the internal buffer with the slice,
-// ready for unmarshaling the contents of the slice.
-func (p *Buffer) SetBuf(s []byte) {
- p.buf = s
- p.index = 0
-}
-
-// Bytes returns the contents of the Buffer.
-func (p *Buffer) Bytes() []byte { return p.buf }
-
-/*
- * Helper routines for simplifying the creation of optional fields of basic type.
- */
-
-// Bool is a helper routine that allocates a new bool value
-// to store v and returns a pointer to it.
-func Bool(v bool) *bool {
- return &v
-}
-
-// Int32 is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it.
-func Int32(v int32) *int32 {
- return &v
-}
-
-// Int is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it, but unlike Int32
-// its argument value is an int.
-func Int(v int) *int32 {
- p := new(int32)
- *p = int32(v)
- return p
-}
-
-// Int64 is a helper routine that allocates a new int64 value
-// to store v and returns a pointer to it.
-func Int64(v int64) *int64 {
- return &v
-}
-
-// Float32 is a helper routine that allocates a new float32 value
-// to store v and returns a pointer to it.
-func Float32(v float32) *float32 {
- return &v
-}
-
-// Float64 is a helper routine that allocates a new float64 value
-// to store v and returns a pointer to it.
-func Float64(v float64) *float64 {
- return &v
-}
-
-// Uint32 is a helper routine that allocates a new uint32 value
-// to store v and returns a pointer to it.
-func Uint32(v uint32) *uint32 {
- return &v
-}
-
-// Uint64 is a helper routine that allocates a new uint64 value
-// to store v and returns a pointer to it.
-func Uint64(v uint64) *uint64 {
- return &v
-}
-
-// String is a helper routine that allocates a new string value
-// to store v and returns a pointer to it.
-func String(v string) *string {
- return &v
-}
-
-// EnumName is a helper function to simplify printing protocol buffer enums
-// by name. Given an enum map and a value, it returns a useful string.
-func EnumName(m map[int32]string, v int32) string {
- s, ok := m[v]
- if ok {
- return s
- }
- return strconv.Itoa(int(v))
-}
-
-// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
-// from their JSON-encoded representation. Given a map from the enum's symbolic
-// names to its int values, and a byte buffer containing the JSON-encoded
-// value, it returns an int32 that can be cast to the enum type by the caller.
-//
-// The function can deal with both JSON representations, numeric and symbolic.
-func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
- if data[0] == '"' {
- // New style: enums are strings.
- var repr string
- if err := json.Unmarshal(data, &repr); err != nil {
- return -1, err
- }
- val, ok := m[repr]
- if !ok {
- return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
- }
- return val, nil
- }
- // Old style: enums are ints.
- var val int32
- if err := json.Unmarshal(data, &val); err != nil {
- return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
- }
- return val, nil
-}
-
-// DebugPrint dumps the encoded data in b in a debugging format with a header
-// including the string s. Used in testing but made available for general debugging.
-func (p *Buffer) DebugPrint(s string, b []byte) {
- var u uint64
-
- obuf := p.buf
- index := p.index
- p.buf = b
- p.index = 0
- depth := 0
-
- fmt.Printf("\n--- %s ---\n", s)
-
-out:
- for {
- for i := 0; i < depth; i++ {
- fmt.Print(" ")
- }
-
- index := p.index
- if index == len(p.buf) {
- break
- }
-
- op, err := p.DecodeVarint()
- if err != nil {
- fmt.Printf("%3d: fetching op err %v\n", index, err)
- break out
- }
- tag := op >> 3
- wire := op & 7
-
- switch wire {
- default:
- fmt.Printf("%3d: t=%3d unknown wire=%d\n",
- index, tag, wire)
- break out
-
- case WireBytes:
- var r []byte
-
- r, err = p.DecodeRawBytes(false)
- if err != nil {
- break out
- }
- fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
- if len(r) <= 6 {
- for i := 0; i < len(r); i++ {
- fmt.Printf(" %.2x", r[i])
- }
- } else {
- for i := 0; i < 3; i++ {
- fmt.Printf(" %.2x", r[i])
- }
- fmt.Printf(" ..")
- for i := len(r) - 3; i < len(r); i++ {
- fmt.Printf(" %.2x", r[i])
- }
- }
- fmt.Printf("\n")
-
- case WireFixed32:
- u, err = p.DecodeFixed32()
- if err != nil {
- fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
- break out
- }
- fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
-
- case WireFixed64:
- u, err = p.DecodeFixed64()
- if err != nil {
- fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
- break out
- }
- fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
-
- case WireVarint:
- u, err = p.DecodeVarint()
- if err != nil {
- fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
- break out
- }
- fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
-
- case WireStartGroup:
- fmt.Printf("%3d: t=%3d start\n", index, tag)
- depth++
-
- case WireEndGroup:
- depth--
- fmt.Printf("%3d: t=%3d end\n", index, tag)
- }
- }
-
- if depth != 0 {
- fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
- }
- fmt.Printf("\n")
-
- p.buf = obuf
- p.index = index
-}
-
-// SetDefaults sets unset protocol buffer fields to their default values.
-// It only modifies fields that are both unset and have defined defaults.
-// It recursively sets default values in any non-nil sub-messages.
-func SetDefaults(pb Message) {
- setDefaults(reflect.ValueOf(pb), true, false)
-}
-
-// v is a pointer to a struct.
-func setDefaults(v reflect.Value, recur, zeros bool) {
- v = v.Elem()
-
- defaultMu.RLock()
- dm, ok := defaults[v.Type()]
- defaultMu.RUnlock()
- if !ok {
- dm = buildDefaultMessage(v.Type())
- defaultMu.Lock()
- defaults[v.Type()] = dm
- defaultMu.Unlock()
- }
-
- for _, sf := range dm.scalars {
- f := v.Field(sf.index)
- if !f.IsNil() {
- // field already set
- continue
- }
- dv := sf.value
- if dv == nil && !zeros {
- // no explicit default, and don't want to set zeros
- continue
- }
- fptr := f.Addr().Interface() // **T
- // TODO: Consider batching the allocations we do here.
- switch sf.kind {
- case reflect.Bool:
- b := new(bool)
- if dv != nil {
- *b = dv.(bool)
- }
- *(fptr.(**bool)) = b
- case reflect.Float32:
- f := new(float32)
- if dv != nil {
- *f = dv.(float32)
- }
- *(fptr.(**float32)) = f
- case reflect.Float64:
- f := new(float64)
- if dv != nil {
- *f = dv.(float64)
- }
- *(fptr.(**float64)) = f
- case reflect.Int32:
- // might be an enum
- if ft := f.Type(); ft != int32PtrType {
- // enum
- f.Set(reflect.New(ft.Elem()))
- if dv != nil {
- f.Elem().SetInt(int64(dv.(int32)))
- }
- } else {
- // int32 field
- i := new(int32)
- if dv != nil {
- *i = dv.(int32)
- }
- *(fptr.(**int32)) = i
- }
- case reflect.Int64:
- i := new(int64)
- if dv != nil {
- *i = dv.(int64)
- }
- *(fptr.(**int64)) = i
- case reflect.String:
- s := new(string)
- if dv != nil {
- *s = dv.(string)
- }
- *(fptr.(**string)) = s
- case reflect.Uint8:
- // exceptional case: []byte
- var b []byte
- if dv != nil {
- db := dv.([]byte)
- b = make([]byte, len(db))
- copy(b, db)
- } else {
- b = []byte{}
- }
- *(fptr.(*[]byte)) = b
- case reflect.Uint32:
- u := new(uint32)
- if dv != nil {
- *u = dv.(uint32)
- }
- *(fptr.(**uint32)) = u
- case reflect.Uint64:
- u := new(uint64)
- if dv != nil {
- *u = dv.(uint64)
- }
- *(fptr.(**uint64)) = u
- default:
- log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
- }
- }
-
- for _, ni := range dm.nested {
- f := v.Field(ni)
- // f is *T or []*T or map[T]*T
- switch f.Kind() {
- case reflect.Ptr:
- if f.IsNil() {
- continue
- }
- setDefaults(f, recur, zeros)
-
- case reflect.Slice:
- for i := 0; i < f.Len(); i++ {
- e := f.Index(i)
- if e.IsNil() {
- continue
- }
- setDefaults(e, recur, zeros)
- }
-
- case reflect.Map:
- for _, k := range f.MapKeys() {
- e := f.MapIndex(k)
- if e.IsNil() {
- continue
- }
- setDefaults(e, recur, zeros)
- }
- }
- }
-}
-
-var (
- // defaults maps a protocol buffer struct type to a slice of the fields,
- // with its scalar fields set to their proto-declared non-zero default values.
- defaultMu sync.RWMutex
- defaults = make(map[reflect.Type]defaultMessage)
-
- int32PtrType = reflect.TypeOf((*int32)(nil))
-)
-
-// defaultMessage represents information about the default values of a message.
-type defaultMessage struct {
- scalars []scalarField
- nested []int // struct field index of nested messages
-}
-
-type scalarField struct {
- index int // struct field index
- kind reflect.Kind // element type (the T in *T or []T)
- value interface{} // the proto-declared default value, or nil
-}
-
-// t is a struct type.
-func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
- sprop := GetProperties(t)
- for _, prop := range sprop.Prop {
- fi, ok := sprop.decoderTags.get(prop.Tag)
- if !ok {
- // XXX_unrecognized
- continue
- }
- ft := t.Field(fi).Type
-
- sf, nested, err := fieldDefault(ft, prop)
- switch {
- case err != nil:
- log.Print(err)
- case nested:
- dm.nested = append(dm.nested, fi)
- case sf != nil:
- sf.index = fi
- dm.scalars = append(dm.scalars, *sf)
- }
- }
-
- return dm
-}
-
-// fieldDefault returns the scalarField for field type ft.
-// sf will be nil if the field can not have a default.
-// nestedMessage will be true if this is a nested message.
-// Note that sf.index is not set on return.
-func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
- var canHaveDefault bool
- switch ft.Kind() {
- case reflect.Ptr:
- if ft.Elem().Kind() == reflect.Struct {
- nestedMessage = true
- } else {
- canHaveDefault = true // proto2 scalar field
- }
-
- case reflect.Slice:
- switch ft.Elem().Kind() {
- case reflect.Ptr:
- nestedMessage = true // repeated message
- case reflect.Uint8:
- canHaveDefault = true // bytes field
- }
-
- case reflect.Map:
- if ft.Elem().Kind() == reflect.Ptr {
- nestedMessage = true // map with message values
- }
- }
-
- if !canHaveDefault {
- if nestedMessage {
- return nil, true, nil
- }
- return nil, false, nil
- }
-
- // We now know that ft is a pointer or slice.
- sf = &scalarField{kind: ft.Elem().Kind()}
-
- // scalar fields without defaults
- if !prop.HasDefault {
- return sf, false, nil
- }
-
- // a scalar field: either *T or []byte
- switch ft.Elem().Kind() {
- case reflect.Bool:
- x, err := strconv.ParseBool(prop.Default)
- if err != nil {
- return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
- }
- sf.value = x
- case reflect.Float32:
- x, err := strconv.ParseFloat(prop.Default, 32)
- if err != nil {
- return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
- }
- sf.value = float32(x)
- case reflect.Float64:
- x, err := strconv.ParseFloat(prop.Default, 64)
- if err != nil {
- return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
- }
- sf.value = x
- case reflect.Int32:
- x, err := strconv.ParseInt(prop.Default, 10, 32)
- if err != nil {
- return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
- }
- sf.value = int32(x)
- case reflect.Int64:
- x, err := strconv.ParseInt(prop.Default, 10, 64)
- if err != nil {
- return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
- }
- sf.value = x
- case reflect.String:
- sf.value = prop.Default
- case reflect.Uint8:
- // []byte (not *uint8)
- sf.value = []byte(prop.Default)
- case reflect.Uint32:
- x, err := strconv.ParseUint(prop.Default, 10, 32)
- if err != nil {
- return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
- }
- sf.value = uint32(x)
- case reflect.Uint64:
- x, err := strconv.ParseUint(prop.Default, 10, 64)
- if err != nil {
- return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
- }
- sf.value = x
- default:
- return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
- }
-
- return sf, false, nil
-}
-
-// Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-
-func mapKeys(vs []reflect.Value) sort.Interface {
- s := mapKeySorter{
- vs: vs,
- // default Less function: textual comparison
- less: func(a, b reflect.Value) bool {
- return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
- },
- }
-
- // Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
- // numeric keys are sorted numerically.
- if len(vs) == 0 {
- return s
- }
- switch vs[0].Kind() {
- case reflect.Int32, reflect.Int64:
- s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
- case reflect.Uint32, reflect.Uint64:
- s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
- }
-
- return s
-}
-
-type mapKeySorter struct {
- vs []reflect.Value
- less func(a, b reflect.Value) bool
-}
-
-func (s mapKeySorter) Len() int { return len(s.vs) }
-func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
-func (s mapKeySorter) Less(i, j int) bool {
- return s.less(s.vs[i], s.vs[j])
-}
-
-// isProto3Zero reports whether v is a zero proto3 value.
-func isProto3Zero(v reflect.Value) bool {
- switch v.Kind() {
- case reflect.Bool:
- return !v.Bool()
- case reflect.Int32, reflect.Int64:
- return v.Int() == 0
- case reflect.Uint32, reflect.Uint64:
- return v.Uint() == 0
- case reflect.Float32, reflect.Float64:
- return v.Float() == 0
- case reflect.String:
- return v.String() == ""
- }
- return false
-}
-
-// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const ProtoPackageIsVersion2 = true
-
-// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const ProtoPackageIsVersion1 = true
diff --git a/vendor/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go
deleted file mode 100644
index fd982de..0000000
--- a/vendor/github.com/golang/protobuf/proto/message_set.go
+++ /dev/null
@@ -1,311 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Support for message sets.
- */
-
-import (
- "bytes"
- "encoding/json"
- "errors"
- "fmt"
- "reflect"
- "sort"
-)
-
-// errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
-// A message type ID is required for storing a protocol buffer in a message set.
-var errNoMessageTypeID = errors.New("proto does not have a message type ID")
-
-// The first two types (_MessageSet_Item and messageSet)
-// model what the protocol compiler produces for the following protocol message:
-// message MessageSet {
-// repeated group Item = 1 {
-// required int32 type_id = 2;
-// required string message = 3;
-// };
-// }
-// That is the MessageSet wire format. We can't use a proto to generate these
-// because that would introduce a circular dependency between it and this package.
-
-type _MessageSet_Item struct {
- TypeId *int32 `protobuf:"varint,2,req,name=type_id"`
- Message []byte `protobuf:"bytes,3,req,name=message"`
-}
-
-type messageSet struct {
- Item []*_MessageSet_Item `protobuf:"group,1,rep"`
- XXX_unrecognized []byte
- // TODO: caching?
-}
-
-// Make sure messageSet is a Message.
-var _ Message = (*messageSet)(nil)
-
-// messageTypeIder is an interface satisfied by a protocol buffer type
-// that may be stored in a MessageSet.
-type messageTypeIder interface {
- MessageTypeId() int32
-}
-
-func (ms *messageSet) find(pb Message) *_MessageSet_Item {
- mti, ok := pb.(messageTypeIder)
- if !ok {
- return nil
- }
- id := mti.MessageTypeId()
- for _, item := range ms.Item {
- if *item.TypeId == id {
- return item
- }
- }
- return nil
-}
-
-func (ms *messageSet) Has(pb Message) bool {
- if ms.find(pb) != nil {
- return true
- }
- return false
-}
-
-func (ms *messageSet) Unmarshal(pb Message) error {
- if item := ms.find(pb); item != nil {
- return Unmarshal(item.Message, pb)
- }
- if _, ok := pb.(messageTypeIder); !ok {
- return errNoMessageTypeID
- }
- return nil // TODO: return error instead?
-}
-
-func (ms *messageSet) Marshal(pb Message) error {
- msg, err := Marshal(pb)
- if err != nil {
- return err
- }
- if item := ms.find(pb); item != nil {
- // reuse existing item
- item.Message = msg
- return nil
- }
-
- mti, ok := pb.(messageTypeIder)
- if !ok {
- return errNoMessageTypeID
- }
-
- mtid := mti.MessageTypeId()
- ms.Item = append(ms.Item, &_MessageSet_Item{
- TypeId: &mtid,
- Message: msg,
- })
- return nil
-}
-
-func (ms *messageSet) Reset() { *ms = messageSet{} }
-func (ms *messageSet) String() string { return CompactTextString(ms) }
-func (*messageSet) ProtoMessage() {}
-
-// Support for the message_set_wire_format message option.
-
-func skipVarint(buf []byte) []byte {
- i := 0
- for ; buf[i]&0x80 != 0; i++ {
- }
- return buf[i+1:]
-}
-
-// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
-// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSet(exts interface{}) ([]byte, error) {
- var m map[int32]Extension
- switch exts := exts.(type) {
- case *XXX_InternalExtensions:
- if err := encodeExtensions(exts); err != nil {
- return nil, err
- }
- m, _ = exts.extensionsRead()
- case map[int32]Extension:
- if err := encodeExtensionsMap(exts); err != nil {
- return nil, err
- }
- m = exts
- default:
- return nil, errors.New("proto: not an extension map")
- }
-
- // Sort extension IDs to provide a deterministic encoding.
- // See also enc_map in encode.go.
- ids := make([]int, 0, len(m))
- for id := range m {
- ids = append(ids, int(id))
- }
- sort.Ints(ids)
-
- ms := &messageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
- for _, id := range ids {
- e := m[int32(id)]
- // Remove the wire type and field number varint, as well as the length varint.
- msg := skipVarint(skipVarint(e.enc))
-
- ms.Item = append(ms.Item, &_MessageSet_Item{
- TypeId: Int32(int32(id)),
- Message: msg,
- })
- }
- return Marshal(ms)
-}
-
-// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
-// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSet(buf []byte, exts interface{}) error {
- var m map[int32]Extension
- switch exts := exts.(type) {
- case *XXX_InternalExtensions:
- m = exts.extensionsWrite()
- case map[int32]Extension:
- m = exts
- default:
- return errors.New("proto: not an extension map")
- }
-
- ms := new(messageSet)
- if err := Unmarshal(buf, ms); err != nil {
- return err
- }
- for _, item := range ms.Item {
- id := *item.TypeId
- msg := item.Message
-
- // Restore wire type and field number varint, plus length varint.
- // Be careful to preserve duplicate items.
- b := EncodeVarint(uint64(id)<<3 | WireBytes)
- if ext, ok := m[id]; ok {
- // Existing data; rip off the tag and length varint
- // so we join the new data correctly.
- // We can assume that ext.enc is set because we are unmarshaling.
- o := ext.enc[len(b):] // skip wire type and field number
- _, n := DecodeVarint(o) // calculate length of length varint
- o = o[n:] // skip length varint
- msg = append(o, msg...) // join old data and new data
- }
- b = append(b, EncodeVarint(uint64(len(msg)))...)
- b = append(b, msg...)
-
- m[id] = Extension{enc: b}
- }
- return nil
-}
-
-// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
-// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSetJSON(exts interface{}) ([]byte, error) {
- var m map[int32]Extension
- switch exts := exts.(type) {
- case *XXX_InternalExtensions:
- m, _ = exts.extensionsRead()
- case map[int32]Extension:
- m = exts
- default:
- return nil, errors.New("proto: not an extension map")
- }
- var b bytes.Buffer
- b.WriteByte('{')
-
- // Process the map in key order for deterministic output.
- ids := make([]int32, 0, len(m))
- for id := range m {
- ids = append(ids, id)
- }
- sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
-
- for i, id := range ids {
- ext := m[id]
- if i > 0 {
- b.WriteByte(',')
- }
-
- msd, ok := messageSetMap[id]
- if !ok {
- // Unknown type; we can't render it, so skip it.
- continue
- }
- fmt.Fprintf(&b, `"[%s]":`, msd.name)
-
- x := ext.value
- if x == nil {
- x = reflect.New(msd.t.Elem()).Interface()
- if err := Unmarshal(ext.enc, x.(Message)); err != nil {
- return nil, err
- }
- }
- d, err := json.Marshal(x)
- if err != nil {
- return nil, err
- }
- b.Write(d)
- }
- b.WriteByte('}')
- return b.Bytes(), nil
-}
-
-// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
-// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSetJSON(buf []byte, exts interface{}) error {
- // Common-case fast path.
- if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
- return nil
- }
-
- // This is fairly tricky, and it's not clear that it is needed.
- return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
-}
-
-// A global registry of types that can be used in a MessageSet.
-
-var messageSetMap = make(map[int32]messageSetDesc)
-
-type messageSetDesc struct {
- t reflect.Type // pointer to struct
- name string
-}
-
-// RegisterMessageSetType is called from the generated code.
-func RegisterMessageSetType(m Message, fieldNum int32, name string) {
- messageSetMap[fieldNum] = messageSetDesc{
- t: reflect.TypeOf(m),
- name: name,
- }
-}
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
deleted file mode 100644
index fb512e2..0000000
--- a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
+++ /dev/null
@@ -1,484 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build appengine js
-
-// This file contains an implementation of proto field accesses using package reflect.
-// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
-// be used on App Engine.
-
-package proto
-
-import (
- "math"
- "reflect"
-)
-
-// A structPointer is a pointer to a struct.
-type structPointer struct {
- v reflect.Value
-}
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-// The reflect value must itself be a pointer to a struct.
-func toStructPointer(v reflect.Value) structPointer {
- return structPointer{v}
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
- return p.v.IsNil()
-}
-
-// Interface returns the struct pointer as an interface value.
-func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
- return p.v.Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by the sequence of field indices
-// passed to reflect's FieldByIndex.
-type field []int
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
- return f.Index
-}
-
-// invalidField is an invalid field identifier.
-var invalidField = field(nil)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool { return f != nil }
-
-// field returns the given field in the struct as a reflect value.
-func structPointer_field(p structPointer, f field) reflect.Value {
- // Special case: an extension map entry with a value of type T
- // passes a *T to the struct-handling code with a zero field,
- // expecting that it will be treated as equivalent to *struct{ X T },
- // which has the same memory layout. We have to handle that case
- // specially, because reflect will panic if we call FieldByIndex on a
- // non-struct.
- if f == nil {
- return p.v.Elem()
- }
-
- return p.v.Elem().FieldByIndex(f)
-}
-
-// ifield returns the given field in the struct as an interface value.
-func structPointer_ifield(p structPointer, f field) interface{} {
- return structPointer_field(p, f).Addr().Interface()
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
- return structPointer_ifield(p, f).(*[]byte)
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
- return structPointer_ifield(p, f).(*[][]byte)
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
- return structPointer_ifield(p, f).(**bool)
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
- return structPointer_ifield(p, f).(*bool)
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
- return structPointer_ifield(p, f).(*[]bool)
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
- return structPointer_ifield(p, f).(**string)
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
- return structPointer_ifield(p, f).(*string)
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
- return structPointer_ifield(p, f).(*[]string)
-}
-
-// Extensions returns the address of an extension map field in the struct.
-func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
- return structPointer_ifield(p, f).(*XXX_InternalExtensions)
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
- return structPointer_ifield(p, f).(*map[int32]Extension)
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
- return structPointer_field(p, f).Addr()
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
- structPointer_field(p, f).Set(q.v)
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
- return structPointer{structPointer_field(p, f)}
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
- return structPointerSlice{structPointer_field(p, f)}
-}
-
-// A structPointerSlice represents the address of a slice of pointers to structs
-// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
-type structPointerSlice struct {
- v reflect.Value
-}
-
-func (p structPointerSlice) Len() int { return p.v.Len() }
-func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
-func (p structPointerSlice) Append(q structPointer) {
- p.v.Set(reflect.Append(p.v, q.v))
-}
-
-var (
- int32Type = reflect.TypeOf(int32(0))
- uint32Type = reflect.TypeOf(uint32(0))
- float32Type = reflect.TypeOf(float32(0))
- int64Type = reflect.TypeOf(int64(0))
- uint64Type = reflect.TypeOf(uint64(0))
- float64Type = reflect.TypeOf(float64(0))
-)
-
-// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
-// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
-type word32 struct {
- v reflect.Value
-}
-
-// IsNil reports whether p is nil.
-func word32_IsNil(p word32) bool {
- return p.v.IsNil()
-}
-
-// Set sets p to point at a newly allocated word with bits set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
- t := p.v.Type().Elem()
- switch t {
- case int32Type:
- if len(o.int32s) == 0 {
- o.int32s = make([]int32, uint32PoolSize)
- }
- o.int32s[0] = int32(x)
- p.v.Set(reflect.ValueOf(&o.int32s[0]))
- o.int32s = o.int32s[1:]
- return
- case uint32Type:
- if len(o.uint32s) == 0 {
- o.uint32s = make([]uint32, uint32PoolSize)
- }
- o.uint32s[0] = x
- p.v.Set(reflect.ValueOf(&o.uint32s[0]))
- o.uint32s = o.uint32s[1:]
- return
- case float32Type:
- if len(o.float32s) == 0 {
- o.float32s = make([]float32, uint32PoolSize)
- }
- o.float32s[0] = math.Float32frombits(x)
- p.v.Set(reflect.ValueOf(&o.float32s[0]))
- o.float32s = o.float32s[1:]
- return
- }
-
- // must be enum
- p.v.Set(reflect.New(t))
- p.v.Elem().SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32_Get(p word32) uint32 {
- elem := p.v.Elem()
- switch elem.Kind() {
- case reflect.Int32:
- return uint32(elem.Int())
- case reflect.Uint32:
- return uint32(elem.Uint())
- case reflect.Float32:
- return math.Float32bits(float32(elem.Float()))
- }
- panic("unreachable")
-}
-
-// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
- return word32{structPointer_field(p, f)}
-}
-
-// A word32Val represents a field of type int32, uint32, float32, or enum.
-// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
-type word32Val struct {
- v reflect.Value
-}
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
- switch p.v.Type() {
- case int32Type:
- p.v.SetInt(int64(x))
- return
- case uint32Type:
- p.v.SetUint(uint64(x))
- return
- case float32Type:
- p.v.SetFloat(float64(math.Float32frombits(x)))
- return
- }
-
- // must be enum
- p.v.SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32Val_Get(p word32Val) uint32 {
- elem := p.v
- switch elem.Kind() {
- case reflect.Int32:
- return uint32(elem.Int())
- case reflect.Uint32:
- return uint32(elem.Uint())
- case reflect.Float32:
- return math.Float32bits(float32(elem.Float()))
- }
- panic("unreachable")
-}
-
-// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
- return word32Val{structPointer_field(p, f)}
-}
-
-// A word32Slice is a slice of 32-bit values.
-// That is, v.Type() is []int32, []uint32, []float32, or []enum.
-type word32Slice struct {
- v reflect.Value
-}
-
-func (p word32Slice) Append(x uint32) {
- n, m := p.v.Len(), p.v.Cap()
- if n < m {
- p.v.SetLen(n + 1)
- } else {
- t := p.v.Type().Elem()
- p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
- }
- elem := p.v.Index(n)
- switch elem.Kind() {
- case reflect.Int32:
- elem.SetInt(int64(int32(x)))
- case reflect.Uint32:
- elem.SetUint(uint64(x))
- case reflect.Float32:
- elem.SetFloat(float64(math.Float32frombits(x)))
- }
-}
-
-func (p word32Slice) Len() int {
- return p.v.Len()
-}
-
-func (p word32Slice) Index(i int) uint32 {
- elem := p.v.Index(i)
- switch elem.Kind() {
- case reflect.Int32:
- return uint32(elem.Int())
- case reflect.Uint32:
- return uint32(elem.Uint())
- case reflect.Float32:
- return math.Float32bits(float32(elem.Float()))
- }
- panic("unreachable")
-}
-
-// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) word32Slice {
- return word32Slice{structPointer_field(p, f)}
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 struct {
- v reflect.Value
-}
-
-func word64_Set(p word64, o *Buffer, x uint64) {
- t := p.v.Type().Elem()
- switch t {
- case int64Type:
- if len(o.int64s) == 0 {
- o.int64s = make([]int64, uint64PoolSize)
- }
- o.int64s[0] = int64(x)
- p.v.Set(reflect.ValueOf(&o.int64s[0]))
- o.int64s = o.int64s[1:]
- return
- case uint64Type:
- if len(o.uint64s) == 0 {
- o.uint64s = make([]uint64, uint64PoolSize)
- }
- o.uint64s[0] = x
- p.v.Set(reflect.ValueOf(&o.uint64s[0]))
- o.uint64s = o.uint64s[1:]
- return
- case float64Type:
- if len(o.float64s) == 0 {
- o.float64s = make([]float64, uint64PoolSize)
- }
- o.float64s[0] = math.Float64frombits(x)
- p.v.Set(reflect.ValueOf(&o.float64s[0]))
- o.float64s = o.float64s[1:]
- return
- }
- panic("unreachable")
-}
-
-func word64_IsNil(p word64) bool {
- return p.v.IsNil()
-}
-
-func word64_Get(p word64) uint64 {
- elem := p.v.Elem()
- switch elem.Kind() {
- case reflect.Int64:
- return uint64(elem.Int())
- case reflect.Uint64:
- return elem.Uint()
- case reflect.Float64:
- return math.Float64bits(elem.Float())
- }
- panic("unreachable")
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
- return word64{structPointer_field(p, f)}
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val struct {
- v reflect.Value
-}
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
- switch p.v.Type() {
- case int64Type:
- p.v.SetInt(int64(x))
- return
- case uint64Type:
- p.v.SetUint(x)
- return
- case float64Type:
- p.v.SetFloat(math.Float64frombits(x))
- return
- }
- panic("unreachable")
-}
-
-func word64Val_Get(p word64Val) uint64 {
- elem := p.v
- switch elem.Kind() {
- case reflect.Int64:
- return uint64(elem.Int())
- case reflect.Uint64:
- return elem.Uint()
- case reflect.Float64:
- return math.Float64bits(elem.Float())
- }
- panic("unreachable")
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
- return word64Val{structPointer_field(p, f)}
-}
-
-type word64Slice struct {
- v reflect.Value
-}
-
-func (p word64Slice) Append(x uint64) {
- n, m := p.v.Len(), p.v.Cap()
- if n < m {
- p.v.SetLen(n + 1)
- } else {
- t := p.v.Type().Elem()
- p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
- }
- elem := p.v.Index(n)
- switch elem.Kind() {
- case reflect.Int64:
- elem.SetInt(int64(int64(x)))
- case reflect.Uint64:
- elem.SetUint(uint64(x))
- case reflect.Float64:
- elem.SetFloat(float64(math.Float64frombits(x)))
- }
-}
-
-func (p word64Slice) Len() int {
- return p.v.Len()
-}
-
-func (p word64Slice) Index(i int) uint64 {
- elem := p.v.Index(i)
- switch elem.Kind() {
- case reflect.Int64:
- return uint64(elem.Int())
- case reflect.Uint64:
- return uint64(elem.Uint())
- case reflect.Float64:
- return math.Float64bits(float64(elem.Float()))
- }
- panic("unreachable")
-}
-
-func structPointer_Word64Slice(p structPointer, f field) word64Slice {
- return word64Slice{structPointer_field(p, f)}
-}
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
deleted file mode 100644
index 6b5567d..0000000
--- a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
+++ /dev/null
@@ -1,270 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build !appengine,!js
-
-// This file contains the implementation of the proto field accesses using package unsafe.
-
-package proto
-
-import (
- "reflect"
- "unsafe"
-)
-
-// NOTE: These type_Foo functions would more idiomatically be methods,
-// but Go does not allow methods on pointer types, and we must preserve
-// some pointer type for the garbage collector. We use these
-// funcs with clunky names as our poor approximation to methods.
-//
-// An alternative would be
-// type structPointer struct { p unsafe.Pointer }
-// but that does not registerize as well.
-
-// A structPointer is a pointer to a struct.
-type structPointer unsafe.Pointer
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-func toStructPointer(v reflect.Value) structPointer {
- return structPointer(unsafe.Pointer(v.Pointer()))
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
- return p == nil
-}
-
-// Interface returns the struct pointer, assumed to have element type t,
-// as an interface value.
-func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
- return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by its byte offset from the start of the struct.
-type field uintptr
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
- return field(f.Offset)
-}
-
-// invalidField is an invalid field identifier.
-const invalidField = ^field(0)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool {
- return f != ^field(0)
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
- return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
- return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
- return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
- return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
- return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
- return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
- return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
- return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
- return (*XXX_InternalExtensions)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
- return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
- return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
- *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
- return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
- return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
-type structPointerSlice []structPointer
-
-func (v *structPointerSlice) Len() int { return len(*v) }
-func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
-func (v *structPointerSlice) Append(p structPointer) { *v = append(*v, p) }
-
-// A word32 is the address of a "pointer to 32-bit value" field.
-type word32 **uint32
-
-// IsNil reports whether *v is nil.
-func word32_IsNil(p word32) bool {
- return *p == nil
-}
-
-// Set sets *v to point at a newly allocated word set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
- if len(o.uint32s) == 0 {
- o.uint32s = make([]uint32, uint32PoolSize)
- }
- o.uint32s[0] = x
- *p = &o.uint32s[0]
- o.uint32s = o.uint32s[1:]
-}
-
-// Get gets the value pointed at by *v.
-func word32_Get(p word32) uint32 {
- return **p
-}
-
-// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
- return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Val is the address of a 32-bit value field.
-type word32Val *uint32
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
- *p = x
-}
-
-// Get gets the value pointed at by p.
-func word32Val_Get(p word32Val) uint32 {
- return *p
-}
-
-// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
- return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Slice is a slice of 32-bit values.
-type word32Slice []uint32
-
-func (v *word32Slice) Append(x uint32) { *v = append(*v, x) }
-func (v *word32Slice) Len() int { return len(*v) }
-func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
-
-// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
- return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 **uint64
-
-func word64_Set(p word64, o *Buffer, x uint64) {
- if len(o.uint64s) == 0 {
- o.uint64s = make([]uint64, uint64PoolSize)
- }
- o.uint64s[0] = x
- *p = &o.uint64s[0]
- o.uint64s = o.uint64s[1:]
-}
-
-func word64_IsNil(p word64) bool {
- return *p == nil
-}
-
-func word64_Get(p word64) uint64 {
- return **p
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
- return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val *uint64
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
- *p = x
-}
-
-func word64Val_Get(p word64Val) uint64 {
- return *p
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
- return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Slice is like word32Slice but for 64-bit values.
-type word64Slice []uint64
-
-func (v *word64Slice) Append(x uint64) { *v = append(*v, x) }
-func (v *word64Slice) Len() int { return len(*v) }
-func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
-
-func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
- return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go
deleted file mode 100644
index ec2289c..0000000
--- a/vendor/github.com/golang/protobuf/proto/properties.go
+++ /dev/null
@@ -1,872 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
- "fmt"
- "log"
- "os"
- "reflect"
- "sort"
- "strconv"
- "strings"
- "sync"
-)
-
-const debug bool = false
-
-// Constants that identify the encoding of a value on the wire.
-const (
- WireVarint = 0
- WireFixed64 = 1
- WireBytes = 2
- WireStartGroup = 3
- WireEndGroup = 4
- WireFixed32 = 5
-)
-
-const startSize = 10 // initial slice/string sizes
-
-// Encoders are defined in encode.go
-// An encoder outputs the full representation of a field, including its
-// tag and encoder type.
-type encoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueEncoder encodes a single integer in a particular encoding.
-type valueEncoder func(o *Buffer, x uint64) error
-
-// Sizers are defined in encode.go
-// A sizer returns the encoded size of a field, including its tag and encoder
-// type.
-type sizer func(prop *Properties, base structPointer) int
-
-// A valueSizer returns the encoded size of a single integer in a particular
-// encoding.
-type valueSizer func(x uint64) int
-
-// Decoders are defined in decode.go
-// A decoder creates a value from its wire representation.
-// Unrecognized subelements are saved in unrec.
-type decoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueDecoder decodes a single integer in a particular encoding.
-type valueDecoder func(o *Buffer) (x uint64, err error)
-
-// A oneofMarshaler does the marshaling for all oneof fields in a message.
-type oneofMarshaler func(Message, *Buffer) error
-
-// A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
-type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
-
-// A oneofSizer does the sizing for all oneof fields in a message.
-type oneofSizer func(Message) int
-
-// tagMap is an optimization over map[int]int for typical protocol buffer
-// use-cases. Encoded protocol buffers are often in tag order with small tag
-// numbers.
-type tagMap struct {
- fastTags []int
- slowTags map[int]int
-}
-
-// tagMapFastLimit is the upper bound on the tag number that will be stored in
-// the tagMap slice rather than its map.
-const tagMapFastLimit = 1024
-
-func (p *tagMap) get(t int) (int, bool) {
- if t > 0 && t < tagMapFastLimit {
- if t >= len(p.fastTags) {
- return 0, false
- }
- fi := p.fastTags[t]
- return fi, fi >= 0
- }
- fi, ok := p.slowTags[t]
- return fi, ok
-}
-
-func (p *tagMap) put(t int, fi int) {
- if t > 0 && t < tagMapFastLimit {
- for len(p.fastTags) < t+1 {
- p.fastTags = append(p.fastTags, -1)
- }
- p.fastTags[t] = fi
- return
- }
- if p.slowTags == nil {
- p.slowTags = make(map[int]int)
- }
- p.slowTags[t] = fi
-}
-
-// StructProperties represents properties for all the fields of a struct.
-// decoderTags and decoderOrigNames should only be used by the decoder.
-type StructProperties struct {
- Prop []*Properties // properties for each field
- reqCount int // required count
- decoderTags tagMap // map from proto tag to struct field number
- decoderOrigNames map[string]int // map from original name to struct field number
- order []int // list of struct field numbers in tag order
- unrecField field // field id of the XXX_unrecognized []byte field
- extendable bool // is this an extendable proto
-
- oneofMarshaler oneofMarshaler
- oneofUnmarshaler oneofUnmarshaler
- oneofSizer oneofSizer
- stype reflect.Type
-
- // OneofTypes contains information about the oneof fields in this message.
- // It is keyed by the original name of a field.
- OneofTypes map[string]*OneofProperties
-}
-
-// OneofProperties represents information about a specific field in a oneof.
-type OneofProperties struct {
- Type reflect.Type // pointer to generated struct type for this oneof field
- Field int // struct field number of the containing oneof in the message
- Prop *Properties
-}
-
-// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
-// See encode.go, (*Buffer).enc_struct.
-
-func (sp *StructProperties) Len() int { return len(sp.order) }
-func (sp *StructProperties) Less(i, j int) bool {
- return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
-}
-func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
-
-// Properties represents the protocol-specific behavior of a single struct field.
-type Properties struct {
- Name string // name of the field, for error messages
- OrigName string // original name before protocol compiler (always set)
- JSONName string // name to use for JSON; determined by protoc
- Wire string
- WireType int
- Tag int
- Required bool
- Optional bool
- Repeated bool
- Packed bool // relevant for repeated primitives only
- Enum string // set for enum types only
- proto3 bool // whether this is known to be a proto3 field; set for []byte only
- oneof bool // whether this is a oneof field
-
- Default string // default value
- HasDefault bool // whether an explicit default was provided
- def_uint64 uint64
-
- enc encoder
- valEnc valueEncoder // set for bool and numeric types only
- field field
- tagcode []byte // encoding of EncodeVarint((Tag<<3)|WireType)
- tagbuf [8]byte
- stype reflect.Type // set for struct types only
- sprop *StructProperties // set for struct types only
- isMarshaler bool
- isUnmarshaler bool
-
- mtype reflect.Type // set for map types only
- mkeyprop *Properties // set for map types only
- mvalprop *Properties // set for map types only
-
- size sizer
- valSize valueSizer // set for bool and numeric types only
-
- dec decoder
- valDec valueDecoder // set for bool and numeric types only
-
- // If this is a packable field, this will be the decoder for the packed version of the field.
- packedDec decoder
-}
-
-// String formats the properties in the protobuf struct field tag style.
-func (p *Properties) String() string {
- s := p.Wire
- s = ","
- s += strconv.Itoa(p.Tag)
- if p.Required {
- s += ",req"
- }
- if p.Optional {
- s += ",opt"
- }
- if p.Repeated {
- s += ",rep"
- }
- if p.Packed {
- s += ",packed"
- }
- s += ",name=" + p.OrigName
- if p.JSONName != p.OrigName {
- s += ",json=" + p.JSONName
- }
- if p.proto3 {
- s += ",proto3"
- }
- if p.oneof {
- s += ",oneof"
- }
- if len(p.Enum) > 0 {
- s += ",enum=" + p.Enum
- }
- if p.HasDefault {
- s += ",def=" + p.Default
- }
- return s
-}
-
-// Parse populates p by parsing a string in the protobuf struct field tag style.
-func (p *Properties) Parse(s string) {
- // "bytes,49,opt,name=foo,def=hello!"
- fields := strings.Split(s, ",") // breaks def=, but handled below.
- if len(fields) < 2 {
- fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
- return
- }
-
- p.Wire = fields[0]
- switch p.Wire {
- case "varint":
- p.WireType = WireVarint
- p.valEnc = (*Buffer).EncodeVarint
- p.valDec = (*Buffer).DecodeVarint
- p.valSize = sizeVarint
- case "fixed32":
- p.WireType = WireFixed32
- p.valEnc = (*Buffer).EncodeFixed32
- p.valDec = (*Buffer).DecodeFixed32
- p.valSize = sizeFixed32
- case "fixed64":
- p.WireType = WireFixed64
- p.valEnc = (*Buffer).EncodeFixed64
- p.valDec = (*Buffer).DecodeFixed64
- p.valSize = sizeFixed64
- case "zigzag32":
- p.WireType = WireVarint
- p.valEnc = (*Buffer).EncodeZigzag32
- p.valDec = (*Buffer).DecodeZigzag32
- p.valSize = sizeZigzag32
- case "zigzag64":
- p.WireType = WireVarint
- p.valEnc = (*Buffer).EncodeZigzag64
- p.valDec = (*Buffer).DecodeZigzag64
- p.valSize = sizeZigzag64
- case "bytes", "group":
- p.WireType = WireBytes
- // no numeric converter for non-numeric types
- default:
- fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
- return
- }
-
- var err error
- p.Tag, err = strconv.Atoi(fields[1])
- if err != nil {
- return
- }
-
- for i := 2; i < len(fields); i++ {
- f := fields[i]
- switch {
- case f == "req":
- p.Required = true
- case f == "opt":
- p.Optional = true
- case f == "rep":
- p.Repeated = true
- case f == "packed":
- p.Packed = true
- case strings.HasPrefix(f, "name="):
- p.OrigName = f[5:]
- case strings.HasPrefix(f, "json="):
- p.JSONName = f[5:]
- case strings.HasPrefix(f, "enum="):
- p.Enum = f[5:]
- case f == "proto3":
- p.proto3 = true
- case f == "oneof":
- p.oneof = true
- case strings.HasPrefix(f, "def="):
- p.HasDefault = true
- p.Default = f[4:] // rest of string
- if i+1 < len(fields) {
- // Commas aren't escaped, and def is always last.
- p.Default += "," + strings.Join(fields[i+1:], ",")
- break
- }
- }
- }
-}
-
-func logNoSliceEnc(t1, t2 reflect.Type) {
- fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
-}
-
-var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
-
-// Initialize the fields for encoding and decoding.
-func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
- p.enc = nil
- p.dec = nil
- p.size = nil
-
- switch t1 := typ; t1.Kind() {
- default:
- fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
-
- // proto3 scalar types
-
- case reflect.Bool:
- p.enc = (*Buffer).enc_proto3_bool
- p.dec = (*Buffer).dec_proto3_bool
- p.size = size_proto3_bool
- case reflect.Int32:
- p.enc = (*Buffer).enc_proto3_int32
- p.dec = (*Buffer).dec_proto3_int32
- p.size = size_proto3_int32
- case reflect.Uint32:
- p.enc = (*Buffer).enc_proto3_uint32
- p.dec = (*Buffer).dec_proto3_int32 // can reuse
- p.size = size_proto3_uint32
- case reflect.Int64, reflect.Uint64:
- p.enc = (*Buffer).enc_proto3_int64
- p.dec = (*Buffer).dec_proto3_int64
- p.size = size_proto3_int64
- case reflect.Float32:
- p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
- p.dec = (*Buffer).dec_proto3_int32
- p.size = size_proto3_uint32
- case reflect.Float64:
- p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
- p.dec = (*Buffer).dec_proto3_int64
- p.size = size_proto3_int64
- case reflect.String:
- p.enc = (*Buffer).enc_proto3_string
- p.dec = (*Buffer).dec_proto3_string
- p.size = size_proto3_string
-
- case reflect.Ptr:
- switch t2 := t1.Elem(); t2.Kind() {
- default:
- fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
- break
- case reflect.Bool:
- p.enc = (*Buffer).enc_bool
- p.dec = (*Buffer).dec_bool
- p.size = size_bool
- case reflect.Int32:
- p.enc = (*Buffer).enc_int32
- p.dec = (*Buffer).dec_int32
- p.size = size_int32
- case reflect.Uint32:
- p.enc = (*Buffer).enc_uint32
- p.dec = (*Buffer).dec_int32 // can reuse
- p.size = size_uint32
- case reflect.Int64, reflect.Uint64:
- p.enc = (*Buffer).enc_int64
- p.dec = (*Buffer).dec_int64
- p.size = size_int64
- case reflect.Float32:
- p.enc = (*Buffer).enc_uint32 // can just treat them as bits
- p.dec = (*Buffer).dec_int32
- p.size = size_uint32
- case reflect.Float64:
- p.enc = (*Buffer).enc_int64 // can just treat them as bits
- p.dec = (*Buffer).dec_int64
- p.size = size_int64
- case reflect.String:
- p.enc = (*Buffer).enc_string
- p.dec = (*Buffer).dec_string
- p.size = size_string
- case reflect.Struct:
- p.stype = t1.Elem()
- p.isMarshaler = isMarshaler(t1)
- p.isUnmarshaler = isUnmarshaler(t1)
- if p.Wire == "bytes" {
- p.enc = (*Buffer).enc_struct_message
- p.dec = (*Buffer).dec_struct_message
- p.size = size_struct_message
- } else {
- p.enc = (*Buffer).enc_struct_group
- p.dec = (*Buffer).dec_struct_group
- p.size = size_struct_group
- }
- }
-
- case reflect.Slice:
- switch t2 := t1.Elem(); t2.Kind() {
- default:
- logNoSliceEnc(t1, t2)
- break
- case reflect.Bool:
- if p.Packed {
- p.enc = (*Buffer).enc_slice_packed_bool
- p.size = size_slice_packed_bool
- } else {
- p.enc = (*Buffer).enc_slice_bool
- p.size = size_slice_bool
- }
- p.dec = (*Buffer).dec_slice_bool
- p.packedDec = (*Buffer).dec_slice_packed_bool
- case reflect.Int32:
- if p.Packed {
- p.enc = (*Buffer).enc_slice_packed_int32
- p.size = size_slice_packed_int32
- } else {
- p.enc = (*Buffer).enc_slice_int32
- p.size = size_slice_int32
- }
- p.dec = (*Buffer).dec_slice_int32
- p.packedDec = (*Buffer).dec_slice_packed_int32
- case reflect.Uint32:
- if p.Packed {
- p.enc = (*Buffer).enc_slice_packed_uint32
- p.size = size_slice_packed_uint32
- } else {
- p.enc = (*Buffer).enc_slice_uint32
- p.size = size_slice_uint32
- }
- p.dec = (*Buffer).dec_slice_int32
- p.packedDec = (*Buffer).dec_slice_packed_int32
- case reflect.Int64, reflect.Uint64:
- if p.Packed {
- p.enc = (*Buffer).enc_slice_packed_int64
- p.size = size_slice_packed_int64
- } else {
- p.enc = (*Buffer).enc_slice_int64
- p.size = size_slice_int64
- }
- p.dec = (*Buffer).dec_slice_int64
- p.packedDec = (*Buffer).dec_slice_packed_int64
- case reflect.Uint8:
- p.dec = (*Buffer).dec_slice_byte
- if p.proto3 {
- p.enc = (*Buffer).enc_proto3_slice_byte
- p.size = size_proto3_slice_byte
- } else {
- p.enc = (*Buffer).enc_slice_byte
- p.size = size_slice_byte
- }
- case reflect.Float32, reflect.Float64:
- switch t2.Bits() {
- case 32:
- // can just treat them as bits
- if p.Packed {
- p.enc = (*Buffer).enc_slice_packed_uint32
- p.size = size_slice_packed_uint32
- } else {
- p.enc = (*Buffer).enc_slice_uint32
- p.size = size_slice_uint32
- }
- p.dec = (*Buffer).dec_slice_int32
- p.packedDec = (*Buffer).dec_slice_packed_int32
- case 64:
- // can just treat them as bits
- if p.Packed {
- p.enc = (*Buffer).enc_slice_packed_int64
- p.size = size_slice_packed_int64
- } else {
- p.enc = (*Buffer).enc_slice_int64
- p.size = size_slice_int64
- }
- p.dec = (*Buffer).dec_slice_int64
- p.packedDec = (*Buffer).dec_slice_packed_int64
- default:
- logNoSliceEnc(t1, t2)
- break
- }
- case reflect.String:
- p.enc = (*Buffer).enc_slice_string
- p.dec = (*Buffer).dec_slice_string
- p.size = size_slice_string
- case reflect.Ptr:
- switch t3 := t2.Elem(); t3.Kind() {
- default:
- fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
- break
- case reflect.Struct:
- p.stype = t2.Elem()
- p.isMarshaler = isMarshaler(t2)
- p.isUnmarshaler = isUnmarshaler(t2)
- if p.Wire == "bytes" {
- p.enc = (*Buffer).enc_slice_struct_message
- p.dec = (*Buffer).dec_slice_struct_message
- p.size = size_slice_struct_message
- } else {
- p.enc = (*Buffer).enc_slice_struct_group
- p.dec = (*Buffer).dec_slice_struct_group
- p.size = size_slice_struct_group
- }
- }
- case reflect.Slice:
- switch t2.Elem().Kind() {
- default:
- fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
- break
- case reflect.Uint8:
- p.enc = (*Buffer).enc_slice_slice_byte
- p.dec = (*Buffer).dec_slice_slice_byte
- p.size = size_slice_slice_byte
- }
- }
-
- case reflect.Map:
- p.enc = (*Buffer).enc_new_map
- p.dec = (*Buffer).dec_new_map
- p.size = size_new_map
-
- p.mtype = t1
- p.mkeyprop = &Properties{}
- p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
- p.mvalprop = &Properties{}
- vtype := p.mtype.Elem()
- if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
- // The value type is not a message (*T) or bytes ([]byte),
- // so we need encoders for the pointer to this type.
- vtype = reflect.PtrTo(vtype)
- }
- p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
- }
-
- // precalculate tag code
- wire := p.WireType
- if p.Packed {
- wire = WireBytes
- }
- x := uint32(p.Tag)<<3 | uint32(wire)
- i := 0
- for i = 0; x > 127; i++ {
- p.tagbuf[i] = 0x80 | uint8(x&0x7F)
- x >>= 7
- }
- p.tagbuf[i] = uint8(x)
- p.tagcode = p.tagbuf[0 : i+1]
-
- if p.stype != nil {
- if lockGetProp {
- p.sprop = GetProperties(p.stype)
- } else {
- p.sprop = getPropertiesLocked(p.stype)
- }
- }
-}
-
-var (
- marshalerType = reflect.TypeOf((*Marshaler)(nil)).Elem()
- unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
-)
-
-// isMarshaler reports whether type t implements Marshaler.
-func isMarshaler(t reflect.Type) bool {
- // We're checking for (likely) pointer-receiver methods
- // so if t is not a pointer, something is very wrong.
- // The calls above only invoke isMarshaler on pointer types.
- if t.Kind() != reflect.Ptr {
- panic("proto: misuse of isMarshaler")
- }
- return t.Implements(marshalerType)
-}
-
-// isUnmarshaler reports whether type t implements Unmarshaler.
-func isUnmarshaler(t reflect.Type) bool {
- // We're checking for (likely) pointer-receiver methods
- // so if t is not a pointer, something is very wrong.
- // The calls above only invoke isUnmarshaler on pointer types.
- if t.Kind() != reflect.Ptr {
- panic("proto: misuse of isUnmarshaler")
- }
- return t.Implements(unmarshalerType)
-}
-
-// Init populates the properties from a protocol buffer struct tag.
-func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
- p.init(typ, name, tag, f, true)
-}
-
-func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
- // "bytes,49,opt,def=hello!"
- p.Name = name
- p.OrigName = name
- if f != nil {
- p.field = toField(f)
- }
- if tag == "" {
- return
- }
- p.Parse(tag)
- p.setEncAndDec(typ, f, lockGetProp)
-}
-
-var (
- propertiesMu sync.RWMutex
- propertiesMap = make(map[reflect.Type]*StructProperties)
-)
-
-// GetProperties returns the list of properties for the type represented by t.
-// t must represent a generated struct type of a protocol message.
-func GetProperties(t reflect.Type) *StructProperties {
- if t.Kind() != reflect.Struct {
- panic("proto: type must have kind struct")
- }
-
- // Most calls to GetProperties in a long-running program will be
- // retrieving details for types we have seen before.
- propertiesMu.RLock()
- sprop, ok := propertiesMap[t]
- propertiesMu.RUnlock()
- if ok {
- if collectStats {
- stats.Chit++
- }
- return sprop
- }
-
- propertiesMu.Lock()
- sprop = getPropertiesLocked(t)
- propertiesMu.Unlock()
- return sprop
-}
-
-// getPropertiesLocked requires that propertiesMu is held.
-func getPropertiesLocked(t reflect.Type) *StructProperties {
- if prop, ok := propertiesMap[t]; ok {
- if collectStats {
- stats.Chit++
- }
- return prop
- }
- if collectStats {
- stats.Cmiss++
- }
-
- prop := new(StructProperties)
- // in case of recursive protos, fill this in now.
- propertiesMap[t] = prop
-
- // build properties
- prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType) ||
- reflect.PtrTo(t).Implements(extendableProtoV1Type)
- prop.unrecField = invalidField
- prop.Prop = make([]*Properties, t.NumField())
- prop.order = make([]int, t.NumField())
-
- for i := 0; i < t.NumField(); i++ {
- f := t.Field(i)
- p := new(Properties)
- name := f.Name
- p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
-
- if f.Name == "XXX_InternalExtensions" { // special case
- p.enc = (*Buffer).enc_exts
- p.dec = nil // not needed
- p.size = size_exts
- } else if f.Name == "XXX_extensions" { // special case
- p.enc = (*Buffer).enc_map
- p.dec = nil // not needed
- p.size = size_map
- } else if f.Name == "XXX_unrecognized" { // special case
- prop.unrecField = toField(&f)
- }
- oneof := f.Tag.Get("protobuf_oneof") // special case
- if oneof != "" {
- // Oneof fields don't use the traditional protobuf tag.
- p.OrigName = oneof
- }
- prop.Prop[i] = p
- prop.order[i] = i
- if debug {
- print(i, " ", f.Name, " ", t.String(), " ")
- if p.Tag > 0 {
- print(p.String())
- }
- print("\n")
- }
- if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && oneof == "" {
- fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
- }
- }
-
- // Re-order prop.order.
- sort.Sort(prop)
-
- type oneofMessage interface {
- XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
- }
- if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
- var oots []interface{}
- prop.oneofMarshaler, prop.oneofUnmarshaler, prop.oneofSizer, oots = om.XXX_OneofFuncs()
- prop.stype = t
-
- // Interpret oneof metadata.
- prop.OneofTypes = make(map[string]*OneofProperties)
- for _, oot := range oots {
- oop := &OneofProperties{
- Type: reflect.ValueOf(oot).Type(), // *T
- Prop: new(Properties),
- }
- sft := oop.Type.Elem().Field(0)
- oop.Prop.Name = sft.Name
- oop.Prop.Parse(sft.Tag.Get("protobuf"))
- // There will be exactly one interface field that
- // this new value is assignable to.
- for i := 0; i < t.NumField(); i++ {
- f := t.Field(i)
- if f.Type.Kind() != reflect.Interface {
- continue
- }
- if !oop.Type.AssignableTo(f.Type) {
- continue
- }
- oop.Field = i
- break
- }
- prop.OneofTypes[oop.Prop.OrigName] = oop
- }
- }
-
- // build required counts
- // build tags
- reqCount := 0
- prop.decoderOrigNames = make(map[string]int)
- for i, p := range prop.Prop {
- if strings.HasPrefix(p.Name, "XXX_") {
- // Internal fields should not appear in tags/origNames maps.
- // They are handled specially when encoding and decoding.
- continue
- }
- if p.Required {
- reqCount++
- }
- prop.decoderTags.put(p.Tag, i)
- prop.decoderOrigNames[p.OrigName] = i
- }
- prop.reqCount = reqCount
-
- return prop
-}
-
-// Return the Properties object for the x[0]'th field of the structure.
-func propByIndex(t reflect.Type, x []int) *Properties {
- if len(x) != 1 {
- fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
- return nil
- }
- prop := GetProperties(t)
- return prop.Prop[x[0]]
-}
-
-// Get the address and type of a pointer to a struct from an interface.
-func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
- if pb == nil {
- err = ErrNil
- return
- }
- // get the reflect type of the pointer to the struct.
- t = reflect.TypeOf(pb)
- // get the address of the struct.
- value := reflect.ValueOf(pb)
- b = toStructPointer(value)
- return
-}
-
-// A global registry of enum types.
-// The generated code will register the generated maps by calling RegisterEnum.
-
-var enumValueMaps = make(map[string]map[string]int32)
-
-// RegisterEnum is called from the generated code to install the enum descriptor
-// maps into the global table to aid parsing text format protocol buffers.
-func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
- if _, ok := enumValueMaps[typeName]; ok {
- panic("proto: duplicate enum registered: " + typeName)
- }
- enumValueMaps[typeName] = valueMap
-}
-
-// EnumValueMap returns the mapping from names to integers of the
-// enum type enumType, or a nil if not found.
-func EnumValueMap(enumType string) map[string]int32 {
- return enumValueMaps[enumType]
-}
-
-// A registry of all linked message types.
-// The string is a fully-qualified proto name ("pkg.Message").
-var (
- protoTypes = make(map[string]reflect.Type)
- revProtoTypes = make(map[reflect.Type]string)
-)
-
-// RegisterType is called from generated code and maps from the fully qualified
-// proto name to the type (pointer to struct) of the protocol buffer.
-func RegisterType(x Message, name string) {
- if _, ok := protoTypes[name]; ok {
- // TODO: Some day, make this a panic.
- log.Printf("proto: duplicate proto type registered: %s", name)
- return
- }
- t := reflect.TypeOf(x)
- protoTypes[name] = t
- revProtoTypes[t] = name
-}
-
-// MessageName returns the fully-qualified proto name for the given message type.
-func MessageName(x Message) string {
- type xname interface {
- XXX_MessageName() string
- }
- if m, ok := x.(xname); ok {
- return m.XXX_MessageName()
- }
- return revProtoTypes[reflect.TypeOf(x)]
-}
-
-// MessageType returns the message type (pointer to struct) for a named message.
-func MessageType(name string) reflect.Type { return protoTypes[name] }
-
-// A registry of all linked proto files.
-var (
- protoFiles = make(map[string][]byte) // file name => fileDescriptor
-)
-
-// RegisterFile is called from generated code and maps from the
-// full file name of a .proto file to its compressed FileDescriptorProto.
-func RegisterFile(filename string, fileDescriptor []byte) {
- protoFiles[filename] = fileDescriptor
-}
-
-// FileDescriptor returns the compressed FileDescriptorProto for a .proto file.
-func FileDescriptor(filename string) []byte { return protoFiles[filename] }
diff --git a/vendor/github.com/golang/protobuf/proto/text.go b/vendor/github.com/golang/protobuf/proto/text.go
deleted file mode 100644
index 965876b..0000000
--- a/vendor/github.com/golang/protobuf/proto/text.go
+++ /dev/null
@@ -1,854 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-// Functions for writing the text protocol buffer format.
-
-import (
- "bufio"
- "bytes"
- "encoding"
- "errors"
- "fmt"
- "io"
- "log"
- "math"
- "reflect"
- "sort"
- "strings"
-)
-
-var (
- newline = []byte("\n")
- spaces = []byte(" ")
- gtNewline = []byte(">\n")
- endBraceNewline = []byte("}\n")
- backslashN = []byte{'\\', 'n'}
- backslashR = []byte{'\\', 'r'}
- backslashT = []byte{'\\', 't'}
- backslashDQ = []byte{'\\', '"'}
- backslashBS = []byte{'\\', '\\'}
- posInf = []byte("inf")
- negInf = []byte("-inf")
- nan = []byte("nan")
-)
-
-type writer interface {
- io.Writer
- WriteByte(byte) error
-}
-
-// textWriter is an io.Writer that tracks its indentation level.
-type textWriter struct {
- ind int
- complete bool // if the current position is a complete line
- compact bool // whether to write out as a one-liner
- w writer
-}
-
-func (w *textWriter) WriteString(s string) (n int, err error) {
- if !strings.Contains(s, "\n") {
- if !w.compact && w.complete {
- w.writeIndent()
- }
- w.complete = false
- return io.WriteString(w.w, s)
- }
- // WriteString is typically called without newlines, so this
- // codepath and its copy are rare. We copy to avoid
- // duplicating all of Write's logic here.
- return w.Write([]byte(s))
-}
-
-func (w *textWriter) Write(p []byte) (n int, err error) {
- newlines := bytes.Count(p, newline)
- if newlines == 0 {
- if !w.compact && w.complete {
- w.writeIndent()
- }
- n, err = w.w.Write(p)
- w.complete = false
- return n, err
- }
-
- frags := bytes.SplitN(p, newline, newlines+1)
- if w.compact {
- for i, frag := range frags {
- if i > 0 {
- if err := w.w.WriteByte(' '); err != nil {
- return n, err
- }
- n++
- }
- nn, err := w.w.Write(frag)
- n += nn
- if err != nil {
- return n, err
- }
- }
- return n, nil
- }
-
- for i, frag := range frags {
- if w.complete {
- w.writeIndent()
- }
- nn, err := w.w.Write(frag)
- n += nn
- if err != nil {
- return n, err
- }
- if i+1 < len(frags) {
- if err := w.w.WriteByte('\n'); err != nil {
- return n, err
- }
- n++
- }
- }
- w.complete = len(frags[len(frags)-1]) == 0
- return n, nil
-}
-
-func (w *textWriter) WriteByte(c byte) error {
- if w.compact && c == '\n' {
- c = ' '
- }
- if !w.compact && w.complete {
- w.writeIndent()
- }
- err := w.w.WriteByte(c)
- w.complete = c == '\n'
- return err
-}
-
-func (w *textWriter) indent() { w.ind++ }
-
-func (w *textWriter) unindent() {
- if w.ind == 0 {
- log.Print("proto: textWriter unindented too far")
- return
- }
- w.ind--
-}
-
-func writeName(w *textWriter, props *Properties) error {
- if _, err := w.WriteString(props.OrigName); err != nil {
- return err
- }
- if props.Wire != "group" {
- return w.WriteByte(':')
- }
- return nil
-}
-
-// raw is the interface satisfied by RawMessage.
-type raw interface {
- Bytes() []byte
-}
-
-func requiresQuotes(u string) bool {
- // When type URL contains any characters except [0-9A-Za-z./\-]*, it must be quoted.
- for _, ch := range u {
- switch {
- case ch == '.' || ch == '/' || ch == '_':
- continue
- case '0' <= ch && ch <= '9':
- continue
- case 'A' <= ch && ch <= 'Z':
- continue
- case 'a' <= ch && ch <= 'z':
- continue
- default:
- return true
- }
- }
- return false
-}
-
-// isAny reports whether sv is a google.protobuf.Any message
-func isAny(sv reflect.Value) bool {
- type wkt interface {
- XXX_WellKnownType() string
- }
- t, ok := sv.Addr().Interface().(wkt)
- return ok && t.XXX_WellKnownType() == "Any"
-}
-
-// writeProto3Any writes an expanded google.protobuf.Any message.
-//
-// It returns (false, nil) if sv value can't be unmarshaled (e.g. because
-// required messages are not linked in).
-//
-// It returns (true, error) when sv was written in expanded format or an error
-// was encountered.
-func (tm *TextMarshaler) writeProto3Any(w *textWriter, sv reflect.Value) (bool, error) {
- turl := sv.FieldByName("TypeUrl")
- val := sv.FieldByName("Value")
- if !turl.IsValid() || !val.IsValid() {
- return true, errors.New("proto: invalid google.protobuf.Any message")
- }
-
- b, ok := val.Interface().([]byte)
- if !ok {
- return true, errors.New("proto: invalid google.protobuf.Any message")
- }
-
- parts := strings.Split(turl.String(), "/")
- mt := MessageType(parts[len(parts)-1])
- if mt == nil {
- return false, nil
- }
- m := reflect.New(mt.Elem())
- if err := Unmarshal(b, m.Interface().(Message)); err != nil {
- return false, nil
- }
- w.Write([]byte("["))
- u := turl.String()
- if requiresQuotes(u) {
- writeString(w, u)
- } else {
- w.Write([]byte(u))
- }
- if w.compact {
- w.Write([]byte("]:<"))
- } else {
- w.Write([]byte("]: <\n"))
- w.ind++
- }
- if err := tm.writeStruct(w, m.Elem()); err != nil {
- return true, err
- }
- if w.compact {
- w.Write([]byte("> "))
- } else {
- w.ind--
- w.Write([]byte(">\n"))
- }
- return true, nil
-}
-
-func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
- if tm.ExpandAny && isAny(sv) {
- if canExpand, err := tm.writeProto3Any(w, sv); canExpand {
- return err
- }
- }
- st := sv.Type()
- sprops := GetProperties(st)
- for i := 0; i < sv.NumField(); i++ {
- fv := sv.Field(i)
- props := sprops.Prop[i]
- name := st.Field(i).Name
-
- if strings.HasPrefix(name, "XXX_") {
- // There are two XXX_ fields:
- // XXX_unrecognized []byte
- // XXX_extensions map[int32]proto.Extension
- // The first is handled here;
- // the second is handled at the bottom of this function.
- if name == "XXX_unrecognized" && !fv.IsNil() {
- if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
- return err
- }
- }
- continue
- }
- if fv.Kind() == reflect.Ptr && fv.IsNil() {
- // Field not filled in. This could be an optional field or
- // a required field that wasn't filled in. Either way, there
- // isn't anything we can show for it.
- continue
- }
- if fv.Kind() == reflect.Slice && fv.IsNil() {
- // Repeated field that is empty, or a bytes field that is unused.
- continue
- }
-
- if props.Repeated && fv.Kind() == reflect.Slice {
- // Repeated field.
- for j := 0; j < fv.Len(); j++ {
- if err := writeName(w, props); err != nil {
- return err
- }
- if !w.compact {
- if err := w.WriteByte(' '); err != nil {
- return err
- }
- }
- v := fv.Index(j)
- if v.Kind() == reflect.Ptr && v.IsNil() {
- // A nil message in a repeated field is not valid,
- // but we can handle that more gracefully than panicking.
- if _, err := w.Write([]byte("\n")); err != nil {
- return err
- }
- continue
- }
- if err := tm.writeAny(w, v, props); err != nil {
- return err
- }
- if err := w.WriteByte('\n'); err != nil {
- return err
- }
- }
- continue
- }
- if fv.Kind() == reflect.Map {
- // Map fields are rendered as a repeated struct with key/value fields.
- keys := fv.MapKeys()
- sort.Sort(mapKeys(keys))
- for _, key := range keys {
- val := fv.MapIndex(key)
- if err := writeName(w, props); err != nil {
- return err
- }
- if !w.compact {
- if err := w.WriteByte(' '); err != nil {
- return err
- }
- }
- // open struct
- if err := w.WriteByte('<'); err != nil {
- return err
- }
- if !w.compact {
- if err := w.WriteByte('\n'); err != nil {
- return err
- }
- }
- w.indent()
- // key
- if _, err := w.WriteString("key:"); err != nil {
- return err
- }
- if !w.compact {
- if err := w.WriteByte(' '); err != nil {
- return err
- }
- }
- if err := tm.writeAny(w, key, props.mkeyprop); err != nil {
- return err
- }
- if err := w.WriteByte('\n'); err != nil {
- return err
- }
- // nil values aren't legal, but we can avoid panicking because of them.
- if val.Kind() != reflect.Ptr || !val.IsNil() {
- // value
- if _, err := w.WriteString("value:"); err != nil {
- return err
- }
- if !w.compact {
- if err := w.WriteByte(' '); err != nil {
- return err
- }
- }
- if err := tm.writeAny(w, val, props.mvalprop); err != nil {
- return err
- }
- if err := w.WriteByte('\n'); err != nil {
- return err
- }
- }
- // close struct
- w.unindent()
- if err := w.WriteByte('>'); err != nil {
- return err
- }
- if err := w.WriteByte('\n'); err != nil {
- return err
- }
- }
- continue
- }
- if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
- // empty bytes field
- continue
- }
- if fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
- // proto3 non-repeated scalar field; skip if zero value
- if isProto3Zero(fv) {
- continue
- }
- }
-
- if fv.Kind() == reflect.Interface {
- // Check if it is a oneof.
- if st.Field(i).Tag.Get("protobuf_oneof") != "" {
- // fv is nil, or holds a pointer to generated struct.
- // That generated struct has exactly one field,
- // which has a protobuf struct tag.
- if fv.IsNil() {
- continue
- }
- inner := fv.Elem().Elem() // interface -> *T -> T
- tag := inner.Type().Field(0).Tag.Get("protobuf")
- props = new(Properties) // Overwrite the outer props var, but not its pointee.
- props.Parse(tag)
- // Write the value in the oneof, not the oneof itself.
- fv = inner.Field(0)
-
- // Special case to cope with malformed messages gracefully:
- // If the value in the oneof is a nil pointer, don't panic
- // in writeAny.
- if fv.Kind() == reflect.Ptr && fv.IsNil() {
- // Use errors.New so writeAny won't render quotes.
- msg := errors.New("/* nil */")
- fv = reflect.ValueOf(&msg).Elem()
- }
- }
- }
-
- if err := writeName(w, props); err != nil {
- return err
- }
- if !w.compact {
- if err := w.WriteByte(' '); err != nil {
- return err
- }
- }
- if b, ok := fv.Interface().(raw); ok {
- if err := writeRaw(w, b.Bytes()); err != nil {
- return err
- }
- continue
- }
-
- // Enums have a String method, so writeAny will work fine.
- if err := tm.writeAny(w, fv, props); err != nil {
- return err
- }
-
- if err := w.WriteByte('\n'); err != nil {
- return err
- }
- }
-
- // Extensions (the XXX_extensions field).
- pv := sv.Addr()
- if _, ok := extendable(pv.Interface()); ok {
- if err := tm.writeExtensions(w, pv); err != nil {
- return err
- }
- }
-
- return nil
-}
-
-// writeRaw writes an uninterpreted raw message.
-func writeRaw(w *textWriter, b []byte) error {
- if err := w.WriteByte('<'); err != nil {
- return err
- }
- if !w.compact {
- if err := w.WriteByte('\n'); err != nil {
- return err
- }
- }
- w.indent()
- if err := writeUnknownStruct(w, b); err != nil {
- return err
- }
- w.unindent()
- if err := w.WriteByte('>'); err != nil {
- return err
- }
- return nil
-}
-
-// writeAny writes an arbitrary field.
-func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
- v = reflect.Indirect(v)
-
- // Floats have special cases.
- if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
- x := v.Float()
- var b []byte
- switch {
- case math.IsInf(x, 1):
- b = posInf
- case math.IsInf(x, -1):
- b = negInf
- case math.IsNaN(x):
- b = nan
- }
- if b != nil {
- _, err := w.Write(b)
- return err
- }
- // Other values are handled below.
- }
-
- // We don't attempt to serialise every possible value type; only those
- // that can occur in protocol buffers.
- switch v.Kind() {
- case reflect.Slice:
- // Should only be a []byte; repeated fields are handled in writeStruct.
- if err := writeString(w, string(v.Bytes())); err != nil {
- return err
- }
- case reflect.String:
- if err := writeString(w, v.String()); err != nil {
- return err
- }
- case reflect.Struct:
- // Required/optional group/message.
- var bra, ket byte = '<', '>'
- if props != nil && props.Wire == "group" {
- bra, ket = '{', '}'
- }
- if err := w.WriteByte(bra); err != nil {
- return err
- }
- if !w.compact {
- if err := w.WriteByte('\n'); err != nil {
- return err
- }
- }
- w.indent()
- if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
- text, err := etm.MarshalText()
- if err != nil {
- return err
- }
- if _, err = w.Write(text); err != nil {
- return err
- }
- } else if err := tm.writeStruct(w, v); err != nil {
- return err
- }
- w.unindent()
- if err := w.WriteByte(ket); err != nil {
- return err
- }
- default:
- _, err := fmt.Fprint(w, v.Interface())
- return err
- }
- return nil
-}
-
-// equivalent to C's isprint.
-func isprint(c byte) bool {
- return c >= 0x20 && c < 0x7f
-}
-
-// writeString writes a string in the protocol buffer text format.
-// It is similar to strconv.Quote except we don't use Go escape sequences,
-// we treat the string as a byte sequence, and we use octal escapes.
-// These differences are to maintain interoperability with the other
-// languages' implementations of the text format.
-func writeString(w *textWriter, s string) error {
- // use WriteByte here to get any needed indent
- if err := w.WriteByte('"'); err != nil {
- return err
- }
- // Loop over the bytes, not the runes.
- for i := 0; i < len(s); i++ {
- var err error
- // Divergence from C++: we don't escape apostrophes.
- // There's no need to escape them, and the C++ parser
- // copes with a naked apostrophe.
- switch c := s[i]; c {
- case '\n':
- _, err = w.w.Write(backslashN)
- case '\r':
- _, err = w.w.Write(backslashR)
- case '\t':
- _, err = w.w.Write(backslashT)
- case '"':
- _, err = w.w.Write(backslashDQ)
- case '\\':
- _, err = w.w.Write(backslashBS)
- default:
- if isprint(c) {
- err = w.w.WriteByte(c)
- } else {
- _, err = fmt.Fprintf(w.w, "\\%03o", c)
- }
- }
- if err != nil {
- return err
- }
- }
- return w.WriteByte('"')
-}
-
-func writeUnknownStruct(w *textWriter, data []byte) (err error) {
- if !w.compact {
- if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
- return err
- }
- }
- b := NewBuffer(data)
- for b.index < len(b.buf) {
- x, err := b.DecodeVarint()
- if err != nil {
- _, err := fmt.Fprintf(w, "/* %v */\n", err)
- return err
- }
- wire, tag := x&7, x>>3
- if wire == WireEndGroup {
- w.unindent()
- if _, err := w.Write(endBraceNewline); err != nil {
- return err
- }
- continue
- }
- if _, err := fmt.Fprint(w, tag); err != nil {
- return err
- }
- if wire != WireStartGroup {
- if err := w.WriteByte(':'); err != nil {
- return err
- }
- }
- if !w.compact || wire == WireStartGroup {
- if err := w.WriteByte(' '); err != nil {
- return err
- }
- }
- switch wire {
- case WireBytes:
- buf, e := b.DecodeRawBytes(false)
- if e == nil {
- _, err = fmt.Fprintf(w, "%q", buf)
- } else {
- _, err = fmt.Fprintf(w, "/* %v */", e)
- }
- case WireFixed32:
- x, err = b.DecodeFixed32()
- err = writeUnknownInt(w, x, err)
- case WireFixed64:
- x, err = b.DecodeFixed64()
- err = writeUnknownInt(w, x, err)
- case WireStartGroup:
- err = w.WriteByte('{')
- w.indent()
- case WireVarint:
- x, err = b.DecodeVarint()
- err = writeUnknownInt(w, x, err)
- default:
- _, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
- }
- if err != nil {
- return err
- }
- if err = w.WriteByte('\n'); err != nil {
- return err
- }
- }
- return nil
-}
-
-func writeUnknownInt(w *textWriter, x uint64, err error) error {
- if err == nil {
- _, err = fmt.Fprint(w, x)
- } else {
- _, err = fmt.Fprintf(w, "/* %v */", err)
- }
- return err
-}
-
-type int32Slice []int32
-
-func (s int32Slice) Len() int { return len(s) }
-func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s int32Slice) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-
-// writeExtensions writes all the extensions in pv.
-// pv is assumed to be a pointer to a protocol message struct that is extendable.
-func (tm *TextMarshaler) writeExtensions(w *textWriter, pv reflect.Value) error {
- emap := extensionMaps[pv.Type().Elem()]
- ep, _ := extendable(pv.Interface())
-
- // Order the extensions by ID.
- // This isn't strictly necessary, but it will give us
- // canonical output, which will also make testing easier.
- m, mu := ep.extensionsRead()
- if m == nil {
- return nil
- }
- mu.Lock()
- ids := make([]int32, 0, len(m))
- for id := range m {
- ids = append(ids, id)
- }
- sort.Sort(int32Slice(ids))
- mu.Unlock()
-
- for _, extNum := range ids {
- ext := m[extNum]
- var desc *ExtensionDesc
- if emap != nil {
- desc = emap[extNum]
- }
- if desc == nil {
- // Unknown extension.
- if err := writeUnknownStruct(w, ext.enc); err != nil {
- return err
- }
- continue
- }
-
- pb, err := GetExtension(ep, desc)
- if err != nil {
- return fmt.Errorf("failed getting extension: %v", err)
- }
-
- // Repeated extensions will appear as a slice.
- if !desc.repeated() {
- if err := tm.writeExtension(w, desc.Name, pb); err != nil {
- return err
- }
- } else {
- v := reflect.ValueOf(pb)
- for i := 0; i < v.Len(); i++ {
- if err := tm.writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
- return err
- }
- }
- }
- }
- return nil
-}
-
-func (tm *TextMarshaler) writeExtension(w *textWriter, name string, pb interface{}) error {
- if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
- return err
- }
- if !w.compact {
- if err := w.WriteByte(' '); err != nil {
- return err
- }
- }
- if err := tm.writeAny(w, reflect.ValueOf(pb), nil); err != nil {
- return err
- }
- if err := w.WriteByte('\n'); err != nil {
- return err
- }
- return nil
-}
-
-func (w *textWriter) writeIndent() {
- if !w.complete {
- return
- }
- remain := w.ind * 2
- for remain > 0 {
- n := remain
- if n > len(spaces) {
- n = len(spaces)
- }
- w.w.Write(spaces[:n])
- remain -= n
- }
- w.complete = false
-}
-
-// TextMarshaler is a configurable text format marshaler.
-type TextMarshaler struct {
- Compact bool // use compact text format (one line).
- ExpandAny bool // expand google.protobuf.Any messages of known types
-}
-
-// Marshal writes a given protocol buffer in text format.
-// The only errors returned are from w.
-func (tm *TextMarshaler) Marshal(w io.Writer, pb Message) error {
- val := reflect.ValueOf(pb)
- if pb == nil || val.IsNil() {
- w.Write([]byte(""))
- return nil
- }
- var bw *bufio.Writer
- ww, ok := w.(writer)
- if !ok {
- bw = bufio.NewWriter(w)
- ww = bw
- }
- aw := &textWriter{
- w: ww,
- complete: true,
- compact: tm.Compact,
- }
-
- if etm, ok := pb.(encoding.TextMarshaler); ok {
- text, err := etm.MarshalText()
- if err != nil {
- return err
- }
- if _, err = aw.Write(text); err != nil {
- return err
- }
- if bw != nil {
- return bw.Flush()
- }
- return nil
- }
- // Dereference the received pointer so we don't have outer < and >.
- v := reflect.Indirect(val)
- if err := tm.writeStruct(aw, v); err != nil {
- return err
- }
- if bw != nil {
- return bw.Flush()
- }
- return nil
-}
-
-// Text is the same as Marshal, but returns the string directly.
-func (tm *TextMarshaler) Text(pb Message) string {
- var buf bytes.Buffer
- tm.Marshal(&buf, pb)
- return buf.String()
-}
-
-var (
- defaultTextMarshaler = TextMarshaler{}
- compactTextMarshaler = TextMarshaler{Compact: true}
-)
-
-// TODO: consider removing some of the Marshal functions below.
-
-// MarshalText writes a given protocol buffer in text format.
-// The only errors returned are from w.
-func MarshalText(w io.Writer, pb Message) error { return defaultTextMarshaler.Marshal(w, pb) }
-
-// MarshalTextString is the same as MarshalText, but returns the string directly.
-func MarshalTextString(pb Message) string { return defaultTextMarshaler.Text(pb) }
-
-// CompactText writes a given protocol buffer in compact text format (one line).
-func CompactText(w io.Writer, pb Message) error { return compactTextMarshaler.Marshal(w, pb) }
-
-// CompactTextString is the same as CompactText, but returns the string directly.
-func CompactTextString(pb Message) string { return compactTextMarshaler.Text(pb) }
diff --git a/vendor/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go
deleted file mode 100644
index 61f83c1..0000000
--- a/vendor/github.com/golang/protobuf/proto/text_parser.go
+++ /dev/null
@@ -1,895 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-// Functions for parsing the Text protocol buffer format.
-// TODO: message sets.
-
-import (
- "encoding"
- "errors"
- "fmt"
- "reflect"
- "strconv"
- "strings"
- "unicode/utf8"
-)
-
-// Error string emitted when deserializing Any and fields are already set
-const anyRepeatedlyUnpacked = "Any message unpacked multiple times, or %q already set"
-
-type ParseError struct {
- Message string
- Line int // 1-based line number
- Offset int // 0-based byte offset from start of input
-}
-
-func (p *ParseError) Error() string {
- if p.Line == 1 {
- // show offset only for first line
- return fmt.Sprintf("line 1.%d: %v", p.Offset, p.Message)
- }
- return fmt.Sprintf("line %d: %v", p.Line, p.Message)
-}
-
-type token struct {
- value string
- err *ParseError
- line int // line number
- offset int // byte number from start of input, not start of line
- unquoted string // the unquoted version of value, if it was a quoted string
-}
-
-func (t *token) String() string {
- if t.err == nil {
- return fmt.Sprintf("%q (line=%d, offset=%d)", t.value, t.line, t.offset)
- }
- return fmt.Sprintf("parse error: %v", t.err)
-}
-
-type textParser struct {
- s string // remaining input
- done bool // whether the parsing is finished (success or error)
- backed bool // whether back() was called
- offset, line int
- cur token
-}
-
-func newTextParser(s string) *textParser {
- p := new(textParser)
- p.s = s
- p.line = 1
- p.cur.line = 1
- return p
-}
-
-func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
- pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
- p.cur.err = pe
- p.done = true
- return pe
-}
-
-// Numbers and identifiers are matched by [-+._A-Za-z0-9]
-func isIdentOrNumberChar(c byte) bool {
- switch {
- case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
- return true
- case '0' <= c && c <= '9':
- return true
- }
- switch c {
- case '-', '+', '.', '_':
- return true
- }
- return false
-}
-
-func isWhitespace(c byte) bool {
- switch c {
- case ' ', '\t', '\n', '\r':
- return true
- }
- return false
-}
-
-func isQuote(c byte) bool {
- switch c {
- case '"', '\'':
- return true
- }
- return false
-}
-
-func (p *textParser) skipWhitespace() {
- i := 0
- for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
- if p.s[i] == '#' {
- // comment; skip to end of line or input
- for i < len(p.s) && p.s[i] != '\n' {
- i++
- }
- if i == len(p.s) {
- break
- }
- }
- if p.s[i] == '\n' {
- p.line++
- }
- i++
- }
- p.offset += i
- p.s = p.s[i:len(p.s)]
- if len(p.s) == 0 {
- p.done = true
- }
-}
-
-func (p *textParser) advance() {
- // Skip whitespace
- p.skipWhitespace()
- if p.done {
- return
- }
-
- // Start of non-whitespace
- p.cur.err = nil
- p.cur.offset, p.cur.line = p.offset, p.line
- p.cur.unquoted = ""
- switch p.s[0] {
- case '<', '>', '{', '}', ':', '[', ']', ';', ',', '/':
- // Single symbol
- p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
- case '"', '\'':
- // Quoted string
- i := 1
- for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
- if p.s[i] == '\\' && i+1 < len(p.s) {
- // skip escaped char
- i++
- }
- i++
- }
- if i >= len(p.s) || p.s[i] != p.s[0] {
- p.errorf("unmatched quote")
- return
- }
- unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
- if err != nil {
- p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
- return
- }
- p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
- p.cur.unquoted = unq
- default:
- i := 0
- for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
- i++
- }
- if i == 0 {
- p.errorf("unexpected byte %#x", p.s[0])
- return
- }
- p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
- }
- p.offset += len(p.cur.value)
-}
-
-var (
- errBadUTF8 = errors.New("proto: bad UTF-8")
- errBadHex = errors.New("proto: bad hexadecimal")
-)
-
-func unquoteC(s string, quote rune) (string, error) {
- // This is based on C++'s tokenizer.cc.
- // Despite its name, this is *not* parsing C syntax.
- // For instance, "\0" is an invalid quoted string.
-
- // Avoid allocation in trivial cases.
- simple := true
- for _, r := range s {
- if r == '\\' || r == quote {
- simple = false
- break
- }
- }
- if simple {
- return s, nil
- }
-
- buf := make([]byte, 0, 3*len(s)/2)
- for len(s) > 0 {
- r, n := utf8.DecodeRuneInString(s)
- if r == utf8.RuneError && n == 1 {
- return "", errBadUTF8
- }
- s = s[n:]
- if r != '\\' {
- if r < utf8.RuneSelf {
- buf = append(buf, byte(r))
- } else {
- buf = append(buf, string(r)...)
- }
- continue
- }
-
- ch, tail, err := unescape(s)
- if err != nil {
- return "", err
- }
- buf = append(buf, ch...)
- s = tail
- }
- return string(buf), nil
-}
-
-func unescape(s string) (ch string, tail string, err error) {
- r, n := utf8.DecodeRuneInString(s)
- if r == utf8.RuneError && n == 1 {
- return "", "", errBadUTF8
- }
- s = s[n:]
- switch r {
- case 'a':
- return "\a", s, nil
- case 'b':
- return "\b", s, nil
- case 'f':
- return "\f", s, nil
- case 'n':
- return "\n", s, nil
- case 'r':
- return "\r", s, nil
- case 't':
- return "\t", s, nil
- case 'v':
- return "\v", s, nil
- case '?':
- return "?", s, nil // trigraph workaround
- case '\'', '"', '\\':
- return string(r), s, nil
- case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
- if len(s) < 2 {
- return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
- }
- base := 8
- ss := s[:2]
- s = s[2:]
- if r == 'x' || r == 'X' {
- base = 16
- } else {
- ss = string(r) + ss
- }
- i, err := strconv.ParseUint(ss, base, 8)
- if err != nil {
- return "", "", err
- }
- return string([]byte{byte(i)}), s, nil
- case 'u', 'U':
- n := 4
- if r == 'U' {
- n = 8
- }
- if len(s) < n {
- return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
- }
-
- bs := make([]byte, n/2)
- for i := 0; i < n; i += 2 {
- a, ok1 := unhex(s[i])
- b, ok2 := unhex(s[i+1])
- if !ok1 || !ok2 {
- return "", "", errBadHex
- }
- bs[i/2] = a<<4 | b
- }
- s = s[n:]
- return string(bs), s, nil
- }
- return "", "", fmt.Errorf(`unknown escape \%c`, r)
-}
-
-// Adapted from src/pkg/strconv/quote.go.
-func unhex(b byte) (v byte, ok bool) {
- switch {
- case '0' <= b && b <= '9':
- return b - '0', true
- case 'a' <= b && b <= 'f':
- return b - 'a' + 10, true
- case 'A' <= b && b <= 'F':
- return b - 'A' + 10, true
- }
- return 0, false
-}
-
-// Back off the parser by one token. Can only be done between calls to next().
-// It makes the next advance() a no-op.
-func (p *textParser) back() { p.backed = true }
-
-// Advances the parser and returns the new current token.
-func (p *textParser) next() *token {
- if p.backed || p.done {
- p.backed = false
- return &p.cur
- }
- p.advance()
- if p.done {
- p.cur.value = ""
- } else if len(p.cur.value) > 0 && isQuote(p.cur.value[0]) {
- // Look for multiple quoted strings separated by whitespace,
- // and concatenate them.
- cat := p.cur
- for {
- p.skipWhitespace()
- if p.done || !isQuote(p.s[0]) {
- break
- }
- p.advance()
- if p.cur.err != nil {
- return &p.cur
- }
- cat.value += " " + p.cur.value
- cat.unquoted += p.cur.unquoted
- }
- p.done = false // parser may have seen EOF, but we want to return cat
- p.cur = cat
- }
- return &p.cur
-}
-
-func (p *textParser) consumeToken(s string) error {
- tok := p.next()
- if tok.err != nil {
- return tok.err
- }
- if tok.value != s {
- p.back()
- return p.errorf("expected %q, found %q", s, tok.value)
- }
- return nil
-}
-
-// Return a RequiredNotSetError indicating which required field was not set.
-func (p *textParser) missingRequiredFieldError(sv reflect.Value) *RequiredNotSetError {
- st := sv.Type()
- sprops := GetProperties(st)
- for i := 0; i < st.NumField(); i++ {
- if !isNil(sv.Field(i)) {
- continue
- }
-
- props := sprops.Prop[i]
- if props.Required {
- return &RequiredNotSetError{fmt.Sprintf("%v.%v", st, props.OrigName)}
- }
- }
- return &RequiredNotSetError{fmt.Sprintf("%v.", st)} // should not happen
-}
-
-// Returns the index in the struct for the named field, as well as the parsed tag properties.
-func structFieldByName(sprops *StructProperties, name string) (int, *Properties, bool) {
- i, ok := sprops.decoderOrigNames[name]
- if ok {
- return i, sprops.Prop[i], true
- }
- return -1, nil, false
-}
-
-// Consume a ':' from the input stream (if the next token is a colon),
-// returning an error if a colon is needed but not present.
-func (p *textParser) checkForColon(props *Properties, typ reflect.Type) *ParseError {
- tok := p.next()
- if tok.err != nil {
- return tok.err
- }
- if tok.value != ":" {
- // Colon is optional when the field is a group or message.
- needColon := true
- switch props.Wire {
- case "group":
- needColon = false
- case "bytes":
- // A "bytes" field is either a message, a string, or a repeated field;
- // those three become *T, *string and []T respectively, so we can check for
- // this field being a pointer to a non-string.
- if typ.Kind() == reflect.Ptr {
- // *T or *string
- if typ.Elem().Kind() == reflect.String {
- break
- }
- } else if typ.Kind() == reflect.Slice {
- // []T or []*T
- if typ.Elem().Kind() != reflect.Ptr {
- break
- }
- } else if typ.Kind() == reflect.String {
- // The proto3 exception is for a string field,
- // which requires a colon.
- break
- }
- needColon = false
- }
- if needColon {
- return p.errorf("expected ':', found %q", tok.value)
- }
- p.back()
- }
- return nil
-}
-
-func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
- st := sv.Type()
- sprops := GetProperties(st)
- reqCount := sprops.reqCount
- var reqFieldErr error
- fieldSet := make(map[string]bool)
- // A struct is a sequence of "name: value", terminated by one of
- // '>' or '}', or the end of the input. A name may also be
- // "[extension]" or "[type/url]".
- //
- // The whole struct can also be an expanded Any message, like:
- // [type/url] < ... struct contents ... >
- for {
- tok := p.next()
- if tok.err != nil {
- return tok.err
- }
- if tok.value == terminator {
- break
- }
- if tok.value == "[" {
- // Looks like an extension or an Any.
- //
- // TODO: Check whether we need to handle
- // namespace rooted names (e.g. ".something.Foo").
- extName, err := p.consumeExtName()
- if err != nil {
- return err
- }
-
- if s := strings.LastIndex(extName, "/"); s >= 0 {
- // If it contains a slash, it's an Any type URL.
- messageName := extName[s+1:]
- mt := MessageType(messageName)
- if mt == nil {
- return p.errorf("unrecognized message %q in google.protobuf.Any", messageName)
- }
- tok = p.next()
- if tok.err != nil {
- return tok.err
- }
- // consume an optional colon
- if tok.value == ":" {
- tok = p.next()
- if tok.err != nil {
- return tok.err
- }
- }
- var terminator string
- switch tok.value {
- case "<":
- terminator = ">"
- case "{":
- terminator = "}"
- default:
- return p.errorf("expected '{' or '<', found %q", tok.value)
- }
- v := reflect.New(mt.Elem())
- if pe := p.readStruct(v.Elem(), terminator); pe != nil {
- return pe
- }
- b, err := Marshal(v.Interface().(Message))
- if err != nil {
- return p.errorf("failed to marshal message of type %q: %v", messageName, err)
- }
- if fieldSet["type_url"] {
- return p.errorf(anyRepeatedlyUnpacked, "type_url")
- }
- if fieldSet["value"] {
- return p.errorf(anyRepeatedlyUnpacked, "value")
- }
- sv.FieldByName("TypeUrl").SetString(extName)
- sv.FieldByName("Value").SetBytes(b)
- fieldSet["type_url"] = true
- fieldSet["value"] = true
- continue
- }
-
- var desc *ExtensionDesc
- // This could be faster, but it's functional.
- // TODO: Do something smarter than a linear scan.
- for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
- if d.Name == extName {
- desc = d
- break
- }
- }
- if desc == nil {
- return p.errorf("unrecognized extension %q", extName)
- }
-
- props := &Properties{}
- props.Parse(desc.Tag)
-
- typ := reflect.TypeOf(desc.ExtensionType)
- if err := p.checkForColon(props, typ); err != nil {
- return err
- }
-
- rep := desc.repeated()
-
- // Read the extension structure, and set it in
- // the value we're constructing.
- var ext reflect.Value
- if !rep {
- ext = reflect.New(typ).Elem()
- } else {
- ext = reflect.New(typ.Elem()).Elem()
- }
- if err := p.readAny(ext, props); err != nil {
- if _, ok := err.(*RequiredNotSetError); !ok {
- return err
- }
- reqFieldErr = err
- }
- ep := sv.Addr().Interface().(Message)
- if !rep {
- SetExtension(ep, desc, ext.Interface())
- } else {
- old, err := GetExtension(ep, desc)
- var sl reflect.Value
- if err == nil {
- sl = reflect.ValueOf(old) // existing slice
- } else {
- sl = reflect.MakeSlice(typ, 0, 1)
- }
- sl = reflect.Append(sl, ext)
- SetExtension(ep, desc, sl.Interface())
- }
- if err := p.consumeOptionalSeparator(); err != nil {
- return err
- }
- continue
- }
-
- // This is a normal, non-extension field.
- name := tok.value
- var dst reflect.Value
- fi, props, ok := structFieldByName(sprops, name)
- if ok {
- dst = sv.Field(fi)
- } else if oop, ok := sprops.OneofTypes[name]; ok {
- // It is a oneof.
- props = oop.Prop
- nv := reflect.New(oop.Type.Elem())
- dst = nv.Elem().Field(0)
- field := sv.Field(oop.Field)
- if !field.IsNil() {
- return p.errorf("field '%s' would overwrite already parsed oneof '%s'", name, sv.Type().Field(oop.Field).Name)
- }
- field.Set(nv)
- }
- if !dst.IsValid() {
- return p.errorf("unknown field name %q in %v", name, st)
- }
-
- if dst.Kind() == reflect.Map {
- // Consume any colon.
- if err := p.checkForColon(props, dst.Type()); err != nil {
- return err
- }
-
- // Construct the map if it doesn't already exist.
- if dst.IsNil() {
- dst.Set(reflect.MakeMap(dst.Type()))
- }
- key := reflect.New(dst.Type().Key()).Elem()
- val := reflect.New(dst.Type().Elem()).Elem()
-
- // The map entry should be this sequence of tokens:
- // < key : KEY value : VALUE >
- // However, implementations may omit key or value, and technically
- // we should support them in any order. See b/28924776 for a time
- // this went wrong.
-
- tok := p.next()
- var terminator string
- switch tok.value {
- case "<":
- terminator = ">"
- case "{":
- terminator = "}"
- default:
- return p.errorf("expected '{' or '<', found %q", tok.value)
- }
- for {
- tok := p.next()
- if tok.err != nil {
- return tok.err
- }
- if tok.value == terminator {
- break
- }
- switch tok.value {
- case "key":
- if err := p.consumeToken(":"); err != nil {
- return err
- }
- if err := p.readAny(key, props.mkeyprop); err != nil {
- return err
- }
- if err := p.consumeOptionalSeparator(); err != nil {
- return err
- }
- case "value":
- if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
- return err
- }
- if err := p.readAny(val, props.mvalprop); err != nil {
- return err
- }
- if err := p.consumeOptionalSeparator(); err != nil {
- return err
- }
- default:
- p.back()
- return p.errorf(`expected "key", "value", or %q, found %q`, terminator, tok.value)
- }
- }
-
- dst.SetMapIndex(key, val)
- continue
- }
-
- // Check that it's not already set if it's not a repeated field.
- if !props.Repeated && fieldSet[name] {
- return p.errorf("non-repeated field %q was repeated", name)
- }
-
- if err := p.checkForColon(props, dst.Type()); err != nil {
- return err
- }
-
- // Parse into the field.
- fieldSet[name] = true
- if err := p.readAny(dst, props); err != nil {
- if _, ok := err.(*RequiredNotSetError); !ok {
- return err
- }
- reqFieldErr = err
- }
- if props.Required {
- reqCount--
- }
-
- if err := p.consumeOptionalSeparator(); err != nil {
- return err
- }
-
- }
-
- if reqCount > 0 {
- return p.missingRequiredFieldError(sv)
- }
- return reqFieldErr
-}
-
-// consumeExtName consumes extension name or expanded Any type URL and the
-// following ']'. It returns the name or URL consumed.
-func (p *textParser) consumeExtName() (string, error) {
- tok := p.next()
- if tok.err != nil {
- return "", tok.err
- }
-
- // If extension name or type url is quoted, it's a single token.
- if len(tok.value) > 2 && isQuote(tok.value[0]) && tok.value[len(tok.value)-1] == tok.value[0] {
- name, err := unquoteC(tok.value[1:len(tok.value)-1], rune(tok.value[0]))
- if err != nil {
- return "", err
- }
- return name, p.consumeToken("]")
- }
-
- // Consume everything up to "]"
- var parts []string
- for tok.value != "]" {
- parts = append(parts, tok.value)
- tok = p.next()
- if tok.err != nil {
- return "", p.errorf("unrecognized type_url or extension name: %s", tok.err)
- }
- }
- return strings.Join(parts, ""), nil
-}
-
-// consumeOptionalSeparator consumes an optional semicolon or comma.
-// It is used in readStruct to provide backward compatibility.
-func (p *textParser) consumeOptionalSeparator() error {
- tok := p.next()
- if tok.err != nil {
- return tok.err
- }
- if tok.value != ";" && tok.value != "," {
- p.back()
- }
- return nil
-}
-
-func (p *textParser) readAny(v reflect.Value, props *Properties) error {
- tok := p.next()
- if tok.err != nil {
- return tok.err
- }
- if tok.value == "" {
- return p.errorf("unexpected EOF")
- }
-
- switch fv := v; fv.Kind() {
- case reflect.Slice:
- at := v.Type()
- if at.Elem().Kind() == reflect.Uint8 {
- // Special case for []byte
- if tok.value[0] != '"' && tok.value[0] != '\'' {
- // Deliberately written out here, as the error after
- // this switch statement would write "invalid []byte: ...",
- // which is not as user-friendly.
- return p.errorf("invalid string: %v", tok.value)
- }
- bytes := []byte(tok.unquoted)
- fv.Set(reflect.ValueOf(bytes))
- return nil
- }
- // Repeated field.
- if tok.value == "[" {
- // Repeated field with list notation, like [1,2,3].
- for {
- fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
- err := p.readAny(fv.Index(fv.Len()-1), props)
- if err != nil {
- return err
- }
- tok := p.next()
- if tok.err != nil {
- return tok.err
- }
- if tok.value == "]" {
- break
- }
- if tok.value != "," {
- return p.errorf("Expected ']' or ',' found %q", tok.value)
- }
- }
- return nil
- }
- // One value of the repeated field.
- p.back()
- fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
- return p.readAny(fv.Index(fv.Len()-1), props)
- case reflect.Bool:
- // true/1/t/True or false/f/0/False.
- switch tok.value {
- case "true", "1", "t", "True":
- fv.SetBool(true)
- return nil
- case "false", "0", "f", "False":
- fv.SetBool(false)
- return nil
- }
- case reflect.Float32, reflect.Float64:
- v := tok.value
- // Ignore 'f' for compatibility with output generated by C++, but don't
- // remove 'f' when the value is "-inf" or "inf".
- if strings.HasSuffix(v, "f") && tok.value != "-inf" && tok.value != "inf" {
- v = v[:len(v)-1]
- }
- if f, err := strconv.ParseFloat(v, fv.Type().Bits()); err == nil {
- fv.SetFloat(f)
- return nil
- }
- case reflect.Int32:
- if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
- fv.SetInt(x)
- return nil
- }
-
- if len(props.Enum) == 0 {
- break
- }
- m, ok := enumValueMaps[props.Enum]
- if !ok {
- break
- }
- x, ok := m[tok.value]
- if !ok {
- break
- }
- fv.SetInt(int64(x))
- return nil
- case reflect.Int64:
- if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
- fv.SetInt(x)
- return nil
- }
-
- case reflect.Ptr:
- // A basic field (indirected through pointer), or a repeated message/group
- p.back()
- fv.Set(reflect.New(fv.Type().Elem()))
- return p.readAny(fv.Elem(), props)
- case reflect.String:
- if tok.value[0] == '"' || tok.value[0] == '\'' {
- fv.SetString(tok.unquoted)
- return nil
- }
- case reflect.Struct:
- var terminator string
- switch tok.value {
- case "{":
- terminator = "}"
- case "<":
- terminator = ">"
- default:
- return p.errorf("expected '{' or '<', found %q", tok.value)
- }
- // TODO: Handle nested messages which implement encoding.TextUnmarshaler.
- return p.readStruct(fv, terminator)
- case reflect.Uint32:
- if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
- fv.SetUint(uint64(x))
- return nil
- }
- case reflect.Uint64:
- if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
- fv.SetUint(x)
- return nil
- }
- }
- return p.errorf("invalid %v: %v", v.Type(), tok.value)
-}
-
-// UnmarshalText reads a protocol buffer in Text format. UnmarshalText resets pb
-// before starting to unmarshal, so any existing data in pb is always removed.
-// If a required field is not set and no other error occurs,
-// UnmarshalText returns *RequiredNotSetError.
-func UnmarshalText(s string, pb Message) error {
- if um, ok := pb.(encoding.TextUnmarshaler); ok {
- err := um.UnmarshalText([]byte(s))
- return err
- }
- pb.Reset()
- v := reflect.ValueOf(pb)
- if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
- return pe
- }
- return nil
-}
diff --git a/vendor/github.com/gorilla/context/.travis.yml b/vendor/github.com/gorilla/context/.travis.yml
deleted file mode 100644
index 6f440f1..0000000
--- a/vendor/github.com/gorilla/context/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: go
-sudo: false
-
-matrix:
- include:
- - go: 1.3
- - go: 1.4
- - go: 1.5
- - go: 1.6
- - go: 1.7
- - go: tip
- allow_failures:
- - go: tip
-
-script:
- - go get -t -v ./...
- - diff -u <(echo -n) <(gofmt -d .)
- - go vet $(go list ./... | grep -v /vendor/)
- - go test -v -race ./...
diff --git a/vendor/github.com/gorilla/context/LICENSE b/vendor/github.com/gorilla/context/LICENSE
deleted file mode 100644
index 0e5fb87..0000000
--- a/vendor/github.com/gorilla/context/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gorilla/context/README.md b/vendor/github.com/gorilla/context/README.md
deleted file mode 100644
index 08f8669..0000000
--- a/vendor/github.com/gorilla/context/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-context
-=======
-[](https://travis-ci.org/gorilla/context)
-
-gorilla/context is a general purpose registry for global request variables.
-
-> Note: gorilla/context, having been born well before `context.Context` existed, does not play well
-> with the shallow copying of the request that [`http.Request.WithContext`](https://golang.org/pkg/net/http/#Request.WithContext) (added to net/http Go 1.7 onwards) performs. You should either use *just* gorilla/context, or moving forward, the new `http.Request.Context()`.
-
-Read the full documentation here: http://www.gorillatoolkit.org/pkg/context
diff --git a/vendor/github.com/gorilla/context/context.go b/vendor/github.com/gorilla/context/context.go
deleted file mode 100644
index 81cb128..0000000
--- a/vendor/github.com/gorilla/context/context.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package context
-
-import (
- "net/http"
- "sync"
- "time"
-)
-
-var (
- mutex sync.RWMutex
- data = make(map[*http.Request]map[interface{}]interface{})
- datat = make(map[*http.Request]int64)
-)
-
-// Set stores a value for a given key in a given request.
-func Set(r *http.Request, key, val interface{}) {
- mutex.Lock()
- if data[r] == nil {
- data[r] = make(map[interface{}]interface{})
- datat[r] = time.Now().Unix()
- }
- data[r][key] = val
- mutex.Unlock()
-}
-
-// Get returns a value stored for a given key in a given request.
-func Get(r *http.Request, key interface{}) interface{} {
- mutex.RLock()
- if ctx := data[r]; ctx != nil {
- value := ctx[key]
- mutex.RUnlock()
- return value
- }
- mutex.RUnlock()
- return nil
-}
-
-// GetOk returns stored value and presence state like multi-value return of map access.
-func GetOk(r *http.Request, key interface{}) (interface{}, bool) {
- mutex.RLock()
- if _, ok := data[r]; ok {
- value, ok := data[r][key]
- mutex.RUnlock()
- return value, ok
- }
- mutex.RUnlock()
- return nil, false
-}
-
-// GetAll returns all stored values for the request as a map. Nil is returned for invalid requests.
-func GetAll(r *http.Request) map[interface{}]interface{} {
- mutex.RLock()
- if context, ok := data[r]; ok {
- result := make(map[interface{}]interface{}, len(context))
- for k, v := range context {
- result[k] = v
- }
- mutex.RUnlock()
- return result
- }
- mutex.RUnlock()
- return nil
-}
-
-// GetAllOk returns all stored values for the request as a map and a boolean value that indicates if
-// the request was registered.
-func GetAllOk(r *http.Request) (map[interface{}]interface{}, bool) {
- mutex.RLock()
- context, ok := data[r]
- result := make(map[interface{}]interface{}, len(context))
- for k, v := range context {
- result[k] = v
- }
- mutex.RUnlock()
- return result, ok
-}
-
-// Delete removes a value stored for a given key in a given request.
-func Delete(r *http.Request, key interface{}) {
- mutex.Lock()
- if data[r] != nil {
- delete(data[r], key)
- }
- mutex.Unlock()
-}
-
-// Clear removes all values stored for a given request.
-//
-// This is usually called by a handler wrapper to clean up request
-// variables at the end of a request lifetime. See ClearHandler().
-func Clear(r *http.Request) {
- mutex.Lock()
- clear(r)
- mutex.Unlock()
-}
-
-// clear is Clear without the lock.
-func clear(r *http.Request) {
- delete(data, r)
- delete(datat, r)
-}
-
-// Purge removes request data stored for longer than maxAge, in seconds.
-// It returns the amount of requests removed.
-//
-// If maxAge <= 0, all request data is removed.
-//
-// This is only used for sanity check: in case context cleaning was not
-// properly set some request data can be kept forever, consuming an increasing
-// amount of memory. In case this is detected, Purge() must be called
-// periodically until the problem is fixed.
-func Purge(maxAge int) int {
- mutex.Lock()
- count := 0
- if maxAge <= 0 {
- count = len(data)
- data = make(map[*http.Request]map[interface{}]interface{})
- datat = make(map[*http.Request]int64)
- } else {
- min := time.Now().Unix() - int64(maxAge)
- for r := range data {
- if datat[r] < min {
- clear(r)
- count++
- }
- }
- }
- mutex.Unlock()
- return count
-}
-
-// ClearHandler wraps an http.Handler and clears request values at the end
-// of a request lifetime.
-func ClearHandler(h http.Handler) http.Handler {
- return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- defer Clear(r)
- h.ServeHTTP(w, r)
- })
-}
diff --git a/vendor/github.com/gorilla/context/doc.go b/vendor/github.com/gorilla/context/doc.go
deleted file mode 100644
index 448d1bf..0000000
--- a/vendor/github.com/gorilla/context/doc.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package context stores values shared during a request lifetime.
-
-Note: gorilla/context, having been born well before `context.Context` existed,
-does not play well > with the shallow copying of the request that
-[`http.Request.WithContext`](https://golang.org/pkg/net/http/#Request.WithContext)
-(added to net/http Go 1.7 onwards) performs. You should either use *just*
-gorilla/context, or moving forward, the new `http.Request.Context()`.
-
-For example, a router can set variables extracted from the URL and later
-application handlers can access those values, or it can be used to store
-sessions values to be saved at the end of a request. There are several
-others common uses.
-
-The idea was posted by Brad Fitzpatrick to the go-nuts mailing list:
-
- http://groups.google.com/group/golang-nuts/msg/e2d679d303aa5d53
-
-Here's the basic usage: first define the keys that you will need. The key
-type is interface{} so a key can be of any type that supports equality.
-Here we define a key using a custom int type to avoid name collisions:
-
- package foo
-
- import (
- "github.com/gorilla/context"
- )
-
- type key int
-
- const MyKey key = 0
-
-Then set a variable. Variables are bound to an http.Request object, so you
-need a request instance to set a value:
-
- context.Set(r, MyKey, "bar")
-
-The application can later access the variable using the same key you provided:
-
- func MyHandler(w http.ResponseWriter, r *http.Request) {
- // val is "bar".
- val := context.Get(r, foo.MyKey)
-
- // returns ("bar", true)
- val, ok := context.GetOk(r, foo.MyKey)
- // ...
- }
-
-And that's all about the basic usage. We discuss some other ideas below.
-
-Any type can be stored in the context. To enforce a given type, make the key
-private and wrap Get() and Set() to accept and return values of a specific
-type:
-
- type key int
-
- const mykey key = 0
-
- // GetMyKey returns a value for this package from the request values.
- func GetMyKey(r *http.Request) SomeType {
- if rv := context.Get(r, mykey); rv != nil {
- return rv.(SomeType)
- }
- return nil
- }
-
- // SetMyKey sets a value for this package in the request values.
- func SetMyKey(r *http.Request, val SomeType) {
- context.Set(r, mykey, val)
- }
-
-Variables must be cleared at the end of a request, to remove all values
-that were stored. This can be done in an http.Handler, after a request was
-served. Just call Clear() passing the request:
-
- context.Clear(r)
-
-...or use ClearHandler(), which conveniently wraps an http.Handler to clear
-variables at the end of a request lifetime.
-
-The Routers from the packages gorilla/mux and gorilla/pat call Clear()
-so if you are using either of them you don't need to clear the context manually.
-*/
-package context
diff --git a/vendor/github.com/gorilla/securecookie/.travis.yml b/vendor/github.com/gorilla/securecookie/.travis.yml
deleted file mode 100644
index 6f440f1..0000000
--- a/vendor/github.com/gorilla/securecookie/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: go
-sudo: false
-
-matrix:
- include:
- - go: 1.3
- - go: 1.4
- - go: 1.5
- - go: 1.6
- - go: 1.7
- - go: tip
- allow_failures:
- - go: tip
-
-script:
- - go get -t -v ./...
- - diff -u <(echo -n) <(gofmt -d .)
- - go vet $(go list ./... | grep -v /vendor/)
- - go test -v -race ./...
diff --git a/vendor/github.com/gorilla/securecookie/LICENSE b/vendor/github.com/gorilla/securecookie/LICENSE
deleted file mode 100644
index 0e5fb87..0000000
--- a/vendor/github.com/gorilla/securecookie/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gorilla/securecookie/README.md b/vendor/github.com/gorilla/securecookie/README.md
deleted file mode 100644
index da112e4..0000000
--- a/vendor/github.com/gorilla/securecookie/README.md
+++ /dev/null
@@ -1,78 +0,0 @@
-securecookie
-============
-[](https://godoc.org/github.com/gorilla/securecookie) [](https://travis-ci.org/gorilla/securecookie)
-
-securecookie encodes and decodes authenticated and optionally encrypted
-cookie values.
-
-Secure cookies can't be forged, because their values are validated using HMAC.
-When encrypted, the content is also inaccessible to malicious eyes. It is still
-recommended that sensitive data not be stored in cookies, and that HTTPS be used
-to prevent cookie [replay attacks](https://en.wikipedia.org/wiki/Replay_attack).
-
-## Examples
-
-To use it, first create a new SecureCookie instance:
-
-```go
-// Hash keys should be at least 32 bytes long
-var hashKey = []byte("very-secret")
-// Block keys should be 16 bytes (AES-128) or 32 bytes (AES-256) long.
-// Shorter keys may weaken the encryption used.
-var blockKey = []byte("a-lot-secret")
-var s = securecookie.New(hashKey, blockKey)
-```
-
-The hashKey is required, used to authenticate the cookie value using HMAC.
-It is recommended to use a key with 32 or 64 bytes.
-
-The blockKey is optional, used to encrypt the cookie value -- set it to nil
-to not use encryption. If set, the length must correspond to the block size
-of the encryption algorithm. For AES, used by default, valid lengths are
-16, 24, or 32 bytes to select AES-128, AES-192, or AES-256.
-
-Strong keys can be created using the convenience function GenerateRandomKey().
-
-Once a SecureCookie instance is set, use it to encode a cookie value:
-
-```go
-func SetCookieHandler(w http.ResponseWriter, r *http.Request) {
- value := map[string]string{
- "foo": "bar",
- }
- if encoded, err := s.Encode("cookie-name", value); err == nil {
- cookie := &http.Cookie{
- Name: "cookie-name",
- Value: encoded,
- Path: "/",
- Secure: true,
- HttpOnly: true,
- }
- http.SetCookie(w, cookie)
- }
-}
-```
-
-Later, use the same SecureCookie instance to decode and validate a cookie
-value:
-
-```go
-func ReadCookieHandler(w http.ResponseWriter, r *http.Request) {
- if cookie, err := r.Cookie("cookie-name"); err == nil {
- value := make(map[string]string)
- if err = s2.Decode("cookie-name", cookie.Value, &value); err == nil {
- fmt.Fprintf(w, "The value of foo is %q", value["foo"])
- }
- }
-}
-```
-
-We stored a map[string]string, but secure cookies can hold any value that
-can be encoded using `encoding/gob`. To store custom types, they must be
-registered first using gob.Register(). For basic types this is not needed;
-it works out of the box. An optional JSON encoder that uses `encoding/json` is
-available for types compatible with JSON.
-
-## License
-
-BSD licensed. See the LICENSE file for details.
diff --git a/vendor/github.com/gorilla/securecookie/doc.go b/vendor/github.com/gorilla/securecookie/doc.go
deleted file mode 100644
index ae89408..0000000
--- a/vendor/github.com/gorilla/securecookie/doc.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package securecookie encodes and decodes authenticated and optionally
-encrypted cookie values.
-
-Secure cookies can't be forged, because their values are validated using HMAC.
-When encrypted, the content is also inaccessible to malicious eyes.
-
-To use it, first create a new SecureCookie instance:
-
- var hashKey = []byte("very-secret")
- var blockKey = []byte("a-lot-secret")
- var s = securecookie.New(hashKey, blockKey)
-
-The hashKey is required, used to authenticate the cookie value using HMAC.
-It is recommended to use a key with 32 or 64 bytes.
-
-The blockKey is optional, used to encrypt the cookie value -- set it to nil
-to not use encryption. If set, the length must correspond to the block size
-of the encryption algorithm. For AES, used by default, valid lengths are
-16, 24, or 32 bytes to select AES-128, AES-192, or AES-256.
-
-Strong keys can be created using the convenience function GenerateRandomKey().
-
-Once a SecureCookie instance is set, use it to encode a cookie value:
-
- func SetCookieHandler(w http.ResponseWriter, r *http.Request) {
- value := map[string]string{
- "foo": "bar",
- }
- if encoded, err := s.Encode("cookie-name", value); err == nil {
- cookie := &http.Cookie{
- Name: "cookie-name",
- Value: encoded,
- Path: "/",
- }
- http.SetCookie(w, cookie)
- }
- }
-
-Later, use the same SecureCookie instance to decode and validate a cookie
-value:
-
- func ReadCookieHandler(w http.ResponseWriter, r *http.Request) {
- if cookie, err := r.Cookie("cookie-name"); err == nil {
- value := make(map[string]string)
- if err = s2.Decode("cookie-name", cookie.Value, &value); err == nil {
- fmt.Fprintf(w, "The value of foo is %q", value["foo"])
- }
- }
- }
-
-We stored a map[string]string, but secure cookies can hold any value that
-can be encoded using encoding/gob. To store custom types, they must be
-registered first using gob.Register(). For basic types this is not needed;
-it works out of the box.
-*/
-package securecookie
diff --git a/vendor/github.com/gorilla/securecookie/fuzz.go b/vendor/github.com/gorilla/securecookie/fuzz.go
deleted file mode 100644
index e4d0534..0000000
--- a/vendor/github.com/gorilla/securecookie/fuzz.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build gofuzz
-
-package securecookie
-
-var hashKey = []byte("very-secret12345")
-var blockKey = []byte("a-lot-secret1234")
-var s = New(hashKey, blockKey)
-
-type Cookie struct {
- B bool
- I int
- S string
-}
-
-func Fuzz(data []byte) int {
- datas := string(data)
- var c Cookie
- if err := s.Decode("fuzz", datas, &c); err != nil {
- return 0
- }
- if _, err := s.Encode("fuzz", c); err != nil {
- panic(err)
- }
- return 1
-}
diff --git a/vendor/github.com/gorilla/securecookie/securecookie.go b/vendor/github.com/gorilla/securecookie/securecookie.go
deleted file mode 100644
index cd4e097..0000000
--- a/vendor/github.com/gorilla/securecookie/securecookie.go
+++ /dev/null
@@ -1,646 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package securecookie
-
-import (
- "bytes"
- "crypto/aes"
- "crypto/cipher"
- "crypto/hmac"
- "crypto/rand"
- "crypto/sha256"
- "crypto/subtle"
- "encoding/base64"
- "encoding/gob"
- "encoding/json"
- "fmt"
- "hash"
- "io"
- "strconv"
- "strings"
- "time"
-)
-
-// Error is the interface of all errors returned by functions in this library.
-type Error interface {
- error
-
- // IsUsage returns true for errors indicating the client code probably
- // uses this library incorrectly. For example, the client may have
- // failed to provide a valid hash key, or may have failed to configure
- // the Serializer adequately for encoding value.
- IsUsage() bool
-
- // IsDecode returns true for errors indicating that a cookie could not
- // be decoded and validated. Since cookies are usually untrusted
- // user-provided input, errors of this type should be expected.
- // Usually, the proper action is simply to reject the request.
- IsDecode() bool
-
- // IsInternal returns true for unexpected errors occurring in the
- // securecookie implementation.
- IsInternal() bool
-
- // Cause, if it returns a non-nil value, indicates that this error was
- // propagated from some underlying library. If this method returns nil,
- // this error was raised directly by this library.
- //
- // Cause is provided principally for debugging/logging purposes; it is
- // rare that application logic should perform meaningfully different
- // logic based on Cause. See, for example, the caveats described on
- // (MultiError).Cause().
- Cause() error
-}
-
-// errorType is a bitmask giving the error type(s) of an cookieError value.
-type errorType int
-
-const (
- usageError = errorType(1 << iota)
- decodeError
- internalError
-)
-
-type cookieError struct {
- typ errorType
- msg string
- cause error
-}
-
-func (e cookieError) IsUsage() bool { return (e.typ & usageError) != 0 }
-func (e cookieError) IsDecode() bool { return (e.typ & decodeError) != 0 }
-func (e cookieError) IsInternal() bool { return (e.typ & internalError) != 0 }
-
-func (e cookieError) Cause() error { return e.cause }
-
-func (e cookieError) Error() string {
- parts := []string{"securecookie: "}
- if e.msg == "" {
- parts = append(parts, "error")
- } else {
- parts = append(parts, e.msg)
- }
- if c := e.Cause(); c != nil {
- parts = append(parts, " - caused by: ", c.Error())
- }
- return strings.Join(parts, "")
-}
-
-var (
- errGeneratingIV = cookieError{typ: internalError, msg: "failed to generate random iv"}
-
- errNoCodecs = cookieError{typ: usageError, msg: "no codecs provided"}
- errHashKeyNotSet = cookieError{typ: usageError, msg: "hash key is not set"}
- errBlockKeyNotSet = cookieError{typ: usageError, msg: "block key is not set"}
- errEncodedValueTooLong = cookieError{typ: usageError, msg: "the value is too long"}
-
- errValueToDecodeTooLong = cookieError{typ: decodeError, msg: "the value is too long"}
- errTimestampInvalid = cookieError{typ: decodeError, msg: "invalid timestamp"}
- errTimestampTooNew = cookieError{typ: decodeError, msg: "timestamp is too new"}
- errTimestampExpired = cookieError{typ: decodeError, msg: "expired timestamp"}
- errDecryptionFailed = cookieError{typ: decodeError, msg: "the value could not be decrypted"}
- errValueNotByte = cookieError{typ: decodeError, msg: "value not a []byte."}
- errValueNotBytePtr = cookieError{typ: decodeError, msg: "value not a pointer to []byte."}
-
- // ErrMacInvalid indicates that cookie decoding failed because the HMAC
- // could not be extracted and verified. Direct use of this error
- // variable is deprecated; it is public only for legacy compatibility,
- // and may be privatized in the future, as it is rarely useful to
- // distinguish between this error and other Error implementations.
- ErrMacInvalid = cookieError{typ: decodeError, msg: "the value is not valid"}
-)
-
-// Codec defines an interface to encode and decode cookie values.
-type Codec interface {
- Encode(name string, value interface{}) (string, error)
- Decode(name, value string, dst interface{}) error
-}
-
-// New returns a new SecureCookie.
-//
-// hashKey is required, used to authenticate values using HMAC. Create it using
-// GenerateRandomKey(). It is recommended to use a key with 32 or 64 bytes.
-//
-// blockKey is optional, used to encrypt values. Create it using
-// GenerateRandomKey(). The key length must correspond to the block size
-// of the encryption algorithm. For AES, used by default, valid lengths are
-// 16, 24, or 32 bytes to select AES-128, AES-192, or AES-256.
-// The default encoder used for cookie serialization is encoding/gob.
-//
-// Note that keys created using GenerateRandomKey() are not automatically
-// persisted. New keys will be created when the application is restarted, and
-// previously issued cookies will not be able to be decoded.
-func New(hashKey, blockKey []byte) *SecureCookie {
- s := &SecureCookie{
- hashKey: hashKey,
- blockKey: blockKey,
- hashFunc: sha256.New,
- maxAge: 86400 * 30,
- maxLength: 4096,
- sz: GobEncoder{},
- }
- if hashKey == nil {
- s.err = errHashKeyNotSet
- }
- if blockKey != nil {
- s.BlockFunc(aes.NewCipher)
- }
- return s
-}
-
-// SecureCookie encodes and decodes authenticated and optionally encrypted
-// cookie values.
-type SecureCookie struct {
- hashKey []byte
- hashFunc func() hash.Hash
- blockKey []byte
- block cipher.Block
- maxLength int
- maxAge int64
- minAge int64
- err error
- sz Serializer
- // For testing purposes, the function that returns the current timestamp.
- // If not set, it will use time.Now().UTC().Unix().
- timeFunc func() int64
-}
-
-// Serializer provides an interface for providing custom serializers for cookie
-// values.
-type Serializer interface {
- Serialize(src interface{}) ([]byte, error)
- Deserialize(src []byte, dst interface{}) error
-}
-
-// GobEncoder encodes cookie values using encoding/gob. This is the simplest
-// encoder and can handle complex types via gob.Register.
-type GobEncoder struct{}
-
-// JSONEncoder encodes cookie values using encoding/json. Users who wish to
-// encode complex types need to satisfy the json.Marshaller and
-// json.Unmarshaller interfaces.
-type JSONEncoder struct{}
-
-// NopEncoder does not encode cookie values, and instead simply accepts a []byte
-// (as an interface{}) and returns a []byte. This is particularly useful when
-// you encoding an object upstream and do not wish to re-encode it.
-type NopEncoder struct{}
-
-// MaxLength restricts the maximum length, in bytes, for the cookie value.
-//
-// Default is 4096, which is the maximum value accepted by Internet Explorer.
-func (s *SecureCookie) MaxLength(value int) *SecureCookie {
- s.maxLength = value
- return s
-}
-
-// MaxAge restricts the maximum age, in seconds, for the cookie value.
-//
-// Default is 86400 * 30. Set it to 0 for no restriction.
-func (s *SecureCookie) MaxAge(value int) *SecureCookie {
- s.maxAge = int64(value)
- return s
-}
-
-// MinAge restricts the minimum age, in seconds, for the cookie value.
-//
-// Default is 0 (no restriction).
-func (s *SecureCookie) MinAge(value int) *SecureCookie {
- s.minAge = int64(value)
- return s
-}
-
-// HashFunc sets the hash function used to create HMAC.
-//
-// Default is crypto/sha256.New.
-func (s *SecureCookie) HashFunc(f func() hash.Hash) *SecureCookie {
- s.hashFunc = f
- return s
-}
-
-// BlockFunc sets the encryption function used to create a cipher.Block.
-//
-// Default is crypto/aes.New.
-func (s *SecureCookie) BlockFunc(f func([]byte) (cipher.Block, error)) *SecureCookie {
- if s.blockKey == nil {
- s.err = errBlockKeyNotSet
- } else if block, err := f(s.blockKey); err == nil {
- s.block = block
- } else {
- s.err = cookieError{cause: err, typ: usageError}
- }
- return s
-}
-
-// Encoding sets the encoding/serialization method for cookies.
-//
-// Default is encoding/gob. To encode special structures using encoding/gob,
-// they must be registered first using gob.Register().
-func (s *SecureCookie) SetSerializer(sz Serializer) *SecureCookie {
- s.sz = sz
-
- return s
-}
-
-// Encode encodes a cookie value.
-//
-// It serializes, optionally encrypts, signs with a message authentication code,
-// and finally encodes the value.
-//
-// The name argument is the cookie name. It is stored with the encoded value.
-// The value argument is the value to be encoded. It can be any value that can
-// be encoded using the currently selected serializer; see SetSerializer().
-//
-// It is the client's responsibility to ensure that value, when encoded using
-// the current serialization/encryption settings on s and then base64-encoded,
-// is shorter than the maximum permissible length.
-func (s *SecureCookie) Encode(name string, value interface{}) (string, error) {
- if s.err != nil {
- return "", s.err
- }
- if s.hashKey == nil {
- s.err = errHashKeyNotSet
- return "", s.err
- }
- var err error
- var b []byte
- // 1. Serialize.
- if b, err = s.sz.Serialize(value); err != nil {
- return "", cookieError{cause: err, typ: usageError}
- }
- // 2. Encrypt (optional).
- if s.block != nil {
- if b, err = encrypt(s.block, b); err != nil {
- return "", cookieError{cause: err, typ: usageError}
- }
- }
- b = encode(b)
- // 3. Create MAC for "name|date|value". Extra pipe to be used later.
- b = []byte(fmt.Sprintf("%s|%d|%s|", name, s.timestamp(), b))
- mac := createMac(hmac.New(s.hashFunc, s.hashKey), b[:len(b)-1])
- // Append mac, remove name.
- b = append(b, mac...)[len(name)+1:]
- // 4. Encode to base64.
- b = encode(b)
- // 5. Check length.
- if s.maxLength != 0 && len(b) > s.maxLength {
- return "", errEncodedValueTooLong
- }
- // Done.
- return string(b), nil
-}
-
-// Decode decodes a cookie value.
-//
-// It decodes, verifies a message authentication code, optionally decrypts and
-// finally deserializes the value.
-//
-// The name argument is the cookie name. It must be the same name used when
-// it was stored. The value argument is the encoded cookie value. The dst
-// argument is where the cookie will be decoded. It must be a pointer.
-func (s *SecureCookie) Decode(name, value string, dst interface{}) error {
- if s.err != nil {
- return s.err
- }
- if s.hashKey == nil {
- s.err = errHashKeyNotSet
- return s.err
- }
- // 1. Check length.
- if s.maxLength != 0 && len(value) > s.maxLength {
- return errValueToDecodeTooLong
- }
- // 2. Decode from base64.
- b, err := decode([]byte(value))
- if err != nil {
- return err
- }
- // 3. Verify MAC. Value is "date|value|mac".
- parts := bytes.SplitN(b, []byte("|"), 3)
- if len(parts) != 3 {
- return ErrMacInvalid
- }
- h := hmac.New(s.hashFunc, s.hashKey)
- b = append([]byte(name+"|"), b[:len(b)-len(parts[2])-1]...)
- if err = verifyMac(h, b, parts[2]); err != nil {
- return err
- }
- // 4. Verify date ranges.
- var t1 int64
- if t1, err = strconv.ParseInt(string(parts[0]), 10, 64); err != nil {
- return errTimestampInvalid
- }
- t2 := s.timestamp()
- if s.minAge != 0 && t1 > t2-s.minAge {
- return errTimestampTooNew
- }
- if s.maxAge != 0 && t1 < t2-s.maxAge {
- return errTimestampExpired
- }
- // 5. Decrypt (optional).
- b, err = decode(parts[1])
- if err != nil {
- return err
- }
- if s.block != nil {
- if b, err = decrypt(s.block, b); err != nil {
- return err
- }
- }
- // 6. Deserialize.
- if err = s.sz.Deserialize(b, dst); err != nil {
- return cookieError{cause: err, typ: decodeError}
- }
- // Done.
- return nil
-}
-
-// timestamp returns the current timestamp, in seconds.
-//
-// For testing purposes, the function that generates the timestamp can be
-// overridden. If not set, it will return time.Now().UTC().Unix().
-func (s *SecureCookie) timestamp() int64 {
- if s.timeFunc == nil {
- return time.Now().UTC().Unix()
- }
- return s.timeFunc()
-}
-
-// Authentication -------------------------------------------------------------
-
-// createMac creates a message authentication code (MAC).
-func createMac(h hash.Hash, value []byte) []byte {
- h.Write(value)
- return h.Sum(nil)
-}
-
-// verifyMac verifies that a message authentication code (MAC) is valid.
-func verifyMac(h hash.Hash, value []byte, mac []byte) error {
- mac2 := createMac(h, value)
- // Check that both MACs are of equal length, as subtle.ConstantTimeCompare
- // does not do this prior to Go 1.4.
- if len(mac) == len(mac2) && subtle.ConstantTimeCompare(mac, mac2) == 1 {
- return nil
- }
- return ErrMacInvalid
-}
-
-// Encryption -----------------------------------------------------------------
-
-// encrypt encrypts a value using the given block in counter mode.
-//
-// A random initialization vector (http://goo.gl/zF67k) with the length of the
-// block size is prepended to the resulting ciphertext.
-func encrypt(block cipher.Block, value []byte) ([]byte, error) {
- iv := GenerateRandomKey(block.BlockSize())
- if iv == nil {
- return nil, errGeneratingIV
- }
- // Encrypt it.
- stream := cipher.NewCTR(block, iv)
- stream.XORKeyStream(value, value)
- // Return iv + ciphertext.
- return append(iv, value...), nil
-}
-
-// decrypt decrypts a value using the given block in counter mode.
-//
-// The value to be decrypted must be prepended by a initialization vector
-// (http://goo.gl/zF67k) with the length of the block size.
-func decrypt(block cipher.Block, value []byte) ([]byte, error) {
- size := block.BlockSize()
- if len(value) > size {
- // Extract iv.
- iv := value[:size]
- // Extract ciphertext.
- value = value[size:]
- // Decrypt it.
- stream := cipher.NewCTR(block, iv)
- stream.XORKeyStream(value, value)
- return value, nil
- }
- return nil, errDecryptionFailed
-}
-
-// Serialization --------------------------------------------------------------
-
-// Serialize encodes a value using gob.
-func (e GobEncoder) Serialize(src interface{}) ([]byte, error) {
- buf := new(bytes.Buffer)
- enc := gob.NewEncoder(buf)
- if err := enc.Encode(src); err != nil {
- return nil, cookieError{cause: err, typ: usageError}
- }
- return buf.Bytes(), nil
-}
-
-// Deserialize decodes a value using gob.
-func (e GobEncoder) Deserialize(src []byte, dst interface{}) error {
- dec := gob.NewDecoder(bytes.NewBuffer(src))
- if err := dec.Decode(dst); err != nil {
- return cookieError{cause: err, typ: decodeError}
- }
- return nil
-}
-
-// Serialize encodes a value using encoding/json.
-func (e JSONEncoder) Serialize(src interface{}) ([]byte, error) {
- buf := new(bytes.Buffer)
- enc := json.NewEncoder(buf)
- if err := enc.Encode(src); err != nil {
- return nil, cookieError{cause: err, typ: usageError}
- }
- return buf.Bytes(), nil
-}
-
-// Deserialize decodes a value using encoding/json.
-func (e JSONEncoder) Deserialize(src []byte, dst interface{}) error {
- dec := json.NewDecoder(bytes.NewReader(src))
- if err := dec.Decode(dst); err != nil {
- return cookieError{cause: err, typ: decodeError}
- }
- return nil
-}
-
-// Serialize passes a []byte through as-is.
-func (e NopEncoder) Serialize(src interface{}) ([]byte, error) {
- if b, ok := src.([]byte); ok {
- return b, nil
- }
-
- return nil, errValueNotByte
-}
-
-// Deserialize passes a []byte through as-is.
-func (e NopEncoder) Deserialize(src []byte, dst interface{}) error {
- if dat, ok := dst.(*[]byte); ok {
- *dat = src
- return nil
- }
- return errValueNotBytePtr
-}
-
-// Encoding -------------------------------------------------------------------
-
-// encode encodes a value using base64.
-func encode(value []byte) []byte {
- encoded := make([]byte, base64.URLEncoding.EncodedLen(len(value)))
- base64.URLEncoding.Encode(encoded, value)
- return encoded
-}
-
-// decode decodes a cookie using base64.
-func decode(value []byte) ([]byte, error) {
- decoded := make([]byte, base64.URLEncoding.DecodedLen(len(value)))
- b, err := base64.URLEncoding.Decode(decoded, value)
- if err != nil {
- return nil, cookieError{cause: err, typ: decodeError, msg: "base64 decode failed"}
- }
- return decoded[:b], nil
-}
-
-// Helpers --------------------------------------------------------------------
-
-// GenerateRandomKey creates a random key with the given length in bytes.
-// On failure, returns nil.
-//
-// Callers should explicitly check for the possibility of a nil return, treat
-// it as a failure of the system random number generator, and not continue.
-func GenerateRandomKey(length int) []byte {
- k := make([]byte, length)
- if _, err := io.ReadFull(rand.Reader, k); err != nil {
- return nil
- }
- return k
-}
-
-// CodecsFromPairs returns a slice of SecureCookie instances.
-//
-// It is a convenience function to create a list of codecs for key rotation. Note
-// that the generated Codecs will have the default options applied: callers
-// should iterate over each Codec and type-assert the underlying *SecureCookie to
-// change these.
-//
-// Example:
-//
-// codecs := securecookie.CodecsFromPairs(
-// []byte("new-hash-key"),
-// []byte("new-block-key"),
-// []byte("old-hash-key"),
-// []byte("old-block-key"),
-// )
-//
-// // Modify each instance.
-// for _, s := range codecs {
-// if cookie, ok := s.(*securecookie.SecureCookie); ok {
-// cookie.MaxAge(86400 * 7)
-// cookie.SetSerializer(securecookie.JSONEncoder{})
-// cookie.HashFunc(sha512.New512_256)
-// }
-// }
-//
-func CodecsFromPairs(keyPairs ...[]byte) []Codec {
- codecs := make([]Codec, len(keyPairs)/2+len(keyPairs)%2)
- for i := 0; i < len(keyPairs); i += 2 {
- var blockKey []byte
- if i+1 < len(keyPairs) {
- blockKey = keyPairs[i+1]
- }
- codecs[i/2] = New(keyPairs[i], blockKey)
- }
- return codecs
-}
-
-// EncodeMulti encodes a cookie value using a group of codecs.
-//
-// The codecs are tried in order. Multiple codecs are accepted to allow
-// key rotation.
-//
-// On error, may return a MultiError.
-func EncodeMulti(name string, value interface{}, codecs ...Codec) (string, error) {
- if len(codecs) == 0 {
- return "", errNoCodecs
- }
-
- var errors MultiError
- for _, codec := range codecs {
- encoded, err := codec.Encode(name, value)
- if err == nil {
- return encoded, nil
- }
- errors = append(errors, err)
- }
- return "", errors
-}
-
-// DecodeMulti decodes a cookie value using a group of codecs.
-//
-// The codecs are tried in order. Multiple codecs are accepted to allow
-// key rotation.
-//
-// On error, may return a MultiError.
-func DecodeMulti(name string, value string, dst interface{}, codecs ...Codec) error {
- if len(codecs) == 0 {
- return errNoCodecs
- }
-
- var errors MultiError
- for _, codec := range codecs {
- err := codec.Decode(name, value, dst)
- if err == nil {
- return nil
- }
- errors = append(errors, err)
- }
- return errors
-}
-
-// MultiError groups multiple errors.
-type MultiError []error
-
-func (m MultiError) IsUsage() bool { return m.any(func(e Error) bool { return e.IsUsage() }) }
-func (m MultiError) IsDecode() bool { return m.any(func(e Error) bool { return e.IsDecode() }) }
-func (m MultiError) IsInternal() bool { return m.any(func(e Error) bool { return e.IsInternal() }) }
-
-// Cause returns nil for MultiError; there is no unique underlying cause in the
-// general case.
-//
-// Note: we could conceivably return a non-nil Cause only when there is exactly
-// one child error with a Cause. However, it would be brittle for client code
-// to rely on the arity of causes inside a MultiError, so we have opted not to
-// provide this functionality. Clients which really wish to access the Causes
-// of the underlying errors are free to iterate through the errors themselves.
-func (m MultiError) Cause() error { return nil }
-
-func (m MultiError) Error() string {
- s, n := "", 0
- for _, e := range m {
- if e != nil {
- if n == 0 {
- s = e.Error()
- }
- n++
- }
- }
- switch n {
- case 0:
- return "(0 errors)"
- case 1:
- return s
- case 2:
- return s + " (and 1 other error)"
- }
- return fmt.Sprintf("%s (and %d other errors)", s, n-1)
-}
-
-// any returns true if any element of m is an Error for which pred returns true.
-func (m MultiError) any(pred func(Error) bool) bool {
- for _, e := range m {
- if ourErr, ok := e.(Error); ok && pred(ourErr) {
- return true
- }
- }
- return false
-}
diff --git a/vendor/github.com/gorilla/sessions/.travis.yml b/vendor/github.com/gorilla/sessions/.travis.yml
deleted file mode 100644
index db17dd3..0000000
--- a/vendor/github.com/gorilla/sessions/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: go
-sudo: false
-
-matrix:
- include:
- - go: 1.3
- - go: 1.4
- - go: 1.5
- - go: 1.6
- - go: 1.7
- - go: tip
- allow_failures:
- - go: tip
-
-install:
- - # skip
-
-script:
- - go get -t -v ./...
- - diff -u <(echo -n) <(gofmt -d .)
- - go vet $(go list ./... | grep -v /vendor/)
- - go test -v -race ./...
diff --git a/vendor/github.com/gorilla/sessions/LICENSE b/vendor/github.com/gorilla/sessions/LICENSE
deleted file mode 100644
index 0e5fb87..0000000
--- a/vendor/github.com/gorilla/sessions/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gorilla/sessions/README.md b/vendor/github.com/gorilla/sessions/README.md
deleted file mode 100644
index 5bb3107..0000000
--- a/vendor/github.com/gorilla/sessions/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-sessions
-========
-[](https://godoc.org/github.com/gorilla/sessions) [](https://travis-ci.org/gorilla/sessions)
-
-gorilla/sessions provides cookie and filesystem sessions and infrastructure for
-custom session backends.
-
-The key features are:
-
-* Simple API: use it as an easy way to set signed (and optionally
- encrypted) cookies.
-* Built-in backends to store sessions in cookies or the filesystem.
-* Flash messages: session values that last until read.
-* Convenient way to switch session persistency (aka "remember me") and set
- other attributes.
-* Mechanism to rotate authentication and encryption keys.
-* Multiple sessions per request, even using different backends.
-* Interfaces and infrastructure for custom session backends: sessions from
- different stores can be retrieved and batch-saved using a common API.
-
-Let's start with an example that shows the sessions API in a nutshell:
-
-```go
- import (
- "net/http"
- "github.com/gorilla/sessions"
- )
-
- var store = sessions.NewCookieStore([]byte("something-very-secret"))
-
- func MyHandler(w http.ResponseWriter, r *http.Request) {
- // Get a session. We're ignoring the error resulted from decoding an
- // existing session: Get() always returns a session, even if empty.
- session, _ := store.Get(r, "session-name")
- // Set some session values.
- session.Values["foo"] = "bar"
- session.Values[42] = 43
- // Save it before we write to the response/return from the handler.
- session.Save(r, w)
- }
-```
-
-First we initialize a session store calling `NewCookieStore()` and passing a
-secret key used to authenticate the session. Inside the handler, we call
-`store.Get()` to retrieve an existing session or a new one. Then we set some
-session values in session.Values, which is a `map[interface{}]interface{}`.
-And finally we call `session.Save()` to save the session in the response.
-
-Important Note: If you aren't using gorilla/mux, you need to wrap your handlers
-with
-[`context.ClearHandler`](http://www.gorillatoolkit.org/pkg/context#ClearHandler)
-as or else you will leak memory! An easy way to do this is to wrap the top-level
-mux when calling http.ListenAndServe:
-
-More examples are available [on the Gorilla
-website](http://www.gorillatoolkit.org/pkg/sessions).
-
-## Store Implementations
-
-Other implementations of the `sessions.Store` interface:
-
-* [github.com/starJammer/gorilla-sessions-arangodb](https://github.com/starJammer/gorilla-sessions-arangodb) - ArangoDB
-* [github.com/yosssi/boltstore](https://github.com/yosssi/boltstore) - Bolt
-* [github.com/srinathgs/couchbasestore](https://github.com/srinathgs/couchbasestore) - Couchbase
-* [github.com/denizeren/dynamostore](https://github.com/denizeren/dynamostore) - Dynamodb on AWS
-* [github.com/bradleypeabody/gorilla-sessions-memcache](https://github.com/bradleypeabody/gorilla-sessions-memcache) - Memcache
-* [github.com/dsoprea/go-appengine-sessioncascade](https://github.com/dsoprea/go-appengine-sessioncascade) - Memcache/Datastore/Context in AppEngine
-* [github.com/kidstuff/mongostore](https://github.com/kidstuff/mongostore) - MongoDB
-* [github.com/srinathgs/mysqlstore](https://github.com/srinathgs/mysqlstore) - MySQL
-* [github.com/EnumApps/clustersqlstore](https://github.com/EnumApps/clustersqlstore) - MySQL Cluster
-* [github.com/antonlindstrom/pgstore](https://github.com/antonlindstrom/pgstore) - PostgreSQL
-* [github.com/boj/redistore](https://github.com/boj/redistore) - Redis
-* [github.com/boj/rethinkstore](https://github.com/boj/rethinkstore) - RethinkDB
-* [github.com/boj/riakstore](https://github.com/boj/riakstore) - Riak
-* [github.com/michaeljs1990/sqlitestore](https://github.com/michaeljs1990/sqlitestore) - SQLite
-* [github.com/wader/gormstore](https://github.com/wader/gormstore) - GORM (MySQL, PostgreSQL, SQLite)
-* [github.com/gernest/qlstore](https://github.com/gernest/qlstore) - ql
-
-## License
-
-BSD licensed. See the LICENSE file for details.
diff --git a/vendor/github.com/gorilla/sessions/doc.go b/vendor/github.com/gorilla/sessions/doc.go
deleted file mode 100644
index 668e05e..0000000
--- a/vendor/github.com/gorilla/sessions/doc.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package sessions provides cookie and filesystem sessions and
-infrastructure for custom session backends.
-
-The key features are:
-
- * Simple API: use it as an easy way to set signed (and optionally
- encrypted) cookies.
- * Built-in backends to store sessions in cookies or the filesystem.
- * Flash messages: session values that last until read.
- * Convenient way to switch session persistency (aka "remember me") and set
- other attributes.
- * Mechanism to rotate authentication and encryption keys.
- * Multiple sessions per request, even using different backends.
- * Interfaces and infrastructure for custom session backends: sessions from
- different stores can be retrieved and batch-saved using a common API.
-
-Let's start with an example that shows the sessions API in a nutshell:
-
- import (
- "net/http"
- "github.com/gorilla/sessions"
- )
-
- var store = sessions.NewCookieStore([]byte("something-very-secret"))
-
- func MyHandler(w http.ResponseWriter, r *http.Request) {
- // Get a session. We're ignoring the error resulted from decoding an
- // existing session: Get() always returns a session, even if empty.
- session, err := store.Get(r, "session-name")
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
-
- // Set some session values.
- session.Values["foo"] = "bar"
- session.Values[42] = 43
- // Save it before we write to the response/return from the handler.
- session.Save(r, w)
- }
-
-First we initialize a session store calling NewCookieStore() and passing a
-secret key used to authenticate the session. Inside the handler, we call
-store.Get() to retrieve an existing session or a new one. Then we set some
-session values in session.Values, which is a map[interface{}]interface{}.
-And finally we call session.Save() to save the session in the response.
-
-Note that in production code, we should check for errors when calling
-session.Save(r, w), and either display an error message or otherwise handle it.
-
-Save must be called before writing to the response, otherwise the session
-cookie will not be sent to the client.
-
-Important Note: If you aren't using gorilla/mux, you need to wrap your handlers
-with context.ClearHandler as or else you will leak memory! An easy way to do this
-is to wrap the top-level mux when calling http.ListenAndServe:
-
- http.ListenAndServe(":8080", context.ClearHandler(http.DefaultServeMux))
-
-The ClearHandler function is provided by the gorilla/context package.
-
-That's all you need to know for the basic usage. Let's take a look at other
-options, starting with flash messages.
-
-Flash messages are session values that last until read. The term appeared with
-Ruby On Rails a few years back. When we request a flash message, it is removed
-from the session. To add a flash, call session.AddFlash(), and to get all
-flashes, call session.Flashes(). Here is an example:
-
- func MyHandler(w http.ResponseWriter, r *http.Request) {
- // Get a session.
- session, err := store.Get(r, "session-name")
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
-
- // Get the previously flashes, if any.
- if flashes := session.Flashes(); len(flashes) > 0 {
- // Use the flash values.
- } else {
- // Set a new flash.
- session.AddFlash("Hello, flash messages world!")
- }
- session.Save(r, w)
- }
-
-Flash messages are useful to set information to be read after a redirection,
-like after form submissions.
-
-There may also be cases where you want to store a complex datatype within a
-session, such as a struct. Sessions are serialised using the encoding/gob package,
-so it is easy to register new datatypes for storage in sessions:
-
- import(
- "encoding/gob"
- "github.com/gorilla/sessions"
- )
-
- type Person struct {
- FirstName string
- LastName string
- Email string
- Age int
- }
-
- type M map[string]interface{}
-
- func init() {
-
- gob.Register(&Person{})
- gob.Register(&M{})
- }
-
-As it's not possible to pass a raw type as a parameter to a function, gob.Register()
-relies on us passing it a value of the desired type. In the example above we've passed
-it a pointer to a struct and a pointer to a custom type representing a
-map[string]interface. (We could have passed non-pointer values if we wished.) This will
-then allow us to serialise/deserialise values of those types to and from our sessions.
-
-Note that because session values are stored in a map[string]interface{}, there's
-a need to type-assert data when retrieving it. We'll use the Person struct we registered above:
-
- func MyHandler(w http.ResponseWriter, r *http.Request) {
- session, err := store.Get(r, "session-name")
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
-
- // Retrieve our struct and type-assert it
- val := session.Values["person"]
- var person = &Person{}
- if person, ok := val.(*Person); !ok {
- // Handle the case that it's not an expected type
- }
-
- // Now we can use our person object
- }
-
-By default, session cookies last for a month. This is probably too long for
-some cases, but it is easy to change this and other attributes during
-runtime. Sessions can be configured individually or the store can be
-configured and then all sessions saved using it will use that configuration.
-We access session.Options or store.Options to set a new configuration. The
-fields are basically a subset of http.Cookie fields. Let's change the
-maximum age of a session to one week:
-
- session.Options = &sessions.Options{
- Path: "/",
- MaxAge: 86400 * 7,
- HttpOnly: true,
- }
-
-Sometimes we may want to change authentication and/or encryption keys without
-breaking existing sessions. The CookieStore supports key rotation, and to use
-it you just need to set multiple authentication and encryption keys, in pairs,
-to be tested in order:
-
- var store = sessions.NewCookieStore(
- []byte("new-authentication-key"),
- []byte("new-encryption-key"),
- []byte("old-authentication-key"),
- []byte("old-encryption-key"),
- )
-
-New sessions will be saved using the first pair. Old sessions can still be
-read because the first pair will fail, and the second will be tested. This
-makes it easy to "rotate" secret keys and still be able to validate existing
-sessions. Note: for all pairs the encryption key is optional; set it to nil
-or omit it and and encryption won't be used.
-
-Multiple sessions can be used in the same request, even with different
-session backends. When this happens, calling Save() on each session
-individually would be cumbersome, so we have a way to save all sessions
-at once: it's sessions.Save(). Here's an example:
-
- var store = sessions.NewCookieStore([]byte("something-very-secret"))
-
- func MyHandler(w http.ResponseWriter, r *http.Request) {
- // Get a session and set a value.
- session1, _ := store.Get(r, "session-one")
- session1.Values["foo"] = "bar"
- // Get another session and set another value.
- session2, _ := store.Get(r, "session-two")
- session2.Values[42] = 43
- // Save all sessions.
- sessions.Save(r, w)
- }
-
-This is possible because when we call Get() from a session store, it adds the
-session to a common registry. Save() uses it to save all registered sessions.
-*/
-package sessions
diff --git a/vendor/github.com/gorilla/sessions/lex.go b/vendor/github.com/gorilla/sessions/lex.go
deleted file mode 100644
index 4bbbe10..0000000
--- a/vendor/github.com/gorilla/sessions/lex.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// This file contains code adapted from the Go standard library
-// https://github.com/golang/go/blob/39ad0fd0789872f9469167be7fe9578625ff246e/src/net/http/lex.go
-
-package sessions
-
-import "strings"
-
-var isTokenTable = [127]bool{
- '!': true,
- '#': true,
- '$': true,
- '%': true,
- '&': true,
- '\'': true,
- '*': true,
- '+': true,
- '-': true,
- '.': true,
- '0': true,
- '1': true,
- '2': true,
- '3': true,
- '4': true,
- '5': true,
- '6': true,
- '7': true,
- '8': true,
- '9': true,
- 'A': true,
- 'B': true,
- 'C': true,
- 'D': true,
- 'E': true,
- 'F': true,
- 'G': true,
- 'H': true,
- 'I': true,
- 'J': true,
- 'K': true,
- 'L': true,
- 'M': true,
- 'N': true,
- 'O': true,
- 'P': true,
- 'Q': true,
- 'R': true,
- 'S': true,
- 'T': true,
- 'U': true,
- 'W': true,
- 'V': true,
- 'X': true,
- 'Y': true,
- 'Z': true,
- '^': true,
- '_': true,
- '`': true,
- 'a': true,
- 'b': true,
- 'c': true,
- 'd': true,
- 'e': true,
- 'f': true,
- 'g': true,
- 'h': true,
- 'i': true,
- 'j': true,
- 'k': true,
- 'l': true,
- 'm': true,
- 'n': true,
- 'o': true,
- 'p': true,
- 'q': true,
- 'r': true,
- 's': true,
- 't': true,
- 'u': true,
- 'v': true,
- 'w': true,
- 'x': true,
- 'y': true,
- 'z': true,
- '|': true,
- '~': true,
-}
-
-func isToken(r rune) bool {
- i := int(r)
- return i < len(isTokenTable) && isTokenTable[i]
-}
-
-func isNotToken(r rune) bool {
- return !isToken(r)
-}
-
-func isCookieNameValid(raw string) bool {
- if raw == "" {
- return false
- }
- return strings.IndexFunc(raw, isNotToken) < 0
-}
diff --git a/vendor/github.com/gorilla/sessions/sessions.go b/vendor/github.com/gorilla/sessions/sessions.go
deleted file mode 100644
index fe0d2bc..0000000
--- a/vendor/github.com/gorilla/sessions/sessions.go
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sessions
-
-import (
- "encoding/gob"
- "fmt"
- "net/http"
- "time"
-
- "github.com/gorilla/context"
-)
-
-// Default flashes key.
-const flashesKey = "_flash"
-
-// Options --------------------------------------------------------------------
-
-// Options stores configuration for a session or session store.
-//
-// Fields are a subset of http.Cookie fields.
-type Options struct {
- Path string
- Domain string
- // MaxAge=0 means no 'Max-Age' attribute specified.
- // MaxAge<0 means delete cookie now, equivalently 'Max-Age: 0'.
- // MaxAge>0 means Max-Age attribute present and given in seconds.
- MaxAge int
- Secure bool
- HttpOnly bool
-}
-
-// Session --------------------------------------------------------------------
-
-// NewSession is called by session stores to create a new session instance.
-func NewSession(store Store, name string) *Session {
- return &Session{
- Values: make(map[interface{}]interface{}),
- store: store,
- name: name,
- }
-}
-
-// Session stores the values and optional configuration for a session.
-type Session struct {
- // The ID of the session, generated by stores. It should not be used for
- // user data.
- ID string
- // Values contains the user-data for the session.
- Values map[interface{}]interface{}
- Options *Options
- IsNew bool
- store Store
- name string
-}
-
-// Flashes returns a slice of flash messages from the session.
-//
-// A single variadic argument is accepted, and it is optional: it defines
-// the flash key. If not defined "_flash" is used by default.
-func (s *Session) Flashes(vars ...string) []interface{} {
- var flashes []interface{}
- key := flashesKey
- if len(vars) > 0 {
- key = vars[0]
- }
- if v, ok := s.Values[key]; ok {
- // Drop the flashes and return it.
- delete(s.Values, key)
- flashes = v.([]interface{})
- }
- return flashes
-}
-
-// AddFlash adds a flash message to the session.
-//
-// A single variadic argument is accepted, and it is optional: it defines
-// the flash key. If not defined "_flash" is used by default.
-func (s *Session) AddFlash(value interface{}, vars ...string) {
- key := flashesKey
- if len(vars) > 0 {
- key = vars[0]
- }
- var flashes []interface{}
- if v, ok := s.Values[key]; ok {
- flashes = v.([]interface{})
- }
- s.Values[key] = append(flashes, value)
-}
-
-// Save is a convenience method to save this session. It is the same as calling
-// store.Save(request, response, session). You should call Save before writing to
-// the response or returning from the handler.
-func (s *Session) Save(r *http.Request, w http.ResponseWriter) error {
- return s.store.Save(r, w, s)
-}
-
-// Name returns the name used to register the session.
-func (s *Session) Name() string {
- return s.name
-}
-
-// Store returns the session store used to register the session.
-func (s *Session) Store() Store {
- return s.store
-}
-
-// Registry -------------------------------------------------------------------
-
-// sessionInfo stores a session tracked by the registry.
-type sessionInfo struct {
- s *Session
- e error
-}
-
-// contextKey is the type used to store the registry in the context.
-type contextKey int
-
-// registryKey is the key used to store the registry in the context.
-const registryKey contextKey = 0
-
-// GetRegistry returns a registry instance for the current request.
-func GetRegistry(r *http.Request) *Registry {
- registry := context.Get(r, registryKey)
- if registry != nil {
- return registry.(*Registry)
- }
- newRegistry := &Registry{
- request: r,
- sessions: make(map[string]sessionInfo),
- }
- context.Set(r, registryKey, newRegistry)
- return newRegistry
-}
-
-// Registry stores sessions used during a request.
-type Registry struct {
- request *http.Request
- sessions map[string]sessionInfo
-}
-
-// Get registers and returns a session for the given name and session store.
-//
-// It returns a new session if there are no sessions registered for the name.
-func (s *Registry) Get(store Store, name string) (session *Session, err error) {
- if !isCookieNameValid(name) {
- return nil, fmt.Errorf("sessions: invalid character in cookie name: %s", name)
- }
- if info, ok := s.sessions[name]; ok {
- session, err = info.s, info.e
- } else {
- session, err = store.New(s.request, name)
- session.name = name
- s.sessions[name] = sessionInfo{s: session, e: err}
- }
- session.store = store
- return
-}
-
-// Save saves all sessions registered for the current request.
-func (s *Registry) Save(w http.ResponseWriter) error {
- var errMulti MultiError
- for name, info := range s.sessions {
- session := info.s
- if session.store == nil {
- errMulti = append(errMulti, fmt.Errorf(
- "sessions: missing store for session %q", name))
- } else if err := session.store.Save(s.request, w, session); err != nil {
- errMulti = append(errMulti, fmt.Errorf(
- "sessions: error saving session %q -- %v", name, err))
- }
- }
- if errMulti != nil {
- return errMulti
- }
- return nil
-}
-
-// Helpers --------------------------------------------------------------------
-
-func init() {
- gob.Register([]interface{}{})
-}
-
-// Save saves all sessions used during the current request.
-func Save(r *http.Request, w http.ResponseWriter) error {
- return GetRegistry(r).Save(w)
-}
-
-// NewCookie returns an http.Cookie with the options set. It also sets
-// the Expires field calculated based on the MaxAge value, for Internet
-// Explorer compatibility.
-func NewCookie(name, value string, options *Options) *http.Cookie {
- cookie := &http.Cookie{
- Name: name,
- Value: value,
- Path: options.Path,
- Domain: options.Domain,
- MaxAge: options.MaxAge,
- Secure: options.Secure,
- HttpOnly: options.HttpOnly,
- }
- if options.MaxAge > 0 {
- d := time.Duration(options.MaxAge) * time.Second
- cookie.Expires = time.Now().Add(d)
- } else if options.MaxAge < 0 {
- // Set it to the past to expire now.
- cookie.Expires = time.Unix(1, 0)
- }
- return cookie
-}
-
-// Error ----------------------------------------------------------------------
-
-// MultiError stores multiple errors.
-//
-// Borrowed from the App Engine SDK.
-type MultiError []error
-
-func (m MultiError) Error() string {
- s, n := "", 0
- for _, e := range m {
- if e != nil {
- if n == 0 {
- s = e.Error()
- }
- n++
- }
- }
- switch n {
- case 0:
- return "(0 errors)"
- case 1:
- return s
- case 2:
- return s + " (and 1 other error)"
- }
- return fmt.Sprintf("%s (and %d other errors)", s, n-1)
-}
diff --git a/vendor/github.com/gorilla/sessions/store.go b/vendor/github.com/gorilla/sessions/store.go
deleted file mode 100644
index 4ff6b6c..0000000
--- a/vendor/github.com/gorilla/sessions/store.go
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sessions
-
-import (
- "encoding/base32"
- "io/ioutil"
- "net/http"
- "os"
- "path/filepath"
- "strings"
- "sync"
-
- "github.com/gorilla/securecookie"
-)
-
-// Store is an interface for custom session stores.
-//
-// See CookieStore and FilesystemStore for examples.
-type Store interface {
- // Get should return a cached session.
- Get(r *http.Request, name string) (*Session, error)
-
- // New should create and return a new session.
- //
- // Note that New should never return a nil session, even in the case of
- // an error if using the Registry infrastructure to cache the session.
- New(r *http.Request, name string) (*Session, error)
-
- // Save should persist session to the underlying store implementation.
- Save(r *http.Request, w http.ResponseWriter, s *Session) error
-}
-
-// CookieStore ----------------------------------------------------------------
-
-// NewCookieStore returns a new CookieStore.
-//
-// Keys are defined in pairs to allow key rotation, but the common case is
-// to set a single authentication key and optionally an encryption key.
-//
-// The first key in a pair is used for authentication and the second for
-// encryption. The encryption key can be set to nil or omitted in the last
-// pair, but the authentication key is required in all pairs.
-//
-// It is recommended to use an authentication key with 32 or 64 bytes.
-// The encryption key, if set, must be either 16, 24, or 32 bytes to select
-// AES-128, AES-192, or AES-256 modes.
-//
-// Use the convenience function securecookie.GenerateRandomKey() to create
-// strong keys.
-func NewCookieStore(keyPairs ...[]byte) *CookieStore {
- cs := &CookieStore{
- Codecs: securecookie.CodecsFromPairs(keyPairs...),
- Options: &Options{
- Path: "/",
- MaxAge: 86400 * 30,
- },
- }
-
- cs.MaxAge(cs.Options.MaxAge)
- return cs
-}
-
-// CookieStore stores sessions using secure cookies.
-type CookieStore struct {
- Codecs []securecookie.Codec
- Options *Options // default configuration
-}
-
-// Get returns a session for the given name after adding it to the registry.
-//
-// It returns a new session if the sessions doesn't exist. Access IsNew on
-// the session to check if it is an existing session or a new one.
-//
-// It returns a new session and an error if the session exists but could
-// not be decoded.
-func (s *CookieStore) Get(r *http.Request, name string) (*Session, error) {
- return GetRegistry(r).Get(s, name)
-}
-
-// New returns a session for the given name without adding it to the registry.
-//
-// The difference between New() and Get() is that calling New() twice will
-// decode the session data twice, while Get() registers and reuses the same
-// decoded session after the first call.
-func (s *CookieStore) New(r *http.Request, name string) (*Session, error) {
- session := NewSession(s, name)
- opts := *s.Options
- session.Options = &opts
- session.IsNew = true
- var err error
- if c, errCookie := r.Cookie(name); errCookie == nil {
- err = securecookie.DecodeMulti(name, c.Value, &session.Values,
- s.Codecs...)
- if err == nil {
- session.IsNew = false
- }
- }
- return session, err
-}
-
-// Save adds a single session to the response.
-func (s *CookieStore) Save(r *http.Request, w http.ResponseWriter,
- session *Session) error {
- encoded, err := securecookie.EncodeMulti(session.Name(), session.Values,
- s.Codecs...)
- if err != nil {
- return err
- }
- http.SetCookie(w, NewCookie(session.Name(), encoded, session.Options))
- return nil
-}
-
-// MaxAge sets the maximum age for the store and the underlying cookie
-// implementation. Individual sessions can be deleted by setting Options.MaxAge
-// = -1 for that session.
-func (s *CookieStore) MaxAge(age int) {
- s.Options.MaxAge = age
-
- // Set the maxAge for each securecookie instance.
- for _, codec := range s.Codecs {
- if sc, ok := codec.(*securecookie.SecureCookie); ok {
- sc.MaxAge(age)
- }
- }
-}
-
-// FilesystemStore ------------------------------------------------------------
-
-var fileMutex sync.RWMutex
-
-// NewFilesystemStore returns a new FilesystemStore.
-//
-// The path argument is the directory where sessions will be saved. If empty
-// it will use os.TempDir().
-//
-// See NewCookieStore() for a description of the other parameters.
-func NewFilesystemStore(path string, keyPairs ...[]byte) *FilesystemStore {
- if path == "" {
- path = os.TempDir()
- }
- fs := &FilesystemStore{
- Codecs: securecookie.CodecsFromPairs(keyPairs...),
- Options: &Options{
- Path: "/",
- MaxAge: 86400 * 30,
- },
- path: path,
- }
-
- fs.MaxAge(fs.Options.MaxAge)
- return fs
-}
-
-// FilesystemStore stores sessions in the filesystem.
-//
-// It also serves as a reference for custom stores.
-//
-// This store is still experimental and not well tested. Feedback is welcome.
-type FilesystemStore struct {
- Codecs []securecookie.Codec
- Options *Options // default configuration
- path string
-}
-
-// MaxLength restricts the maximum length of new sessions to l.
-// If l is 0 there is no limit to the size of a session, use with caution.
-// The default for a new FilesystemStore is 4096.
-func (s *FilesystemStore) MaxLength(l int) {
- for _, c := range s.Codecs {
- if codec, ok := c.(*securecookie.SecureCookie); ok {
- codec.MaxLength(l)
- }
- }
-}
-
-// Get returns a session for the given name after adding it to the registry.
-//
-// See CookieStore.Get().
-func (s *FilesystemStore) Get(r *http.Request, name string) (*Session, error) {
- return GetRegistry(r).Get(s, name)
-}
-
-// New returns a session for the given name without adding it to the registry.
-//
-// See CookieStore.New().
-func (s *FilesystemStore) New(r *http.Request, name string) (*Session, error) {
- session := NewSession(s, name)
- opts := *s.Options
- session.Options = &opts
- session.IsNew = true
- var err error
- if c, errCookie := r.Cookie(name); errCookie == nil {
- err = securecookie.DecodeMulti(name, c.Value, &session.ID, s.Codecs...)
- if err == nil {
- err = s.load(session)
- if err == nil {
- session.IsNew = false
- }
- }
- }
- return session, err
-}
-
-// Save adds a single session to the response.
-//
-// If the Options.MaxAge of the session is <= 0 then the session file will be
-// deleted from the store path. With this process it enforces the properly
-// session cookie handling so no need to trust in the cookie management in the
-// web browser.
-func (s *FilesystemStore) Save(r *http.Request, w http.ResponseWriter,
- session *Session) error {
- // Delete if max-age is <= 0
- if session.Options.MaxAge <= 0 {
- if err := s.erase(session); err != nil {
- return err
- }
- http.SetCookie(w, NewCookie(session.Name(), "", session.Options))
- return nil
- }
-
- if session.ID == "" {
- // Because the ID is used in the filename, encode it to
- // use alphanumeric characters only.
- session.ID = strings.TrimRight(
- base32.StdEncoding.EncodeToString(
- securecookie.GenerateRandomKey(32)), "=")
- }
- if err := s.save(session); err != nil {
- return err
- }
- encoded, err := securecookie.EncodeMulti(session.Name(), session.ID,
- s.Codecs...)
- if err != nil {
- return err
- }
- http.SetCookie(w, NewCookie(session.Name(), encoded, session.Options))
- return nil
-}
-
-// MaxAge sets the maximum age for the store and the underlying cookie
-// implementation. Individual sessions can be deleted by setting Options.MaxAge
-// = -1 for that session.
-func (s *FilesystemStore) MaxAge(age int) {
- s.Options.MaxAge = age
-
- // Set the maxAge for each securecookie instance.
- for _, codec := range s.Codecs {
- if sc, ok := codec.(*securecookie.SecureCookie); ok {
- sc.MaxAge(age)
- }
- }
-}
-
-// save writes encoded session.Values to a file.
-func (s *FilesystemStore) save(session *Session) error {
- encoded, err := securecookie.EncodeMulti(session.Name(), session.Values,
- s.Codecs...)
- if err != nil {
- return err
- }
- filename := filepath.Join(s.path, "session_"+session.ID)
- fileMutex.Lock()
- defer fileMutex.Unlock()
- return ioutil.WriteFile(filename, []byte(encoded), 0600)
-}
-
-// load reads a file and decodes its content into session.Values.
-func (s *FilesystemStore) load(session *Session) error {
- filename := filepath.Join(s.path, "session_"+session.ID)
- fileMutex.RLock()
- defer fileMutex.RUnlock()
- fdata, err := ioutil.ReadFile(filename)
- if err != nil {
- return err
- }
- if err = securecookie.DecodeMulti(session.Name(), string(fdata),
- &session.Values, s.Codecs...); err != nil {
- return err
- }
- return nil
-}
-
-// delete session file
-func (s *FilesystemStore) erase(session *Session) error {
- filename := filepath.Join(s.path, "session_"+session.ID)
-
- fileMutex.RLock()
- defer fileMutex.RUnlock()
-
- err := os.Remove(filename)
- return err
-}
diff --git a/vendor/github.com/gorilla/websocket/.gitignore b/vendor/github.com/gorilla/websocket/.gitignore
deleted file mode 100644
index ac71020..0000000
--- a/vendor/github.com/gorilla/websocket/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-
-.idea/
-*.iml
\ No newline at end of file
diff --git a/vendor/github.com/gorilla/websocket/.travis.yml b/vendor/github.com/gorilla/websocket/.travis.yml
deleted file mode 100644
index 4ea1e7a..0000000
--- a/vendor/github.com/gorilla/websocket/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: go
-sudo: false
-
-matrix:
- include:
- - go: 1.4
- - go: 1.5
- - go: 1.6
- - go: 1.7
- - go: tip
- allow_failures:
- - go: tip
-
-script:
- - go get -t -v ./...
- - diff -u <(echo -n) <(gofmt -d .)
- - go vet $(go list ./... | grep -v /vendor/)
- - go test -v -race ./...
diff --git a/vendor/github.com/gorilla/websocket/AUTHORS b/vendor/github.com/gorilla/websocket/AUTHORS
deleted file mode 100644
index b003eca..0000000
--- a/vendor/github.com/gorilla/websocket/AUTHORS
+++ /dev/null
@@ -1,8 +0,0 @@
-# This is the official list of Gorilla WebSocket authors for copyright
-# purposes.
-#
-# Please keep the list sorted.
-
-Gary Burd
-Joachim Bauch
-
diff --git a/vendor/github.com/gorilla/websocket/LICENSE b/vendor/github.com/gorilla/websocket/LICENSE
deleted file mode 100644
index 9171c97..0000000
--- a/vendor/github.com/gorilla/websocket/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gorilla/websocket/README.md b/vendor/github.com/gorilla/websocket/README.md
deleted file mode 100644
index 33c3d2b..0000000
--- a/vendor/github.com/gorilla/websocket/README.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# Gorilla WebSocket
-
-Gorilla WebSocket is a [Go](http://golang.org/) implementation of the
-[WebSocket](http://www.rfc-editor.org/rfc/rfc6455.txt) protocol.
-
-[](https://travis-ci.org/gorilla/websocket)
-[](https://godoc.org/github.com/gorilla/websocket)
-
-### Documentation
-
-* [API Reference](http://godoc.org/github.com/gorilla/websocket)
-* [Chat example](https://github.com/gorilla/websocket/tree/master/examples/chat)
-* [Command example](https://github.com/gorilla/websocket/tree/master/examples/command)
-* [Client and server example](https://github.com/gorilla/websocket/tree/master/examples/echo)
-* [File watch example](https://github.com/gorilla/websocket/tree/master/examples/filewatch)
-
-### Status
-
-The Gorilla WebSocket package provides a complete and tested implementation of
-the [WebSocket](http://www.rfc-editor.org/rfc/rfc6455.txt) protocol. The
-package API is stable.
-
-### Installation
-
- go get github.com/gorilla/websocket
-
-### Protocol Compliance
-
-The Gorilla WebSocket package passes the server tests in the [Autobahn Test
-Suite](http://autobahn.ws/testsuite) using the application in the [examples/autobahn
-subdirectory](https://github.com/gorilla/websocket/tree/master/examples/autobahn).
-
-### Gorilla WebSocket compared with other packages
-
-
-
-
-Notes:
-
-1. Large messages are fragmented in [Chrome's new WebSocket implementation](http://www.ietf.org/mail-archive/web/hybi/current/msg10503.html).
-2. The application can get the type of a received data message by implementing
- a [Codec marshal](http://godoc.org/golang.org/x/net/websocket#Codec.Marshal)
- function.
-3. The go.net io.Reader and io.Writer operate across WebSocket frame boundaries.
- Read returns when the input buffer is full or a frame boundary is
- encountered. Each call to Write sends a single frame message. The Gorilla
- io.Reader and io.WriteCloser operate on a single WebSocket message.
-
diff --git a/vendor/github.com/gorilla/websocket/client.go b/vendor/github.com/gorilla/websocket/client.go
deleted file mode 100644
index 78d9328..0000000
--- a/vendor/github.com/gorilla/websocket/client.go
+++ /dev/null
@@ -1,420 +0,0 @@
-// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
- "bufio"
- "bytes"
- "crypto/tls"
- "encoding/base64"
- "errors"
- "io"
- "io/ioutil"
- "net"
- "net/http"
- "net/url"
- "strings"
- "time"
-)
-
-// ErrBadHandshake is returned when the server response to opening handshake is
-// invalid.
-var ErrBadHandshake = errors.New("websocket: bad handshake")
-
-var errInvalidCompression = errors.New("websocket: invalid compression negotiation")
-
-// NewClient creates a new client connection using the given net connection.
-// The URL u specifies the host and request URI. Use requestHeader to specify
-// the origin (Origin), subprotocols (Sec-WebSocket-Protocol) and cookies
-// (Cookie). Use the response.Header to get the selected subprotocol
-// (Sec-WebSocket-Protocol) and cookies (Set-Cookie).
-//
-// If the WebSocket handshake fails, ErrBadHandshake is returned along with a
-// non-nil *http.Response so that callers can handle redirects, authentication,
-// etc.
-//
-// Deprecated: Use Dialer instead.
-func NewClient(netConn net.Conn, u *url.URL, requestHeader http.Header, readBufSize, writeBufSize int) (c *Conn, response *http.Response, err error) {
- d := Dialer{
- ReadBufferSize: readBufSize,
- WriteBufferSize: writeBufSize,
- NetDial: func(net, addr string) (net.Conn, error) {
- return netConn, nil
- },
- }
- return d.Dial(u.String(), requestHeader)
-}
-
-// A Dialer contains options for connecting to WebSocket server.
-type Dialer struct {
- // NetDial specifies the dial function for creating TCP connections. If
- // NetDial is nil, net.Dial is used.
- NetDial func(network, addr string) (net.Conn, error)
-
- // Proxy specifies a function to return a proxy for a given
- // Request. If the function returns a non-nil error, the
- // request is aborted with the provided error.
- // If Proxy is nil or returns a nil *URL, no proxy is used.
- Proxy func(*http.Request) (*url.URL, error)
-
- // TLSClientConfig specifies the TLS configuration to use with tls.Client.
- // If nil, the default configuration is used.
- TLSClientConfig *tls.Config
-
- // HandshakeTimeout specifies the duration for the handshake to complete.
- HandshakeTimeout time.Duration
-
- // Input and output buffer sizes. If the buffer size is zero, then a
- // default value of 4096 is used.
- ReadBufferSize, WriteBufferSize int
-
- // Subprotocols specifies the client's requested subprotocols.
- Subprotocols []string
-
- // EnableCompression specifies if the client should attempt to negotiate
- // per message compression (RFC 7692). Setting this value to true does not
- // guarantee that compression will be supported. Currently only "no context
- // takeover" modes are supported.
- EnableCompression bool
-
- // Jar specifies the cookie jar.
- // If Jar is nil, cookies are not sent in requests and ignored
- // in responses.
- Jar http.CookieJar
-}
-
-var errMalformedURL = errors.New("malformed ws or wss URL")
-
-// parseURL parses the URL.
-//
-// This function is a replacement for the standard library url.Parse function.
-// In Go 1.4 and earlier, url.Parse loses information from the path.
-func parseURL(s string) (*url.URL, error) {
- // From the RFC:
- //
- // ws-URI = "ws:" "//" host [ ":" port ] path [ "?" query ]
- // wss-URI = "wss:" "//" host [ ":" port ] path [ "?" query ]
- var u url.URL
- switch {
- case strings.HasPrefix(s, "ws://"):
- u.Scheme = "ws"
- s = s[len("ws://"):]
- case strings.HasPrefix(s, "wss://"):
- u.Scheme = "wss"
- s = s[len("wss://"):]
- default:
- return nil, errMalformedURL
- }
-
- if i := strings.Index(s, "?"); i >= 0 {
- u.RawQuery = s[i+1:]
- s = s[:i]
- }
-
- if i := strings.Index(s, "/"); i >= 0 {
- u.Opaque = s[i:]
- s = s[:i]
- } else {
- u.Opaque = "/"
- }
-
- u.Host = s
-
- if strings.Contains(u.Host, "@") {
- // Don't bother parsing user information because user information is
- // not allowed in websocket URIs.
- return nil, errMalformedURL
- }
-
- return &u, nil
-}
-
-func hostPortNoPort(u *url.URL) (hostPort, hostNoPort string) {
- hostPort = u.Host
- hostNoPort = u.Host
- if i := strings.LastIndex(u.Host, ":"); i > strings.LastIndex(u.Host, "]") {
- hostNoPort = hostNoPort[:i]
- } else {
- switch u.Scheme {
- case "wss":
- hostPort += ":443"
- case "https":
- hostPort += ":443"
- default:
- hostPort += ":80"
- }
- }
- return hostPort, hostNoPort
-}
-
-// DefaultDialer is a dialer with all fields set to the default zero values.
-var DefaultDialer = &Dialer{
- Proxy: http.ProxyFromEnvironment,
-}
-
-// Dial creates a new client connection. Use requestHeader to specify the
-// origin (Origin), subprotocols (Sec-WebSocket-Protocol) and cookies (Cookie).
-// Use the response.Header to get the selected subprotocol
-// (Sec-WebSocket-Protocol) and cookies (Set-Cookie).
-//
-// If the WebSocket handshake fails, ErrBadHandshake is returned along with a
-// non-nil *http.Response so that callers can handle redirects, authentication,
-// etcetera. The response body may not contain the entire response and does not
-// need to be closed by the application.
-func (d *Dialer) Dial(urlStr string, requestHeader http.Header) (*Conn, *http.Response, error) {
-
- if d == nil {
- d = &Dialer{
- Proxy: http.ProxyFromEnvironment,
- }
- }
-
- challengeKey, err := generateChallengeKey()
- if err != nil {
- return nil, nil, err
- }
-
- u, err := parseURL(urlStr)
- if err != nil {
- return nil, nil, err
- }
-
- switch u.Scheme {
- case "ws":
- u.Scheme = "http"
- case "wss":
- u.Scheme = "https"
- default:
- return nil, nil, errMalformedURL
- }
-
- if u.User != nil {
- // User name and password are not allowed in websocket URIs.
- return nil, nil, errMalformedURL
- }
-
- req := &http.Request{
- Method: "GET",
- URL: u,
- Proto: "HTTP/1.1",
- ProtoMajor: 1,
- ProtoMinor: 1,
- Header: make(http.Header),
- Host: u.Host,
- }
-
- // Set the cookies present in the cookie jar of the dialer
- if d.Jar != nil {
- for _, cookie := range d.Jar.Cookies(u) {
- req.AddCookie(cookie)
- }
- }
-
- // Set the request headers using the capitalization for names and values in
- // RFC examples. Although the capitalization shouldn't matter, there are
- // servers that depend on it. The Header.Set method is not used because the
- // method canonicalizes the header names.
- req.Header["Upgrade"] = []string{"websocket"}
- req.Header["Connection"] = []string{"Upgrade"}
- req.Header["Sec-WebSocket-Key"] = []string{challengeKey}
- req.Header["Sec-WebSocket-Version"] = []string{"13"}
- if len(d.Subprotocols) > 0 {
- req.Header["Sec-WebSocket-Protocol"] = []string{strings.Join(d.Subprotocols, ", ")}
- }
- for k, vs := range requestHeader {
- switch {
- case k == "Host":
- if len(vs) > 0 {
- req.Host = vs[0]
- }
- case k == "Upgrade" ||
- k == "Connection" ||
- k == "Sec-Websocket-Key" ||
- k == "Sec-Websocket-Version" ||
- k == "Sec-Websocket-Extensions" ||
- (k == "Sec-Websocket-Protocol" && len(d.Subprotocols) > 0):
- return nil, nil, errors.New("websocket: duplicate header not allowed: " + k)
- default:
- req.Header[k] = vs
- }
- }
-
- if d.EnableCompression {
- req.Header.Set("Sec-Websocket-Extensions", "permessage-deflate; server_no_context_takeover; client_no_context_takeover")
- }
-
- hostPort, hostNoPort := hostPortNoPort(u)
-
- var proxyURL *url.URL
- // Check wether the proxy method has been configured
- if d.Proxy != nil {
- proxyURL, err = d.Proxy(req)
- }
- if err != nil {
- return nil, nil, err
- }
-
- var targetHostPort string
- if proxyURL != nil {
- targetHostPort, _ = hostPortNoPort(proxyURL)
- } else {
- targetHostPort = hostPort
- }
-
- var deadline time.Time
- if d.HandshakeTimeout != 0 {
- deadline = time.Now().Add(d.HandshakeTimeout)
- }
-
- netDial := d.NetDial
- if netDial == nil {
- netDialer := &net.Dialer{Deadline: deadline}
- netDial = netDialer.Dial
- }
-
- netConn, err := netDial("tcp", targetHostPort)
- if err != nil {
- return nil, nil, err
- }
-
- defer func() {
- if netConn != nil {
- netConn.Close()
- }
- }()
-
- if err := netConn.SetDeadline(deadline); err != nil {
- return nil, nil, err
- }
-
- if proxyURL != nil {
- connectHeader := make(http.Header)
- if user := proxyURL.User; user != nil {
- proxyUser := user.Username()
- if proxyPassword, passwordSet := user.Password(); passwordSet {
- credential := base64.StdEncoding.EncodeToString([]byte(proxyUser + ":" + proxyPassword))
- connectHeader.Set("Proxy-Authorization", "Basic "+credential)
- }
- }
- connectReq := &http.Request{
- Method: "CONNECT",
- URL: &url.URL{Opaque: hostPort},
- Host: hostPort,
- Header: connectHeader,
- }
-
- connectReq.Write(netConn)
-
- // Read response.
- // Okay to use and discard buffered reader here, because
- // TLS server will not speak until spoken to.
- br := bufio.NewReader(netConn)
- resp, err := http.ReadResponse(br, connectReq)
- if err != nil {
- return nil, nil, err
- }
- if resp.StatusCode != 200 {
- f := strings.SplitN(resp.Status, " ", 2)
- return nil, nil, errors.New(f[1])
- }
- }
-
- if u.Scheme == "https" {
- cfg := cloneTLSConfig(d.TLSClientConfig)
- if cfg.ServerName == "" {
- cfg.ServerName = hostNoPort
- }
- tlsConn := tls.Client(netConn, cfg)
- netConn = tlsConn
- if err := tlsConn.Handshake(); err != nil {
- return nil, nil, err
- }
- if !cfg.InsecureSkipVerify {
- if err := tlsConn.VerifyHostname(cfg.ServerName); err != nil {
- return nil, nil, err
- }
- }
- }
-
- conn := newConn(netConn, false, d.ReadBufferSize, d.WriteBufferSize)
-
- if err := req.Write(netConn); err != nil {
- return nil, nil, err
- }
-
- resp, err := http.ReadResponse(conn.br, req)
- if err != nil {
- return nil, nil, err
- }
-
- if d.Jar != nil {
- if rc := resp.Cookies(); len(rc) > 0 {
- d.Jar.SetCookies(u, rc)
- }
- }
-
- if resp.StatusCode != 101 ||
- !strings.EqualFold(resp.Header.Get("Upgrade"), "websocket") ||
- !strings.EqualFold(resp.Header.Get("Connection"), "upgrade") ||
- resp.Header.Get("Sec-Websocket-Accept") != computeAcceptKey(challengeKey) {
- // Before closing the network connection on return from this
- // function, slurp up some of the response to aid application
- // debugging.
- buf := make([]byte, 1024)
- n, _ := io.ReadFull(resp.Body, buf)
- resp.Body = ioutil.NopCloser(bytes.NewReader(buf[:n]))
- return nil, resp, ErrBadHandshake
- }
-
- for _, ext := range parseExtensions(req.Header) {
- if ext[""] != "permessage-deflate" {
- continue
- }
- _, snct := ext["server_no_context_takeover"]
- _, cnct := ext["client_no_context_takeover"]
- if !snct || !cnct {
- return nil, resp, errInvalidCompression
- }
- conn.newCompressionWriter = compressNoContextTakeover
- conn.newDecompressionReader = decompressNoContextTakeover
- break
- }
-
- resp.Body = ioutil.NopCloser(bytes.NewReader([]byte{}))
- conn.subprotocol = resp.Header.Get("Sec-Websocket-Protocol")
-
- netConn.SetDeadline(time.Time{})
- netConn = nil // to avoid close in defer.
- return conn, resp, nil
-}
-
-// cloneTLSConfig clones all public fields except the fields
-// SessionTicketsDisabled and SessionTicketKey. This avoids copying the
-// sync.Mutex in the sync.Once and makes it safe to call cloneTLSConfig on a
-// config in active use.
-func cloneTLSConfig(cfg *tls.Config) *tls.Config {
- if cfg == nil {
- return &tls.Config{}
- }
- return &tls.Config{
- Rand: cfg.Rand,
- Time: cfg.Time,
- Certificates: cfg.Certificates,
- NameToCertificate: cfg.NameToCertificate,
- GetCertificate: cfg.GetCertificate,
- RootCAs: cfg.RootCAs,
- NextProtos: cfg.NextProtos,
- ServerName: cfg.ServerName,
- ClientAuth: cfg.ClientAuth,
- ClientCAs: cfg.ClientCAs,
- InsecureSkipVerify: cfg.InsecureSkipVerify,
- CipherSuites: cfg.CipherSuites,
- PreferServerCipherSuites: cfg.PreferServerCipherSuites,
- ClientSessionCache: cfg.ClientSessionCache,
- MinVersion: cfg.MinVersion,
- MaxVersion: cfg.MaxVersion,
- CurvePreferences: cfg.CurvePreferences,
- }
-}
diff --git a/vendor/github.com/gorilla/websocket/compression.go b/vendor/github.com/gorilla/websocket/compression.go
deleted file mode 100644
index d642631..0000000
--- a/vendor/github.com/gorilla/websocket/compression.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2017 The Gorilla WebSocket Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
- "compress/flate"
- "errors"
- "io"
- "strings"
- "sync"
-)
-
-var (
- flateWriterPool = sync.Pool{New: func() interface{} {
- fw, _ := flate.NewWriter(nil, 3)
- return fw
- }}
- flateReaderPool = sync.Pool{New: func() interface{} {
- return flate.NewReader(nil)
- }}
-)
-
-func decompressNoContextTakeover(r io.Reader) io.ReadCloser {
- const tail =
- // Add four bytes as specified in RFC
- "\x00\x00\xff\xff" +
- // Add final block to squelch unexpected EOF error from flate reader.
- "\x01\x00\x00\xff\xff"
-
- fr, _ := flateReaderPool.Get().(io.ReadCloser)
- fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), nil)
- return &flateReadWrapper{fr}
-}
-
-func compressNoContextTakeover(w io.WriteCloser) io.WriteCloser {
- tw := &truncWriter{w: w}
- fw, _ := flateWriterPool.Get().(*flate.Writer)
- fw.Reset(tw)
- return &flateWriteWrapper{fw: fw, tw: tw}
-}
-
-// truncWriter is an io.Writer that writes all but the last four bytes of the
-// stream to another io.Writer.
-type truncWriter struct {
- w io.WriteCloser
- n int
- p [4]byte
-}
-
-func (w *truncWriter) Write(p []byte) (int, error) {
- n := 0
-
- // fill buffer first for simplicity.
- if w.n < len(w.p) {
- n = copy(w.p[w.n:], p)
- p = p[n:]
- w.n += n
- if len(p) == 0 {
- return n, nil
- }
- }
-
- m := len(p)
- if m > len(w.p) {
- m = len(w.p)
- }
-
- if nn, err := w.w.Write(w.p[:m]); err != nil {
- return n + nn, err
- }
-
- copy(w.p[:], w.p[m:])
- copy(w.p[len(w.p)-m:], p[len(p)-m:])
- nn, err := w.w.Write(p[:len(p)-m])
- return n + nn, err
-}
-
-type flateWriteWrapper struct {
- fw *flate.Writer
- tw *truncWriter
-}
-
-func (w *flateWriteWrapper) Write(p []byte) (int, error) {
- if w.fw == nil {
- return 0, errWriteClosed
- }
- return w.fw.Write(p)
-}
-
-func (w *flateWriteWrapper) Close() error {
- if w.fw == nil {
- return errWriteClosed
- }
- err1 := w.fw.Flush()
- flateWriterPool.Put(w.fw)
- w.fw = nil
- if w.tw.p != [4]byte{0, 0, 0xff, 0xff} {
- return errors.New("websocket: internal error, unexpected bytes at end of flate stream")
- }
- err2 := w.tw.w.Close()
- if err1 != nil {
- return err1
- }
- return err2
-}
-
-type flateReadWrapper struct {
- fr io.ReadCloser
-}
-
-func (r *flateReadWrapper) Read(p []byte) (int, error) {
- if r.fr == nil {
- return 0, io.ErrClosedPipe
- }
- n, err := r.fr.Read(p)
- if err == io.EOF {
- // Preemptively place the reader back in the pool. This helps with
- // scenarios where the application does not call NextReader() soon after
- // this final read.
- r.Close()
- }
- return n, err
-}
-
-func (r *flateReadWrapper) Close() error {
- if r.fr == nil {
- return io.ErrClosedPipe
- }
- err := r.fr.Close()
- flateReaderPool.Put(r.fr)
- r.fr = nil
- return err
-}
diff --git a/vendor/github.com/gorilla/websocket/conn.go b/vendor/github.com/gorilla/websocket/conn.go
deleted file mode 100644
index 218d8a9..0000000
--- a/vendor/github.com/gorilla/websocket/conn.go
+++ /dev/null
@@ -1,1055 +0,0 @@
-// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
- "bufio"
- "encoding/binary"
- "errors"
- "io"
- "io/ioutil"
- "math/rand"
- "net"
- "strconv"
- "sync"
- "time"
- "unicode/utf8"
-)
-
-const (
- // Frame header byte 0 bits from Section 5.2 of RFC 6455
- finalBit = 1 << 7
- rsv1Bit = 1 << 6
- rsv2Bit = 1 << 5
- rsv3Bit = 1 << 4
-
- // Frame header byte 1 bits from Section 5.2 of RFC 6455
- maskBit = 1 << 7
-
- maxFrameHeaderSize = 2 + 8 + 4 // Fixed header + length + mask
- maxControlFramePayloadSize = 125
-
- writeWait = time.Second
-
- defaultReadBufferSize = 4096
- defaultWriteBufferSize = 4096
-
- continuationFrame = 0
- noFrame = -1
-)
-
-// Close codes defined in RFC 6455, section 11.7.
-const (
- CloseNormalClosure = 1000
- CloseGoingAway = 1001
- CloseProtocolError = 1002
- CloseUnsupportedData = 1003
- CloseNoStatusReceived = 1005
- CloseAbnormalClosure = 1006
- CloseInvalidFramePayloadData = 1007
- ClosePolicyViolation = 1008
- CloseMessageTooBig = 1009
- CloseMandatoryExtension = 1010
- CloseInternalServerErr = 1011
- CloseServiceRestart = 1012
- CloseTryAgainLater = 1013
- CloseTLSHandshake = 1015
-)
-
-// The message types are defined in RFC 6455, section 11.8.
-const (
- // TextMessage denotes a text data message. The text message payload is
- // interpreted as UTF-8 encoded text data.
- TextMessage = 1
-
- // BinaryMessage denotes a binary data message.
- BinaryMessage = 2
-
- // CloseMessage denotes a close control message. The optional message
- // payload contains a numeric code and text. Use the FormatCloseMessage
- // function to format a close message payload.
- CloseMessage = 8
-
- // PingMessage denotes a ping control message. The optional message payload
- // is UTF-8 encoded text.
- PingMessage = 9
-
- // PongMessage denotes a ping control message. The optional message payload
- // is UTF-8 encoded text.
- PongMessage = 10
-)
-
-// ErrCloseSent is returned when the application writes a message to the
-// connection after sending a close message.
-var ErrCloseSent = errors.New("websocket: close sent")
-
-// ErrReadLimit is returned when reading a message that is larger than the
-// read limit set for the connection.
-var ErrReadLimit = errors.New("websocket: read limit exceeded")
-
-// netError satisfies the net Error interface.
-type netError struct {
- msg string
- temporary bool
- timeout bool
-}
-
-func (e *netError) Error() string { return e.msg }
-func (e *netError) Temporary() bool { return e.temporary }
-func (e *netError) Timeout() bool { return e.timeout }
-
-// CloseError represents close frame.
-type CloseError struct {
-
- // Code is defined in RFC 6455, section 11.7.
- Code int
-
- // Text is the optional text payload.
- Text string
-}
-
-func (e *CloseError) Error() string {
- s := []byte("websocket: close ")
- s = strconv.AppendInt(s, int64(e.Code), 10)
- switch e.Code {
- case CloseNormalClosure:
- s = append(s, " (normal)"...)
- case CloseGoingAway:
- s = append(s, " (going away)"...)
- case CloseProtocolError:
- s = append(s, " (protocol error)"...)
- case CloseUnsupportedData:
- s = append(s, " (unsupported data)"...)
- case CloseNoStatusReceived:
- s = append(s, " (no status)"...)
- case CloseAbnormalClosure:
- s = append(s, " (abnormal closure)"...)
- case CloseInvalidFramePayloadData:
- s = append(s, " (invalid payload data)"...)
- case ClosePolicyViolation:
- s = append(s, " (policy violation)"...)
- case CloseMessageTooBig:
- s = append(s, " (message too big)"...)
- case CloseMandatoryExtension:
- s = append(s, " (mandatory extension missing)"...)
- case CloseInternalServerErr:
- s = append(s, " (internal server error)"...)
- case CloseTLSHandshake:
- s = append(s, " (TLS handshake error)"...)
- }
- if e.Text != "" {
- s = append(s, ": "...)
- s = append(s, e.Text...)
- }
- return string(s)
-}
-
-// IsCloseError returns boolean indicating whether the error is a *CloseError
-// with one of the specified codes.
-func IsCloseError(err error, codes ...int) bool {
- if e, ok := err.(*CloseError); ok {
- for _, code := range codes {
- if e.Code == code {
- return true
- }
- }
- }
- return false
-}
-
-// IsUnexpectedCloseError returns boolean indicating whether the error is a
-// *CloseError with a code not in the list of expected codes.
-func IsUnexpectedCloseError(err error, expectedCodes ...int) bool {
- if e, ok := err.(*CloseError); ok {
- for _, code := range expectedCodes {
- if e.Code == code {
- return false
- }
- }
- return true
- }
- return false
-}
-
-var (
- errWriteTimeout = &netError{msg: "websocket: write timeout", timeout: true, temporary: true}
- errUnexpectedEOF = &CloseError{Code: CloseAbnormalClosure, Text: io.ErrUnexpectedEOF.Error()}
- errBadWriteOpCode = errors.New("websocket: bad write message type")
- errWriteClosed = errors.New("websocket: write closed")
- errInvalidControlFrame = errors.New("websocket: invalid control frame")
-)
-
-func newMaskKey() [4]byte {
- n := rand.Uint32()
- return [4]byte{byte(n), byte(n >> 8), byte(n >> 16), byte(n >> 24)}
-}
-
-func hideTempErr(err error) error {
- if e, ok := err.(net.Error); ok && e.Temporary() {
- err = &netError{msg: e.Error(), timeout: e.Timeout()}
- }
- return err
-}
-
-func isControl(frameType int) bool {
- return frameType == CloseMessage || frameType == PingMessage || frameType == PongMessage
-}
-
-func isData(frameType int) bool {
- return frameType == TextMessage || frameType == BinaryMessage
-}
-
-var validReceivedCloseCodes = map[int]bool{
- // see http://www.iana.org/assignments/websocket/websocket.xhtml#close-code-number
-
- CloseNormalClosure: true,
- CloseGoingAway: true,
- CloseProtocolError: true,
- CloseUnsupportedData: true,
- CloseNoStatusReceived: false,
- CloseAbnormalClosure: false,
- CloseInvalidFramePayloadData: true,
- ClosePolicyViolation: true,
- CloseMessageTooBig: true,
- CloseMandatoryExtension: true,
- CloseInternalServerErr: true,
- CloseServiceRestart: true,
- CloseTryAgainLater: true,
- CloseTLSHandshake: false,
-}
-
-func isValidReceivedCloseCode(code int) bool {
- return validReceivedCloseCodes[code] || (code >= 3000 && code <= 4999)
-}
-
-// The Conn type represents a WebSocket connection.
-type Conn struct {
- conn net.Conn
- isServer bool
- subprotocol string
-
- // Write fields
- mu chan bool // used as mutex to protect write to conn
- writeBuf []byte // frame is constructed in this buffer.
- writeDeadline time.Time
- writer io.WriteCloser // the current writer returned to the application
- isWriting bool // for best-effort concurrent write detection
-
- writeErrMu sync.Mutex
- writeErr error
-
- enableWriteCompression bool
- newCompressionWriter func(io.WriteCloser) io.WriteCloser
-
- // Read fields
- reader io.ReadCloser // the current reader returned to the application
- readErr error
- br *bufio.Reader
- readRemaining int64 // bytes remaining in current frame.
- readFinal bool // true the current message has more frames.
- readLength int64 // Message size.
- readLimit int64 // Maximum message size.
- readMaskPos int
- readMaskKey [4]byte
- handlePong func(string) error
- handlePing func(string) error
- handleClose func(int, string) error
- readErrCount int
- messageReader *messageReader // the current low-level reader
-
- readDecompress bool // whether last read frame had RSV1 set
- newDecompressionReader func(io.Reader) io.ReadCloser
-}
-
-func newConn(conn net.Conn, isServer bool, readBufferSize, writeBufferSize int) *Conn {
- mu := make(chan bool, 1)
- mu <- true
-
- if readBufferSize == 0 {
- readBufferSize = defaultReadBufferSize
- }
- if readBufferSize < maxControlFramePayloadSize {
- readBufferSize = maxControlFramePayloadSize
- }
- if writeBufferSize == 0 {
- writeBufferSize = defaultWriteBufferSize
- }
-
- c := &Conn{
- isServer: isServer,
- br: bufio.NewReaderSize(conn, readBufferSize),
- conn: conn,
- mu: mu,
- readFinal: true,
- writeBuf: make([]byte, writeBufferSize+maxFrameHeaderSize),
- enableWriteCompression: true,
- }
- c.SetCloseHandler(nil)
- c.SetPingHandler(nil)
- c.SetPongHandler(nil)
- return c
-}
-
-// Subprotocol returns the negotiated protocol for the connection.
-func (c *Conn) Subprotocol() string {
- return c.subprotocol
-}
-
-// Close closes the underlying network connection without sending or waiting for a close frame.
-func (c *Conn) Close() error {
- return c.conn.Close()
-}
-
-// LocalAddr returns the local network address.
-func (c *Conn) LocalAddr() net.Addr {
- return c.conn.LocalAddr()
-}
-
-// RemoteAddr returns the remote network address.
-func (c *Conn) RemoteAddr() net.Addr {
- return c.conn.RemoteAddr()
-}
-
-// Write methods
-
-func (c *Conn) writeFatal(err error) error {
- err = hideTempErr(err)
- c.writeErrMu.Lock()
- if c.writeErr == nil {
- c.writeErr = err
- }
- c.writeErrMu.Unlock()
- return err
-}
-
-func (c *Conn) write(frameType int, deadline time.Time, bufs ...[]byte) error {
- <-c.mu
- defer func() { c.mu <- true }()
-
- c.writeErrMu.Lock()
- err := c.writeErr
- c.writeErrMu.Unlock()
- if err != nil {
- return err
- }
-
- c.conn.SetWriteDeadline(deadline)
- for _, buf := range bufs {
- if len(buf) > 0 {
- _, err := c.conn.Write(buf)
- if err != nil {
- return c.writeFatal(err)
- }
- }
- }
-
- if frameType == CloseMessage {
- c.writeFatal(ErrCloseSent)
- }
- return nil
-}
-
-// WriteControl writes a control message with the given deadline. The allowed
-// message types are CloseMessage, PingMessage and PongMessage.
-func (c *Conn) WriteControl(messageType int, data []byte, deadline time.Time) error {
- if !isControl(messageType) {
- return errBadWriteOpCode
- }
- if len(data) > maxControlFramePayloadSize {
- return errInvalidControlFrame
- }
-
- b0 := byte(messageType) | finalBit
- b1 := byte(len(data))
- if !c.isServer {
- b1 |= maskBit
- }
-
- buf := make([]byte, 0, maxFrameHeaderSize+maxControlFramePayloadSize)
- buf = append(buf, b0, b1)
-
- if c.isServer {
- buf = append(buf, data...)
- } else {
- key := newMaskKey()
- buf = append(buf, key[:]...)
- buf = append(buf, data...)
- maskBytes(key, 0, buf[6:])
- }
-
- d := time.Hour * 1000
- if !deadline.IsZero() {
- d = deadline.Sub(time.Now())
- if d < 0 {
- return errWriteTimeout
- }
- }
-
- timer := time.NewTimer(d)
- select {
- case <-c.mu:
- timer.Stop()
- case <-timer.C:
- return errWriteTimeout
- }
- defer func() { c.mu <- true }()
-
- c.writeErrMu.Lock()
- err := c.writeErr
- c.writeErrMu.Unlock()
- if err != nil {
- return err
- }
-
- c.conn.SetWriteDeadline(deadline)
- _, err = c.conn.Write(buf)
- if err != nil {
- return c.writeFatal(err)
- }
- if messageType == CloseMessage {
- c.writeFatal(ErrCloseSent)
- }
- return err
-}
-
-func (c *Conn) prepWrite(messageType int) error {
- // Close previous writer if not already closed by the application. It's
- // probably better to return an error in this situation, but we cannot
- // change this without breaking existing applications.
- if c.writer != nil {
- c.writer.Close()
- c.writer = nil
- }
-
- if !isControl(messageType) && !isData(messageType) {
- return errBadWriteOpCode
- }
-
- c.writeErrMu.Lock()
- err := c.writeErr
- c.writeErrMu.Unlock()
- return err
-}
-
-// NextWriter returns a writer for the next message to send. The writer's Close
-// method flushes the complete message to the network.
-//
-// There can be at most one open writer on a connection. NextWriter closes the
-// previous writer if the application has not already done so.
-func (c *Conn) NextWriter(messageType int) (io.WriteCloser, error) {
- if err := c.prepWrite(messageType); err != nil {
- return nil, err
- }
-
- mw := &messageWriter{
- c: c,
- frameType: messageType,
- pos: maxFrameHeaderSize,
- }
- c.writer = mw
- if c.newCompressionWriter != nil && c.enableWriteCompression && isData(messageType) {
- w := c.newCompressionWriter(c.writer)
- mw.compress = true
- c.writer = w
- }
- return c.writer, nil
-}
-
-type messageWriter struct {
- c *Conn
- compress bool // whether next call to flushFrame should set RSV1
- pos int // end of data in writeBuf.
- frameType int // type of the current frame.
- err error
-}
-
-func (w *messageWriter) fatal(err error) error {
- if w.err != nil {
- w.err = err
- w.c.writer = nil
- }
- return err
-}
-
-// flushFrame writes buffered data and extra as a frame to the network. The
-// final argument indicates that this is the last frame in the message.
-func (w *messageWriter) flushFrame(final bool, extra []byte) error {
- c := w.c
- length := w.pos - maxFrameHeaderSize + len(extra)
-
- // Check for invalid control frames.
- if isControl(w.frameType) &&
- (!final || length > maxControlFramePayloadSize) {
- return w.fatal(errInvalidControlFrame)
- }
-
- b0 := byte(w.frameType)
- if final {
- b0 |= finalBit
- }
- if w.compress {
- b0 |= rsv1Bit
- }
- w.compress = false
-
- b1 := byte(0)
- if !c.isServer {
- b1 |= maskBit
- }
-
- // Assume that the frame starts at beginning of c.writeBuf.
- framePos := 0
- if c.isServer {
- // Adjust up if mask not included in the header.
- framePos = 4
- }
-
- switch {
- case length >= 65536:
- c.writeBuf[framePos] = b0
- c.writeBuf[framePos+1] = b1 | 127
- binary.BigEndian.PutUint64(c.writeBuf[framePos+2:], uint64(length))
- case length > 125:
- framePos += 6
- c.writeBuf[framePos] = b0
- c.writeBuf[framePos+1] = b1 | 126
- binary.BigEndian.PutUint16(c.writeBuf[framePos+2:], uint16(length))
- default:
- framePos += 8
- c.writeBuf[framePos] = b0
- c.writeBuf[framePos+1] = b1 | byte(length)
- }
-
- if !c.isServer {
- key := newMaskKey()
- copy(c.writeBuf[maxFrameHeaderSize-4:], key[:])
- maskBytes(key, 0, c.writeBuf[maxFrameHeaderSize:w.pos])
- if len(extra) > 0 {
- return c.writeFatal(errors.New("websocket: internal error, extra used in client mode"))
- }
- }
-
- // Write the buffers to the connection with best-effort detection of
- // concurrent writes. See the concurrency section in the package
- // documentation for more info.
-
- if c.isWriting {
- panic("concurrent write to websocket connection")
- }
- c.isWriting = true
-
- err := c.write(w.frameType, c.writeDeadline, c.writeBuf[framePos:w.pos], extra)
-
- if !c.isWriting {
- panic("concurrent write to websocket connection")
- }
- c.isWriting = false
-
- if err != nil {
- return w.fatal(err)
- }
-
- if final {
- c.writer = nil
- return nil
- }
-
- // Setup for next frame.
- w.pos = maxFrameHeaderSize
- w.frameType = continuationFrame
- return nil
-}
-
-func (w *messageWriter) ncopy(max int) (int, error) {
- n := len(w.c.writeBuf) - w.pos
- if n <= 0 {
- if err := w.flushFrame(false, nil); err != nil {
- return 0, err
- }
- n = len(w.c.writeBuf) - w.pos
- }
- if n > max {
- n = max
- }
- return n, nil
-}
-
-func (w *messageWriter) Write(p []byte) (int, error) {
- if w.err != nil {
- return 0, w.err
- }
-
- if len(p) > 2*len(w.c.writeBuf) && w.c.isServer {
- // Don't buffer large messages.
- err := w.flushFrame(false, p)
- if err != nil {
- return 0, err
- }
- return len(p), nil
- }
-
- nn := len(p)
- for len(p) > 0 {
- n, err := w.ncopy(len(p))
- if err != nil {
- return 0, err
- }
- copy(w.c.writeBuf[w.pos:], p[:n])
- w.pos += n
- p = p[n:]
- }
- return nn, nil
-}
-
-func (w *messageWriter) WriteString(p string) (int, error) {
- if w.err != nil {
- return 0, w.err
- }
-
- nn := len(p)
- for len(p) > 0 {
- n, err := w.ncopy(len(p))
- if err != nil {
- return 0, err
- }
- copy(w.c.writeBuf[w.pos:], p[:n])
- w.pos += n
- p = p[n:]
- }
- return nn, nil
-}
-
-func (w *messageWriter) ReadFrom(r io.Reader) (nn int64, err error) {
- if w.err != nil {
- return 0, w.err
- }
- for {
- if w.pos == len(w.c.writeBuf) {
- err = w.flushFrame(false, nil)
- if err != nil {
- break
- }
- }
- var n int
- n, err = r.Read(w.c.writeBuf[w.pos:])
- w.pos += n
- nn += int64(n)
- if err != nil {
- if err == io.EOF {
- err = nil
- }
- break
- }
- }
- return nn, err
-}
-
-func (w *messageWriter) Close() error {
- if w.err != nil {
- return w.err
- }
- if err := w.flushFrame(true, nil); err != nil {
- return err
- }
- w.err = errWriteClosed
- return nil
-}
-
-// WriteMessage is a helper method for getting a writer using NextWriter,
-// writing the message and closing the writer.
-func (c *Conn) WriteMessage(messageType int, data []byte) error {
-
- if c.isServer && (c.newCompressionWriter == nil || !c.enableWriteCompression) {
-
- // Fast path with no allocations and single frame.
-
- if err := c.prepWrite(messageType); err != nil {
- return err
- }
- mw := messageWriter{c: c, frameType: messageType, pos: maxFrameHeaderSize}
- n := copy(c.writeBuf[mw.pos:], data)
- mw.pos += n
- data = data[n:]
- return mw.flushFrame(true, data)
- }
-
- w, err := c.NextWriter(messageType)
- if err != nil {
- return err
- }
- if _, err = w.Write(data); err != nil {
- return err
- }
- return w.Close()
-}
-
-// SetWriteDeadline sets the write deadline on the underlying network
-// connection. After a write has timed out, the websocket state is corrupt and
-// all future writes will return an error. A zero value for t means writes will
-// not time out.
-func (c *Conn) SetWriteDeadline(t time.Time) error {
- c.writeDeadline = t
- return nil
-}
-
-// Read methods
-
-func (c *Conn) advanceFrame() (int, error) {
-
- // 1. Skip remainder of previous frame.
-
- if c.readRemaining > 0 {
- if _, err := io.CopyN(ioutil.Discard, c.br, c.readRemaining); err != nil {
- return noFrame, err
- }
- }
-
- // 2. Read and parse first two bytes of frame header.
-
- p, err := c.read(2)
- if err != nil {
- return noFrame, err
- }
-
- final := p[0]&finalBit != 0
- frameType := int(p[0] & 0xf)
- mask := p[1]&maskBit != 0
- c.readRemaining = int64(p[1] & 0x7f)
-
- c.readDecompress = false
- if c.newDecompressionReader != nil && (p[0]&rsv1Bit) != 0 {
- c.readDecompress = true
- p[0] &^= rsv1Bit
- }
-
- if rsv := p[0] & (rsv1Bit | rsv2Bit | rsv3Bit); rsv != 0 {
- return noFrame, c.handleProtocolError("unexpected reserved bits 0x" + strconv.FormatInt(int64(rsv), 16))
- }
-
- switch frameType {
- case CloseMessage, PingMessage, PongMessage:
- if c.readRemaining > maxControlFramePayloadSize {
- return noFrame, c.handleProtocolError("control frame length > 125")
- }
- if !final {
- return noFrame, c.handleProtocolError("control frame not final")
- }
- case TextMessage, BinaryMessage:
- if !c.readFinal {
- return noFrame, c.handleProtocolError("message start before final message frame")
- }
- c.readFinal = final
- case continuationFrame:
- if c.readFinal {
- return noFrame, c.handleProtocolError("continuation after final message frame")
- }
- c.readFinal = final
- default:
- return noFrame, c.handleProtocolError("unknown opcode " + strconv.Itoa(frameType))
- }
-
- // 3. Read and parse frame length.
-
- switch c.readRemaining {
- case 126:
- p, err := c.read(2)
- if err != nil {
- return noFrame, err
- }
- c.readRemaining = int64(binary.BigEndian.Uint16(p))
- case 127:
- p, err := c.read(8)
- if err != nil {
- return noFrame, err
- }
- c.readRemaining = int64(binary.BigEndian.Uint64(p))
- }
-
- // 4. Handle frame masking.
-
- if mask != c.isServer {
- return noFrame, c.handleProtocolError("incorrect mask flag")
- }
-
- if mask {
- c.readMaskPos = 0
- p, err := c.read(len(c.readMaskKey))
- if err != nil {
- return noFrame, err
- }
- copy(c.readMaskKey[:], p)
- }
-
- // 5. For text and binary messages, enforce read limit and return.
-
- if frameType == continuationFrame || frameType == TextMessage || frameType == BinaryMessage {
-
- c.readLength += c.readRemaining
- if c.readLimit > 0 && c.readLength > c.readLimit {
- c.WriteControl(CloseMessage, FormatCloseMessage(CloseMessageTooBig, ""), time.Now().Add(writeWait))
- return noFrame, ErrReadLimit
- }
-
- return frameType, nil
- }
-
- // 6. Read control frame payload.
-
- var payload []byte
- if c.readRemaining > 0 {
- payload, err = c.read(int(c.readRemaining))
- c.readRemaining = 0
- if err != nil {
- return noFrame, err
- }
- if c.isServer {
- maskBytes(c.readMaskKey, 0, payload)
- }
- }
-
- // 7. Process control frame payload.
-
- switch frameType {
- case PongMessage:
- if err := c.handlePong(string(payload)); err != nil {
- return noFrame, err
- }
- case PingMessage:
- if err := c.handlePing(string(payload)); err != nil {
- return noFrame, err
- }
- case CloseMessage:
- closeCode := CloseNoStatusReceived
- closeText := ""
- if len(payload) >= 2 {
- closeCode = int(binary.BigEndian.Uint16(payload))
- if !isValidReceivedCloseCode(closeCode) {
- return noFrame, c.handleProtocolError("invalid close code")
- }
- closeText = string(payload[2:])
- if !utf8.ValidString(closeText) {
- return noFrame, c.handleProtocolError("invalid utf8 payload in close frame")
- }
- }
- if err := c.handleClose(closeCode, closeText); err != nil {
- return noFrame, err
- }
- return noFrame, &CloseError{Code: closeCode, Text: closeText}
- }
-
- return frameType, nil
-}
-
-func (c *Conn) handleProtocolError(message string) error {
- c.WriteControl(CloseMessage, FormatCloseMessage(CloseProtocolError, message), time.Now().Add(writeWait))
- return errors.New("websocket: " + message)
-}
-
-// NextReader returns the next data message received from the peer. The
-// returned messageType is either TextMessage or BinaryMessage.
-//
-// There can be at most one open reader on a connection. NextReader discards
-// the previous message if the application has not already consumed it.
-//
-// Applications must break out of the application's read loop when this method
-// returns a non-nil error value. Errors returned from this method are
-// permanent. Once this method returns a non-nil error, all subsequent calls to
-// this method return the same error.
-func (c *Conn) NextReader() (messageType int, r io.Reader, err error) {
- // Close previous reader, only relevant for decompression.
- if c.reader != nil {
- c.reader.Close()
- c.reader = nil
- }
-
- c.messageReader = nil
- c.readLength = 0
-
- for c.readErr == nil {
- frameType, err := c.advanceFrame()
- if err != nil {
- c.readErr = hideTempErr(err)
- break
- }
- if frameType == TextMessage || frameType == BinaryMessage {
- c.messageReader = &messageReader{c}
- c.reader = c.messageReader
- if c.readDecompress {
- c.reader = c.newDecompressionReader(c.reader)
- }
- return frameType, c.reader, nil
- }
- }
-
- // Applications that do handle the error returned from this method spin in
- // tight loop on connection failure. To help application developers detect
- // this error, panic on repeated reads to the failed connection.
- c.readErrCount++
- if c.readErrCount >= 1000 {
- panic("repeated read on failed websocket connection")
- }
-
- return noFrame, nil, c.readErr
-}
-
-type messageReader struct{ c *Conn }
-
-func (r *messageReader) Read(b []byte) (int, error) {
- c := r.c
- if c.messageReader != r {
- return 0, io.EOF
- }
-
- for c.readErr == nil {
-
- if c.readRemaining > 0 {
- if int64(len(b)) > c.readRemaining {
- b = b[:c.readRemaining]
- }
- n, err := c.br.Read(b)
- c.readErr = hideTempErr(err)
- if c.isServer {
- c.readMaskPos = maskBytes(c.readMaskKey, c.readMaskPos, b[:n])
- }
- c.readRemaining -= int64(n)
- if c.readRemaining > 0 && c.readErr == io.EOF {
- c.readErr = errUnexpectedEOF
- }
- return n, c.readErr
- }
-
- if c.readFinal {
- c.messageReader = nil
- return 0, io.EOF
- }
-
- frameType, err := c.advanceFrame()
- switch {
- case err != nil:
- c.readErr = hideTempErr(err)
- case frameType == TextMessage || frameType == BinaryMessage:
- c.readErr = errors.New("websocket: internal error, unexpected text or binary in Reader")
- }
- }
-
- err := c.readErr
- if err == io.EOF && c.messageReader == r {
- err = errUnexpectedEOF
- }
- return 0, err
-}
-
-func (r *messageReader) Close() error {
- return nil
-}
-
-// ReadMessage is a helper method for getting a reader using NextReader and
-// reading from that reader to a buffer.
-func (c *Conn) ReadMessage() (messageType int, p []byte, err error) {
- var r io.Reader
- messageType, r, err = c.NextReader()
- if err != nil {
- return messageType, nil, err
- }
- p, err = ioutil.ReadAll(r)
- return messageType, p, err
-}
-
-// SetReadDeadline sets the read deadline on the underlying network connection.
-// After a read has timed out, the websocket connection state is corrupt and
-// all future reads will return an error. A zero value for t means reads will
-// not time out.
-func (c *Conn) SetReadDeadline(t time.Time) error {
- return c.conn.SetReadDeadline(t)
-}
-
-// SetReadLimit sets the maximum size for a message read from the peer. If a
-// message exceeds the limit, the connection sends a close frame to the peer
-// and returns ErrReadLimit to the application.
-func (c *Conn) SetReadLimit(limit int64) {
- c.readLimit = limit
-}
-
-// CloseHandler returns the current close handler
-func (c *Conn) CloseHandler() func(code int, text string) error {
- return c.handleClose
-}
-
-// SetCloseHandler sets the handler for close messages received from the peer.
-// The code argument to h is the received close code or CloseNoStatusReceived
-// if the close message is empty. The default close handler sends a close frame
-// back to the peer.
-func (c *Conn) SetCloseHandler(h func(code int, text string) error) {
- if h == nil {
- h = func(code int, text string) error {
- message := []byte{}
- if code != CloseNoStatusReceived {
- message = FormatCloseMessage(code, "")
- }
- c.WriteControl(CloseMessage, message, time.Now().Add(writeWait))
- return nil
- }
- }
- c.handleClose = h
-}
-
-// PingHandler returns the current ping handler
-func (c *Conn) PingHandler() func(appData string) error {
- return c.handlePing
-}
-
-// SetPingHandler sets the handler for ping messages received from the peer.
-// The appData argument to h is the PING frame application data. The default
-// ping handler sends a pong to the peer.
-func (c *Conn) SetPingHandler(h func(appData string) error) {
- if h == nil {
- h = func(message string) error {
- err := c.WriteControl(PongMessage, []byte(message), time.Now().Add(writeWait))
- if err == ErrCloseSent {
- return nil
- } else if e, ok := err.(net.Error); ok && e.Temporary() {
- return nil
- }
- return err
- }
- }
- c.handlePing = h
-}
-
-// PongHandler returns the current pong handler
-func (c *Conn) PongHandler() func(appData string) error {
- return c.handlePong
-}
-
-// SetPongHandler sets the handler for pong messages received from the peer.
-// The appData argument to h is the PONG frame application data. The default
-// pong handler does nothing.
-func (c *Conn) SetPongHandler(h func(appData string) error) {
- if h == nil {
- h = func(string) error { return nil }
- }
- c.handlePong = h
-}
-
-// UnderlyingConn returns the internal net.Conn. This can be used to further
-// modifications to connection specific flags.
-func (c *Conn) UnderlyingConn() net.Conn {
- return c.conn
-}
-
-// EnableWriteCompression enables and disables write compression of
-// subsequent text and binary messages. This function is a noop if
-// compression was not negotiated with the peer.
-func (c *Conn) EnableWriteCompression(enable bool) {
- c.enableWriteCompression = enable
-}
-
-// FormatCloseMessage formats closeCode and text as a WebSocket close message.
-func FormatCloseMessage(closeCode int, text string) []byte {
- buf := make([]byte, 2+len(text))
- binary.BigEndian.PutUint16(buf, uint16(closeCode))
- copy(buf[2:], text)
- return buf
-}
diff --git a/vendor/github.com/gorilla/websocket/conn_read.go b/vendor/github.com/gorilla/websocket/conn_read.go
deleted file mode 100644
index 1ea1505..0000000
--- a/vendor/github.com/gorilla/websocket/conn_read.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Gorilla WebSocket Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.5
-
-package websocket
-
-import "io"
-
-func (c *Conn) read(n int) ([]byte, error) {
- p, err := c.br.Peek(n)
- if err == io.EOF {
- err = errUnexpectedEOF
- }
- c.br.Discard(len(p))
- return p, err
-}
diff --git a/vendor/github.com/gorilla/websocket/conn_read_legacy.go b/vendor/github.com/gorilla/websocket/conn_read_legacy.go
deleted file mode 100644
index 018541c..0000000
--- a/vendor/github.com/gorilla/websocket/conn_read_legacy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Gorilla WebSocket Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.5
-
-package websocket
-
-import "io"
-
-func (c *Conn) read(n int) ([]byte, error) {
- p, err := c.br.Peek(n)
- if err == io.EOF {
- err = errUnexpectedEOF
- }
- if len(p) > 0 {
- // advance over the bytes just read
- io.ReadFull(c.br, p)
- }
- return p, err
-}
diff --git a/vendor/github.com/gorilla/websocket/doc.go b/vendor/github.com/gorilla/websocket/doc.go
deleted file mode 100644
index e046b8c..0000000
--- a/vendor/github.com/gorilla/websocket/doc.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package websocket implements the WebSocket protocol defined in RFC 6455.
-//
-// Overview
-//
-// The Conn type represents a WebSocket connection. A server application uses
-// the Upgrade function from an Upgrader object with a HTTP request handler
-// to get a pointer to a Conn:
-//
-// var upgrader = websocket.Upgrader{
-// ReadBufferSize: 1024,
-// WriteBufferSize: 1024,
-// }
-//
-// func handler(w http.ResponseWriter, r *http.Request) {
-// conn, err := upgrader.Upgrade(w, r, nil)
-// if err != nil {
-// log.Println(err)
-// return
-// }
-// ... Use conn to send and receive messages.
-// }
-//
-// Call the connection's WriteMessage and ReadMessage methods to send and
-// receive messages as a slice of bytes. This snippet of code shows how to echo
-// messages using these methods:
-//
-// for {
-// messageType, p, err := conn.ReadMessage()
-// if err != nil {
-// return
-// }
-// if err = conn.WriteMessage(messageType, p); err != nil {
-// return err
-// }
-// }
-//
-// In above snippet of code, p is a []byte and messageType is an int with value
-// websocket.BinaryMessage or websocket.TextMessage.
-//
-// An application can also send and receive messages using the io.WriteCloser
-// and io.Reader interfaces. To send a message, call the connection NextWriter
-// method to get an io.WriteCloser, write the message to the writer and close
-// the writer when done. To receive a message, call the connection NextReader
-// method to get an io.Reader and read until io.EOF is returned. This snippet
-// shows how to echo messages using the NextWriter and NextReader methods:
-//
-// for {
-// messageType, r, err := conn.NextReader()
-// if err != nil {
-// return
-// }
-// w, err := conn.NextWriter(messageType)
-// if err != nil {
-// return err
-// }
-// if _, err := io.Copy(w, r); err != nil {
-// return err
-// }
-// if err := w.Close(); err != nil {
-// return err
-// }
-// }
-//
-// Data Messages
-//
-// The WebSocket protocol distinguishes between text and binary data messages.
-// Text messages are interpreted as UTF-8 encoded text. The interpretation of
-// binary messages is left to the application.
-//
-// This package uses the TextMessage and BinaryMessage integer constants to
-// identify the two data message types. The ReadMessage and NextReader methods
-// return the type of the received message. The messageType argument to the
-// WriteMessage and NextWriter methods specifies the type of a sent message.
-//
-// It is the application's responsibility to ensure that text messages are
-// valid UTF-8 encoded text.
-//
-// Control Messages
-//
-// The WebSocket protocol defines three types of control messages: close, ping
-// and pong. Call the connection WriteControl, WriteMessage or NextWriter
-// methods to send a control message to the peer.
-//
-// Connections handle received close messages by sending a close message to the
-// peer and returning a *CloseError from the the NextReader, ReadMessage or the
-// message Read method.
-//
-// Connections handle received ping and pong messages by invoking callback
-// functions set with SetPingHandler and SetPongHandler methods. The callback
-// functions are called from the NextReader, ReadMessage and the message Read
-// methods.
-//
-// The default ping handler sends a pong to the peer. The application's reading
-// goroutine can block for a short time while the handler writes the pong data
-// to the connection.
-//
-// The application must read the connection to process ping, pong and close
-// messages sent from the peer. If the application is not otherwise interested
-// in messages from the peer, then the application should start a goroutine to
-// read and discard messages from the peer. A simple example is:
-//
-// func readLoop(c *websocket.Conn) {
-// for {
-// if _, _, err := c.NextReader(); err != nil {
-// c.Close()
-// break
-// }
-// }
-// }
-//
-// Concurrency
-//
-// Connections support one concurrent reader and one concurrent writer.
-//
-// Applications are responsible for ensuring that no more than one goroutine
-// calls the write methods (NextWriter, SetWriteDeadline, WriteMessage,
-// WriteJSON) concurrently and that no more than one goroutine calls the read
-// methods (NextReader, SetReadDeadline, ReadMessage, ReadJSON, SetPongHandler,
-// SetPingHandler) concurrently.
-//
-// The Close and WriteControl methods can be called concurrently with all other
-// methods.
-//
-// Origin Considerations
-//
-// Web browsers allow Javascript applications to open a WebSocket connection to
-// any host. It's up to the server to enforce an origin policy using the Origin
-// request header sent by the browser.
-//
-// The Upgrader calls the function specified in the CheckOrigin field to check
-// the origin. If the CheckOrigin function returns false, then the Upgrade
-// method fails the WebSocket handshake with HTTP status 403.
-//
-// If the CheckOrigin field is nil, then the Upgrader uses a safe default: fail
-// the handshake if the Origin request header is present and not equal to the
-// Host request header.
-//
-// An application can allow connections from any origin by specifying a
-// function that always returns true:
-//
-// var upgrader = websocket.Upgrader{
-// CheckOrigin: func(r *http.Request) bool { return true },
-// }
-//
-// The deprecated Upgrade function does not enforce an origin policy. It's the
-// application's responsibility to check the Origin header before calling
-// Upgrade.
-//
-// Compression
-//
-// Per message compression extensions (RFC 7692) are experimentally supported
-// by this package in a limited capacity. Setting the EnableCompression option
-// to true in Dialer or Upgrader will attempt to negotiate per message deflate
-// support. If compression was successfully negotiated with the connection's
-// peer, any message received in compressed form will be automatically
-// decompressed. All Read methods will return uncompressed bytes.
-//
-// Per message compression of messages written to a connection can be enabled
-// or disabled by calling the corresponding Conn method:
-//
-// conn.EnableWriteCompression(true)
-//
-// Currently this package does not support compression with "context takeover".
-// This means that messages must be compressed and decompressed in isolation,
-// without retaining sliding window or dictionary state across messages. For
-// more details refer to RFC 7692.
-//
-// Use of compression is experimental and may result in decreased performance.
-package websocket
diff --git a/vendor/github.com/gorilla/websocket/json.go b/vendor/github.com/gorilla/websocket/json.go
deleted file mode 100644
index 4f0e368..0000000
--- a/vendor/github.com/gorilla/websocket/json.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
- "encoding/json"
- "io"
-)
-
-// WriteJSON is deprecated, use c.WriteJSON instead.
-func WriteJSON(c *Conn, v interface{}) error {
- return c.WriteJSON(v)
-}
-
-// WriteJSON writes the JSON encoding of v to the connection.
-//
-// See the documentation for encoding/json Marshal for details about the
-// conversion of Go values to JSON.
-func (c *Conn) WriteJSON(v interface{}) error {
- w, err := c.NextWriter(TextMessage)
- if err != nil {
- return err
- }
- err1 := json.NewEncoder(w).Encode(v)
- err2 := w.Close()
- if err1 != nil {
- return err1
- }
- return err2
-}
-
-// ReadJSON is deprecated, use c.ReadJSON instead.
-func ReadJSON(c *Conn, v interface{}) error {
- return c.ReadJSON(v)
-}
-
-// ReadJSON reads the next JSON-encoded message from the connection and stores
-// it in the value pointed to by v.
-//
-// See the documentation for the encoding/json Unmarshal function for details
-// about the conversion of JSON to a Go value.
-func (c *Conn) ReadJSON(v interface{}) error {
- _, r, err := c.NextReader()
- if err != nil {
- return err
- }
- err = json.NewDecoder(r).Decode(v)
- if err == io.EOF {
- // One value is expected in the message.
- err = io.ErrUnexpectedEOF
- }
- return err
-}
diff --git a/vendor/github.com/gorilla/websocket/mask.go b/vendor/github.com/gorilla/websocket/mask.go
deleted file mode 100644
index 6a88bbc..0000000
--- a/vendor/github.com/gorilla/websocket/mask.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2016 The Gorilla WebSocket Authors. All rights reserved. Use of
-// this source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
-
-// +build !appengine
-
-package websocket
-
-import "unsafe"
-
-const wordSize = int(unsafe.Sizeof(uintptr(0)))
-
-func maskBytes(key [4]byte, pos int, b []byte) int {
-
- // Mask one byte at a time for small buffers.
- if len(b) < 2*wordSize {
- for i := range b {
- b[i] ^= key[pos&3]
- pos++
- }
- return pos & 3
- }
-
- // Mask one byte at a time to word boundary.
- if n := int(uintptr(unsafe.Pointer(&b[0]))) % wordSize; n != 0 {
- n = wordSize - n
- for i := range b[:n] {
- b[i] ^= key[pos&3]
- pos++
- }
- b = b[n:]
- }
-
- // Create aligned word size key.
- var k [wordSize]byte
- for i := range k {
- k[i] = key[(pos+i)&3]
- }
- kw := *(*uintptr)(unsafe.Pointer(&k))
-
- // Mask one word at a time.
- n := (len(b) / wordSize) * wordSize
- for i := 0; i < n; i += wordSize {
- *(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&b[0])) + uintptr(i))) ^= kw
- }
-
- // Mask one byte at a time for remaining bytes.
- b = b[n:]
- for i := range b {
- b[i] ^= key[pos&3]
- pos++
- }
-
- return pos & 3
-}
diff --git a/vendor/github.com/gorilla/websocket/mask_safe.go b/vendor/github.com/gorilla/websocket/mask_safe.go
deleted file mode 100644
index 2aac060..0000000
--- a/vendor/github.com/gorilla/websocket/mask_safe.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 The Gorilla WebSocket Authors. All rights reserved. Use of
-// this source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
-
-// +build appengine
-
-package websocket
-
-func maskBytes(key [4]byte, pos int, b []byte) int {
- for i := range b {
- b[i] ^= key[pos&3]
- pos++
- }
- return pos & 3
-}
diff --git a/vendor/github.com/gorilla/websocket/server.go b/vendor/github.com/gorilla/websocket/server.go
deleted file mode 100644
index aaedebd..0000000
--- a/vendor/github.com/gorilla/websocket/server.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
- "bufio"
- "errors"
- "net"
- "net/http"
- "net/url"
- "strings"
- "time"
-)
-
-// HandshakeError describes an error with the handshake from the peer.
-type HandshakeError struct {
- message string
-}
-
-func (e HandshakeError) Error() string { return e.message }
-
-// Upgrader specifies parameters for upgrading an HTTP connection to a
-// WebSocket connection.
-type Upgrader struct {
- // HandshakeTimeout specifies the duration for the handshake to complete.
- HandshakeTimeout time.Duration
-
- // ReadBufferSize and WriteBufferSize specify I/O buffer sizes. If a buffer
- // size is zero, then a default value of 4096 is used. The I/O buffer sizes
- // do not limit the size of the messages that can be sent or received.
- ReadBufferSize, WriteBufferSize int
-
- // Subprotocols specifies the server's supported protocols in order of
- // preference. If this field is set, then the Upgrade method negotiates a
- // subprotocol by selecting the first match in this list with a protocol
- // requested by the client.
- Subprotocols []string
-
- // Error specifies the function for generating HTTP error responses. If Error
- // is nil, then http.Error is used to generate the HTTP response.
- Error func(w http.ResponseWriter, r *http.Request, status int, reason error)
-
- // CheckOrigin returns true if the request Origin header is acceptable. If
- // CheckOrigin is nil, the host in the Origin header must not be set or
- // must match the host of the request.
- CheckOrigin func(r *http.Request) bool
-
- // EnableCompression specify if the server should attempt to negotiate per
- // message compression (RFC 7692). Setting this value to true does not
- // guarantee that compression will be supported. Currently only "no context
- // takeover" modes are supported.
- EnableCompression bool
-}
-
-func (u *Upgrader) returnError(w http.ResponseWriter, r *http.Request, status int, reason string) (*Conn, error) {
- err := HandshakeError{reason}
- if u.Error != nil {
- u.Error(w, r, status, err)
- } else {
- w.Header().Set("Sec-Websocket-Version", "13")
- http.Error(w, http.StatusText(status), status)
- }
- return nil, err
-}
-
-// checkSameOrigin returns true if the origin is not set or is equal to the request host.
-func checkSameOrigin(r *http.Request) bool {
- origin := r.Header["Origin"]
- if len(origin) == 0 {
- return true
- }
- u, err := url.Parse(origin[0])
- if err != nil {
- return false
- }
- return u.Host == r.Host
-}
-
-func (u *Upgrader) selectSubprotocol(r *http.Request, responseHeader http.Header) string {
- if u.Subprotocols != nil {
- clientProtocols := Subprotocols(r)
- for _, serverProtocol := range u.Subprotocols {
- for _, clientProtocol := range clientProtocols {
- if clientProtocol == serverProtocol {
- return clientProtocol
- }
- }
- }
- } else if responseHeader != nil {
- return responseHeader.Get("Sec-Websocket-Protocol")
- }
- return ""
-}
-
-// Upgrade upgrades the HTTP server connection to the WebSocket protocol.
-//
-// The responseHeader is included in the response to the client's upgrade
-// request. Use the responseHeader to specify cookies (Set-Cookie) and the
-// application negotiated subprotocol (Sec-Websocket-Protocol).
-//
-// If the upgrade fails, then Upgrade replies to the client with an HTTP error
-// response.
-func (u *Upgrader) Upgrade(w http.ResponseWriter, r *http.Request, responseHeader http.Header) (*Conn, error) {
- if r.Method != "GET" {
- return u.returnError(w, r, http.StatusMethodNotAllowed, "websocket: method not GET")
- }
-
- if _, ok := responseHeader["Sec-Websocket-Extensions"]; ok {
- return u.returnError(w, r, http.StatusInternalServerError, "websocket: application specific Sec-Websocket-Extensions headers are unsupported")
- }
-
- if !tokenListContainsValue(r.Header, "Sec-Websocket-Version", "13") {
- return u.returnError(w, r, http.StatusBadRequest, "websocket: version != 13")
- }
-
- if !tokenListContainsValue(r.Header, "Connection", "upgrade") {
- return u.returnError(w, r, http.StatusBadRequest, "websocket: could not find connection header with token 'upgrade'")
- }
-
- if !tokenListContainsValue(r.Header, "Upgrade", "websocket") {
- return u.returnError(w, r, http.StatusBadRequest, "websocket: could not find upgrade header with token 'websocket'")
- }
-
- checkOrigin := u.CheckOrigin
- if checkOrigin == nil {
- checkOrigin = checkSameOrigin
- }
- if !checkOrigin(r) {
- return u.returnError(w, r, http.StatusForbidden, "websocket: origin not allowed")
- }
-
- challengeKey := r.Header.Get("Sec-Websocket-Key")
- if challengeKey == "" {
- return u.returnError(w, r, http.StatusBadRequest, "websocket: key missing or blank")
- }
-
- subprotocol := u.selectSubprotocol(r, responseHeader)
-
- // Negotiate PMCE
- var compress bool
- if u.EnableCompression {
- for _, ext := range parseExtensions(r.Header) {
- if ext[""] != "permessage-deflate" {
- continue
- }
- compress = true
- break
- }
- }
-
- var (
- netConn net.Conn
- br *bufio.Reader
- err error
- )
-
- h, ok := w.(http.Hijacker)
- if !ok {
- return u.returnError(w, r, http.StatusInternalServerError, "websocket: response does not implement http.Hijacker")
- }
- var rw *bufio.ReadWriter
- netConn, rw, err = h.Hijack()
- if err != nil {
- return u.returnError(w, r, http.StatusInternalServerError, err.Error())
- }
- br = rw.Reader
-
- if br.Buffered() > 0 {
- netConn.Close()
- return nil, errors.New("websocket: client sent data before handshake is complete")
- }
-
- c := newConn(netConn, true, u.ReadBufferSize, u.WriteBufferSize)
- c.subprotocol = subprotocol
-
- if compress {
- c.newCompressionWriter = compressNoContextTakeover
- c.newDecompressionReader = decompressNoContextTakeover
- }
-
- p := c.writeBuf[:0]
- p = append(p, "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: "...)
- p = append(p, computeAcceptKey(challengeKey)...)
- p = append(p, "\r\n"...)
- if c.subprotocol != "" {
- p = append(p, "Sec-Websocket-Protocol: "...)
- p = append(p, c.subprotocol...)
- p = append(p, "\r\n"...)
- }
- if compress {
- p = append(p, "Sec-Websocket-Extensions: permessage-deflate; server_no_context_takeover; client_no_context_takeover\r\n"...)
- }
- for k, vs := range responseHeader {
- if k == "Sec-Websocket-Protocol" {
- continue
- }
- for _, v := range vs {
- p = append(p, k...)
- p = append(p, ": "...)
- for i := 0; i < len(v); i++ {
- b := v[i]
- if b <= 31 {
- // prevent response splitting.
- b = ' '
- }
- p = append(p, b)
- }
- p = append(p, "\r\n"...)
- }
- }
- p = append(p, "\r\n"...)
-
- // Clear deadlines set by HTTP server.
- netConn.SetDeadline(time.Time{})
-
- if u.HandshakeTimeout > 0 {
- netConn.SetWriteDeadline(time.Now().Add(u.HandshakeTimeout))
- }
- if _, err = netConn.Write(p); err != nil {
- netConn.Close()
- return nil, err
- }
- if u.HandshakeTimeout > 0 {
- netConn.SetWriteDeadline(time.Time{})
- }
-
- return c, nil
-}
-
-// Upgrade upgrades the HTTP server connection to the WebSocket protocol.
-//
-// This function is deprecated, use websocket.Upgrader instead.
-//
-// The application is responsible for checking the request origin before
-// calling Upgrade. An example implementation of the same origin policy is:
-//
-// if req.Header.Get("Origin") != "http://"+req.Host {
-// http.Error(w, "Origin not allowed", 403)
-// return
-// }
-//
-// If the endpoint supports subprotocols, then the application is responsible
-// for negotiating the protocol used on the connection. Use the Subprotocols()
-// function to get the subprotocols requested by the client. Use the
-// Sec-Websocket-Protocol response header to specify the subprotocol selected
-// by the application.
-//
-// The responseHeader is included in the response to the client's upgrade
-// request. Use the responseHeader to specify cookies (Set-Cookie) and the
-// negotiated subprotocol (Sec-Websocket-Protocol).
-//
-// The connection buffers IO to the underlying network connection. The
-// readBufSize and writeBufSize parameters specify the size of the buffers to
-// use. Messages can be larger than the buffers.
-//
-// If the request is not a valid WebSocket handshake, then Upgrade returns an
-// error of type HandshakeError. Applications should handle this error by
-// replying to the client with an HTTP error response.
-func Upgrade(w http.ResponseWriter, r *http.Request, responseHeader http.Header, readBufSize, writeBufSize int) (*Conn, error) {
- u := Upgrader{ReadBufferSize: readBufSize, WriteBufferSize: writeBufSize}
- u.Error = func(w http.ResponseWriter, r *http.Request, status int, reason error) {
- // don't return errors to maintain backwards compatibility
- }
- u.CheckOrigin = func(r *http.Request) bool {
- // allow all connections by default
- return true
- }
- return u.Upgrade(w, r, responseHeader)
-}
-
-// Subprotocols returns the subprotocols requested by the client in the
-// Sec-Websocket-Protocol header.
-func Subprotocols(r *http.Request) []string {
- h := strings.TrimSpace(r.Header.Get("Sec-Websocket-Protocol"))
- if h == "" {
- return nil
- }
- protocols := strings.Split(h, ",")
- for i := range protocols {
- protocols[i] = strings.TrimSpace(protocols[i])
- }
- return protocols
-}
-
-// IsWebSocketUpgrade returns true if the client requested upgrade to the
-// WebSocket protocol.
-func IsWebSocketUpgrade(r *http.Request) bool {
- return tokenListContainsValue(r.Header, "Connection", "upgrade") &&
- tokenListContainsValue(r.Header, "Upgrade", "websocket")
-}
diff --git a/vendor/github.com/gorilla/websocket/util.go b/vendor/github.com/gorilla/websocket/util.go
deleted file mode 100644
index 9a4908d..0000000
--- a/vendor/github.com/gorilla/websocket/util.go
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
- "crypto/rand"
- "crypto/sha1"
- "encoding/base64"
- "io"
- "net/http"
- "strings"
-)
-
-var keyGUID = []byte("258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
-
-func computeAcceptKey(challengeKey string) string {
- h := sha1.New()
- h.Write([]byte(challengeKey))
- h.Write(keyGUID)
- return base64.StdEncoding.EncodeToString(h.Sum(nil))
-}
-
-func generateChallengeKey() (string, error) {
- p := make([]byte, 16)
- if _, err := io.ReadFull(rand.Reader, p); err != nil {
- return "", err
- }
- return base64.StdEncoding.EncodeToString(p), nil
-}
-
-// Octet types from RFC 2616.
-var octetTypes [256]byte
-
-const (
- isTokenOctet = 1 << iota
- isSpaceOctet
-)
-
-func init() {
- // From RFC 2616
- //
- // OCTET =
- // CHAR =
- // CTL =
- // CR =
- // LF =
- // SP =
- // HT =
- // <"> =
- // CRLF = CR LF
- // LWS = [CRLF] 1*( SP | HT )
- // TEXT =
- // separators = "(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\" | <">
- // | "/" | "[" | "]" | "?" | "=" | "{" | "}" | SP | HT
- // token = 1*
- // qdtext = >
-
- for c := 0; c < 256; c++ {
- var t byte
- isCtl := c <= 31 || c == 127
- isChar := 0 <= c && c <= 127
- isSeparator := strings.IndexRune(" \t\"(),/:;<=>?@[]\\{}", rune(c)) >= 0
- if strings.IndexRune(" \t\r\n", rune(c)) >= 0 {
- t |= isSpaceOctet
- }
- if isChar && !isCtl && !isSeparator {
- t |= isTokenOctet
- }
- octetTypes[c] = t
- }
-}
-
-func skipSpace(s string) (rest string) {
- i := 0
- for ; i < len(s); i++ {
- if octetTypes[s[i]]&isSpaceOctet == 0 {
- break
- }
- }
- return s[i:]
-}
-
-func nextToken(s string) (token, rest string) {
- i := 0
- for ; i < len(s); i++ {
- if octetTypes[s[i]]&isTokenOctet == 0 {
- break
- }
- }
- return s[:i], s[i:]
-}
-
-func nextTokenOrQuoted(s string) (value string, rest string) {
- if !strings.HasPrefix(s, "\"") {
- return nextToken(s)
- }
- s = s[1:]
- for i := 0; i < len(s); i++ {
- switch s[i] {
- case '"':
- return s[:i], s[i+1:]
- case '\\':
- p := make([]byte, len(s)-1)
- j := copy(p, s[:i])
- escape := true
- for i = i + 1; i < len(s); i++ {
- b := s[i]
- switch {
- case escape:
- escape = false
- p[j] = b
- j += 1
- case b == '\\':
- escape = true
- case b == '"':
- return string(p[:j]), s[i+1:]
- default:
- p[j] = b
- j += 1
- }
- }
- return "", ""
- }
- }
- return "", ""
-}
-
-// tokenListContainsValue returns true if the 1#token header with the given
-// name contains token.
-func tokenListContainsValue(header http.Header, name string, value string) bool {
-headers:
- for _, s := range header[name] {
- for {
- var t string
- t, s = nextToken(skipSpace(s))
- if t == "" {
- continue headers
- }
- s = skipSpace(s)
- if s != "" && s[0] != ',' {
- continue headers
- }
- if strings.EqualFold(t, value) {
- return true
- }
- if s == "" {
- continue headers
- }
- s = s[1:]
- }
- }
- return false
-}
-
-// parseExtensiosn parses WebSocket extensions from a header.
-func parseExtensions(header http.Header) []map[string]string {
-
- // From RFC 6455:
- //
- // Sec-WebSocket-Extensions = extension-list
- // extension-list = 1#extension
- // extension = extension-token *( ";" extension-param )
- // extension-token = registered-token
- // registered-token = token
- // extension-param = token [ "=" (token | quoted-string) ]
- // ;When using the quoted-string syntax variant, the value
- // ;after quoted-string unescaping MUST conform to the
- // ;'token' ABNF.
-
- var result []map[string]string
-headers:
- for _, s := range header["Sec-Websocket-Extensions"] {
- for {
- var t string
- t, s = nextToken(skipSpace(s))
- if t == "" {
- continue headers
- }
- ext := map[string]string{"": t}
- for {
- s = skipSpace(s)
- if !strings.HasPrefix(s, ";") {
- break
- }
- var k string
- k, s = nextToken(skipSpace(s[1:]))
- if k == "" {
- continue headers
- }
- s = skipSpace(s)
- var v string
- if strings.HasPrefix(s, "=") {
- v, s = nextTokenOrQuoted(skipSpace(s[1:]))
- s = skipSpace(s)
- }
- if s != "" && s[0] != ',' && s[0] != ';' {
- continue headers
- }
- ext[k] = v
- }
- if s != "" && s[0] != ',' {
- continue headers
- }
- result = append(result, ext)
- if s == "" {
- continue headers
- }
- s = s[1:]
- }
- }
- return result
-}
diff --git a/vendor/github.com/jcelliott/lumber/.gitignore b/vendor/github.com/jcelliott/lumber/.gitignore
deleted file mode 100644
index 0026861..0000000
--- a/vendor/github.com/jcelliott/lumber/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
diff --git a/vendor/github.com/jcelliott/lumber/LICENSE b/vendor/github.com/jcelliott/lumber/LICENSE
deleted file mode 100644
index 3cdedce..0000000
--- a/vendor/github.com/jcelliott/lumber/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2013 Joshua Elliott
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/jcelliott/lumber/README.md b/vendor/github.com/jcelliott/lumber/README.md
deleted file mode 100644
index f6e8926..0000000
--- a/vendor/github.com/jcelliott/lumber/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-lumber
-======
-
-A simple logger for Go.
-
-Provides console and file loggers that support 6 log levels. The file logger supports log backup and
-rotation.
-
-### Usage: ###
-Log to the default (console) logger
-
-```go
-lumber.Error("An error message")
-```
-
-Create a new console logger that only logs messages of level WARN or higher
-
-```go
-log := lumber.NewConsoleLogger(lumber.WARN)
-```
-
-Change the log level for a logger
-
-```go
-log.Level(lumber.INFO)
-```
-
-Create a new file logger that rotates at 5000 lines (up to 9 backups) with a 100 message buffer
-
-```go
-log := lumber.NewFileLogger("filename.log", lumber.INFO, lumber.ROTATE, 5000, 9, 100)
-// or
-log := lumber.NewRotateLogger("filename.log", 5000, 9)
-```
-
-Send messages to the log
-
-```go
-// the log methods use fmt.Printf() syntax
-log.Trace("the %s log level", "lowest")
-log.Debug("")
-log.Info("the default log level")
-log.Warn("")
-log.Error("")
-log.Fatal("the %s log level", "highest")
-```
-
-Add a prefix to label different logs
-
-```go
-log.Prefix("MYAPP")
-```
-
-Use a MultiLogger
-
-```go
-mlog := NewMultiLogger()
-mlog.AddLoggers(log1, log2)
-mlog.Warn("This message goes to multiple loggers")
-mlog.Close() // closes all loggers
-```
-
-### Modes: ###
-
-APPEND: Append if the file exists, otherwise create a new file
-
-TRUNC: Open and truncate the file, regardless of whether it already exists
-
-BACKUP: Rotate the log every time a new logger is created
-
-ROTATE: Append if the file exists, when the log reaches maxLines rotate files
diff --git a/vendor/github.com/jcelliott/lumber/consolelog.go b/vendor/github.com/jcelliott/lumber/consolelog.go
deleted file mode 100644
index 1fbae7d..0000000
--- a/vendor/github.com/jcelliott/lumber/consolelog.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package lumber
-
-import (
- "fmt"
- "io"
- "os"
- "time"
-)
-
-type ConsoleLogger struct {
- out io.WriteCloser
- outLevel int
- timeFormat string
- prefix string
- levels []string
- closed bool
-}
-
-// Create a new console logger with output level o, and an empty prefix
-func NewConsoleLogger(o int) *ConsoleLogger {
- return &ConsoleLogger{
- out: os.Stdout,
- outLevel: o,
- timeFormat: TIMEFORMAT,
- prefix: "",
- levels: levels,
- }
-}
-
-func NewBasicLogger(f io.WriteCloser, level int) *ConsoleLogger {
- return &ConsoleLogger{
- out: f,
- outLevel: level,
- timeFormat: TIMEFORMAT,
- prefix: "",
- levels: levels,
- }
-}
-
-// Generic output function. If msg does not end with a newline, one will be appended.
-func (l *ConsoleLogger) output(msg *Message) {
- buf := []byte{}
- buf = append(buf, msg.time.Format(l.timeFormat)...)
- if l.prefix != "" {
- buf = append(buf, ' ')
- buf = append(buf, l.prefix...)
- }
- buf = append(buf, ' ')
- buf = append(buf, l.levels[msg.level]...)
- buf = append(buf, ' ')
- buf = append(buf, msg.m...)
- if len(msg.m) > 0 && msg.m[len(msg.m)-1] != '\n' {
- buf = append(buf, '\n')
- }
- l.out.Write(buf)
-}
-
-// Sets the available levels for this logger
-func (l *ConsoleLogger) SetLevels(lvls []string) {
- if lvls[len(lvls)-1] != "*LOG*" {
- lvls = append(lvls, "*LOG*")
- }
- l.levels = lvls
-}
-
-// Sets the output level for this logger
-func (l *ConsoleLogger) Level(o int) {
- if o >= 0 && o <= len(l.levels)-1 {
- l.outLevel = o
- }
-}
-
-// Sets the prefix for this logger
-func (l *ConsoleLogger) Prefix(p string) {
- l.prefix = p
-}
-
-// Sets the time format for this logger
-func (l *ConsoleLogger) TimeFormat(f string) {
- l.timeFormat = f
-}
-
-// Close the logger
-func (l *ConsoleLogger) Close() {
- l.closed = true
- l.output(&Message{len(l.levels) - 1, "Closing log now", time.Now()})
- l.out.Close()
-}
-
-func (l *ConsoleLogger) log(lvl int, format string, v ...interface{}) {
- if lvl < l.outLevel || l.closed {
- return
- }
- // recover in case the channel has already been closed (unlikely race condition)
- // this could also be solved with a lock, but would cause a performance hit
- defer recover()
- l.output(&Message{lvl, fmt.Sprintf(format, v...), time.Now()})
-}
-
-// Logging functions
-func (l *ConsoleLogger) Fatal(format string, v ...interface{}) {
- l.log(FATAL, format, v...)
-}
-
-func (l *ConsoleLogger) Error(format string, v ...interface{}) {
- l.log(ERROR, format, v...)
-}
-
-func (l *ConsoleLogger) Warn(format string, v ...interface{}) {
- l.log(WARN, format, v...)
-}
-
-func (l *ConsoleLogger) Info(format string, v ...interface{}) {
- l.log(INFO, format, v...)
-}
-
-func (l *ConsoleLogger) Debug(format string, v ...interface{}) {
- l.log(DEBUG, format, v...)
-}
-
-func (l *ConsoleLogger) Trace(format string, v ...interface{}) {
- l.log(TRACE, format, v...)
-}
-
-func (l *ConsoleLogger) Print(lvl int, v ...interface{}) {
- l.output(&Message{lvl, fmt.Sprint(v...), time.Now()})
-}
-
-func (l *ConsoleLogger) Printf(lvl int, format string, v ...interface{}) {
- l.output(&Message{lvl, fmt.Sprintf(format, v...), time.Now()})
-}
-
-func (l *ConsoleLogger) GetLevel() int {
- return l.outLevel
-}
-
-func (l *ConsoleLogger) IsFatal() bool {
- return l.outLevel <= FATAL
-}
-
-func (l *ConsoleLogger) IsError() bool {
- return l.outLevel <= ERROR
-}
-
-func (l *ConsoleLogger) IsWarn() bool {
- return l.outLevel <= WARN
-}
-
-func (l *ConsoleLogger) IsInfo() bool {
- return l.outLevel <= INFO
-}
-
-func (l *ConsoleLogger) IsDebug() bool {
- return l.outLevel <= DEBUG
-}
-
-func (l *ConsoleLogger) IsTrace() bool {
- return l.outLevel <= TRACE
-}
diff --git a/vendor/github.com/jcelliott/lumber/filelog.go b/vendor/github.com/jcelliott/lumber/filelog.go
deleted file mode 100644
index e13e877..0000000
--- a/vendor/github.com/jcelliott/lumber/filelog.go
+++ /dev/null
@@ -1,362 +0,0 @@
-package lumber
-
-import (
- "bufio"
- "fmt"
- "os"
- "path/filepath"
- "sort"
- "strconv"
- "strings"
- "time"
-)
-
-const (
- // mode constants
- APPEND = iota
- TRUNC
- BACKUP
- ROTATE
-)
-
-const (
- BUFSIZE = 100
-)
-
-type FileLogger struct {
- queue chan *Message
- done chan bool
- out *os.File
- timeFormat, prefix string
- outLevel, maxLines, curLines, maxRotate, mode int
- closed, errored bool
- levels []string
-}
-
-// Convenience function to create a new append-only logger
-func NewAppendLogger(f string) (*FileLogger, error) {
- return NewFileLogger(f, INFO, APPEND, 0, 0, BUFSIZE)
-}
-
-// Convenience function to create a new truncating logger
-func NewTruncateLogger(f string) (*FileLogger, error) {
- return NewFileLogger(f, INFO, TRUNC, 0, 0, BUFSIZE)
-}
-
-// Convenience function to create a new backup logger
-func NewBackupLogger(f string, maxBackup int) (*FileLogger, error) {
- return NewFileLogger(f, INFO, BACKUP, 0, maxBackup, BUFSIZE)
-}
-
-// Convenience function to create a new rotating logger
-func NewRotateLogger(f string, maxLines, maxRotate int) (*FileLogger, error) {
- return NewFileLogger(f, INFO, ROTATE, maxLines, maxRotate, BUFSIZE)
-}
-
-// Creates a new FileLogger with filename f, output level o, and an empty prefix.
-// Modes are described in the documentation; maxLines and maxRotate are only significant
-// for some modes.
-func NewFileLogger(f string, o, mode, maxLines, maxRotate, bufsize int) (*FileLogger, error) {
- var file *os.File
- var err error
-
- switch mode {
- case APPEND:
- // open log file, append if it already exists
- file, err = os.OpenFile(f, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
- case TRUNC:
- // just truncate file and start logging
- file, err = os.OpenFile(f, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
- case BACKUP:
- // rotate every time a new logger is created
- file, err = openBackup(f, 0, maxRotate)
- case ROTATE:
- // "normal" rotation, when file reaches line limit
- file, err = openBackup(f, maxLines, maxRotate)
- default:
- return nil, fmt.Errorf("Invalid mode parameter: %d", mode)
- }
- if err != nil {
- return nil, fmt.Errorf("Error creating logger: %s", err)
- }
-
- return newFileLogger(file, o, mode, maxLines, maxRotate, bufsize), nil
-}
-
-func NewBasicFileLogger(f *os.File, level int) (l *FileLogger) {
- return newFileLogger(f, level, 0, 0, 0, BUFSIZE)
-}
-
-func newFileLogger(f *os.File, o, mode, maxLines, maxRotate, bufsize int) (l *FileLogger) {
- l = &FileLogger{
- queue: make(chan *Message, bufsize),
- done: make(chan bool),
- out: f,
- outLevel: o,
- timeFormat: TIMEFORMAT,
- prefix: "",
- maxLines: maxLines,
- maxRotate: maxRotate,
- mode: mode,
- levels: levels,
- }
-
- if mode == ROTATE {
- // get the current line count if relevant
- l.curLines = countLines(l.out)
- }
-
- go l.startOutput()
- return
-}
-
-func (l *FileLogger) startOutput() {
- for {
- m, ok := <-l.queue
- if !ok {
- // the channel is closed and empty
- l.printLog(&Message{len(l.levels) - 1, fmt.Sprintf("Closing log now"), time.Now()})
- l.out.Sync()
- if err := l.out.Close(); err != nil {
- l.printLog(&Message{len(l.levels) - 1, fmt.Sprintf("Error closing log file: %s", err), time.Now()})
- }
- l.done <- true
- return
- }
- l.output(m)
- }
-}
-
-// Attempt to create new log. Specific behavior depends on the maxLines setting
-func openBackup(f string, maxLines, maxRotate int) (*os.File, error) {
- // first try to open the file with O_EXCL (file must not already exist)
- file, err := os.OpenFile(f, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0644)
- // if there are no errors (it's a new file), we can just use this file
- if err == nil {
- return file, nil
- }
- // if the error wasn't an 'Exist' error, we've got a problem
- if !os.IsExist(err) {
- return nil, fmt.Errorf("Error opening file for logging: %s", err)
- }
-
- if maxLines == 0 {
- // we're in backup mode, rotate and return the new file
- return doRotate(f, maxRotate)
- }
-
- // the file already exists, open it
- return os.OpenFile(f, os.O_RDWR|os.O_APPEND, 0644)
-}
-
-// Rotate the logs
-func (l *FileLogger) rotate() error {
- oldFile := l.out
- file, err := doRotate(l.out.Name(), l.maxRotate)
- if err != nil {
- return fmt.Errorf("Error rotating logs: %s", err)
- }
- l.curLines = 0
- l.out = file
- oldFile.Close()
- return nil
-}
-
-// Rotate all the logs and return a file with newly vacated filename
-// Rename 'log.name' to 'log.name.1' and 'log.name.1' to 'log.name.2' etc
-func doRotate(f string, limit int) (*os.File, error) {
- // create a format string with the correct amount of zero-padding for the limit
- numFmt := fmt.Sprintf(".%%0%dd", len(fmt.Sprintf("%d", limit)))
- // get all rotated files and sort them in reverse order
- list, err := filepath.Glob(fmt.Sprintf("%s.*", f))
- if err != nil {
- return nil, fmt.Errorf("Error rotating logs: %s", err)
- }
- sort.Sort(sort.Reverse(sort.StringSlice(list)))
- for _, file := range list {
- parts := strings.Split(file, ".")
- numPart := parts[len(parts)-1]
- num, err := strconv.Atoi(numPart)
- if err != nil {
- // not a number, don't rotate it
- continue
- }
- if num >= limit {
- // we're at the limit, don't rotate it
- continue
- }
- newName := fmt.Sprintf(strings.Join(parts[:len(parts)-1], ".")+numFmt, num+1)
- // don't check error because there's nothing we can do
- os.Rename(file, newName)
- }
- if err = os.Rename(f, fmt.Sprintf(f+numFmt, 1)); err != nil {
- if !os.IsNotExist(err) {
- return nil, fmt.Errorf("Error rotating logs: %s", err)
- }
- }
- return os.OpenFile(f, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
-}
-
-// Generic output function. Outputs messages if they are higher level than outLevel for this
-// specific logger. If msg does not end with a newline, one will be appended.
-func (l *FileLogger) output(msg *Message) {
- if l.mode == ROTATE && l.curLines >= l.maxLines && !l.errored {
- err := l.rotate()
- if err != nil {
- // if we can't rotate the logs, we should stop logging to prevent the log file from growing
- // past the limit and continuously retrying the rotate operation (but log current msg first)
- l.printLog(msg)
- l.printLog(&Message{len(l.levels) - 1, fmt.Sprintf("Error rotating logs: %s. Closing log."), time.Now()})
- l.errored = true
- l.close()
- }
- }
- l.printLog(msg)
-}
-
-func (l *FileLogger) printLog(msg *Message) {
- buf := []byte{}
- buf = append(buf, msg.time.Format(l.timeFormat)...)
- if l.prefix != "" {
- buf = append(buf, ' ')
- buf = append(buf, l.prefix...)
- }
- buf = append(buf, ' ')
- buf = append(buf, l.levels[msg.level]...)
- buf = append(buf, ' ')
- buf = append(buf, msg.m...)
- if len(msg.m) > 0 && msg.m[len(msg.m)-1] != '\n' {
- buf = append(buf, '\n')
- }
- l.curLines += 1
- l.out.Write(buf)
-}
-
-// Sets the available levels for this logger
-// TODO: append a *LOG* level
-func (l *FileLogger) SetLevels(lvls []string) {
- if lvls[len(lvls)-1] != "*LOG*" {
- lvls = append(lvls, "*LOG*")
- }
- l.levels = lvls
-}
-
-// Sets the output level for this logger
-func (l *FileLogger) Level(o int) {
- if o >= 0 && o <= len(l.levels)-1 {
- l.outLevel = o
- }
-}
-
-// Sets the prefix for this logger
-func (l *FileLogger) Prefix(p string) {
- l.prefix = p
-}
-
-// Sets the time format for this logger
-func (l *FileLogger) TimeFormat(f string) {
- l.timeFormat = f
-}
-
-// Flush the messages in the queue and shut down the logger.
-func (l *FileLogger) close() {
- l.closed = true
- // closing the channel will signal the goroutine to finish writing messages in the queue
- // and then shut down by sync'ing and close'ing the file.
- close(l.queue)
-}
-
-// Flush the messages in the queue and shut down the logger.
-func (l *FileLogger) Close() {
- l.close()
- <-l.done
-}
-
-// return the number of lines in the given file
-func countLines(f *os.File) int {
- r := bufio.NewReader(f)
- count := 0
- var err error = nil
- for err == nil {
- prefix := true
- _, prefix, err = r.ReadLine()
- if err != nil {
- }
- // sometimes we don't get the whole line at once
- if !prefix && err == nil {
- count++
- }
- }
- return count
-}
-
-func (l *FileLogger) log(lvl int, format string, v ...interface{}) {
- if lvl < l.outLevel || l.closed {
- return
- }
- // recover in case the channel has already been closed (unlikely race condition)
- // this could also be solved with a lock, but would cause a performance hit
- defer recover()
- l.queue <- &Message{lvl, fmt.Sprintf(format, v...), time.Now()}
-}
-
-// Logging functions
-func (l *FileLogger) Fatal(format string, v ...interface{}) {
- l.log(FATAL, format, v...)
-}
-
-func (l *FileLogger) Error(format string, v ...interface{}) {
- l.log(ERROR, format, v...)
-}
-
-func (l *FileLogger) Warn(format string, v ...interface{}) {
- l.log(WARN, format, v...)
-}
-
-func (l *FileLogger) Info(format string, v ...interface{}) {
- l.log(INFO, format, v...)
-}
-
-func (l *FileLogger) Debug(format string, v ...interface{}) {
- l.log(DEBUG, format, v...)
-}
-
-func (l *FileLogger) Trace(format string, v ...interface{}) {
- l.log(TRACE, format, v...)
-}
-
-func (l *FileLogger) Print(lvl int, v ...interface{}) {
- l.output(&Message{lvl, fmt.Sprint(v...), time.Now()})
-}
-
-func (l *FileLogger) Printf(lvl int, format string, v ...interface{}) {
- l.output(&Message{lvl, fmt.Sprintf(format, v...), time.Now()})
-}
-
-func (l *FileLogger) GetLevel() int {
- return l.outLevel
-}
-
-func (l *FileLogger) IsFatal() bool {
- return l.outLevel <= FATAL
-}
-
-func (l *FileLogger) IsError() bool {
- return l.outLevel <= ERROR
-}
-
-func (l *FileLogger) IsWarn() bool {
- return l.outLevel <= WARN
-}
-
-func (l *FileLogger) IsInfo() bool {
- return l.outLevel <= INFO
-}
-
-func (l *FileLogger) IsDebug() bool {
- return l.outLevel <= DEBUG
-}
-
-func (l *FileLogger) IsTrace() bool {
- return l.outLevel <= TRACE
-}
diff --git a/vendor/github.com/jcelliott/lumber/lumber.go b/vendor/github.com/jcelliott/lumber/lumber.go
deleted file mode 100644
index 61795b2..0000000
--- a/vendor/github.com/jcelliott/lumber/lumber.go
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-Package lumber implements a simple logger that supports log levels and rotation.
-*/
-package lumber
-
-import (
- "strings"
- "time"
-)
-
-const (
- TRACE = iota
- DEBUG
- INFO
- WARN
- ERROR
- FATAL
-
- TIMEFORMAT = "2006-01-02 15:04:05"
-)
-
-var (
- stdLog Logger = NewConsoleLogger(INFO)
- levels = []string{"TRACE", "DEBUG", "INFO ", "WARN ", "ERROR", "FATAL", "*LOG*"}
- timeFormat = TIMEFORMAT
-)
-
-type Logger interface {
- Fatal(string, ...interface{})
- Error(string, ...interface{})
- Warn(string, ...interface{})
- Info(string, ...interface{})
- Debug(string, ...interface{})
- Trace(string, ...interface{})
-
- IsFatal() bool
- IsError() bool
- IsWarn() bool
- IsInfo() bool
- IsDebug() bool
- IsTrace() bool
- GetLevel() int
-
- Print(int, ...interface{})
- Printf(int, string, ...interface{})
- Level(int)
- Prefix(string)
- TimeFormat(string)
- Close()
- output(msg *Message)
-}
-
-type Message struct {
- level int
- m string
- time time.Time
-}
-
-// SetLogger sets a new default logger
-func SetLogger(l Logger) {
- stdLog = l
-}
-
-// Returns the string representation of the level
-func LvlStr(l int) string {
- if l >= 0 && l <= len(levels)-1 {
- return levels[l]
- }
- return ""
-}
-
-// Returns the int value of the level
-func LvlInt(s string) int {
- for i, str := range levels {
- if strings.TrimSpace(str) == strings.ToUpper(s) {
- return i
- }
- }
- return 0
-}
-
-// Sets the output level for the default logger
-func Level(o int) {
- stdLog.Level(o)
-}
-
-// Sets the time format for the default logger
-func TimeFormat(f string) {
- stdLog.TimeFormat(f)
-}
-
-// Close the default logger
-func Close() {
- stdLog.Close()
-}
-
-// Prefix sets a prefix for the default logger
-func Prefix(p string) {
- stdLog.Prefix(p)
-}
-
-// Logging functions
-func Fatal(format string, v ...interface{}) {
- stdLog.Fatal(format, v...)
-}
-
-func Error(format string, v ...interface{}) {
- stdLog.Error(format, v...)
-}
-
-func Warn(format string, v ...interface{}) {
- stdLog.Warn(format, v...)
-}
-
-func Info(format string, v ...interface{}) {
- stdLog.Info(format, v...)
-}
-
-func Debug(format string, v ...interface{}) {
- stdLog.Debug(format, v...)
-}
-
-func Trace(format string, v ...interface{}) {
- stdLog.Trace(format, v...)
-}
-
-func Print(lvl int, v ...interface{}) {
- stdLog.Print(lvl, v...)
-}
-
-func Printf(lvl int, format string, v ...interface{}) {
- stdLog.Printf(lvl, format, v...)
-}
-
-func GetLevel() int {
- return stdLog.GetLevel()
-}
-
-func IsFatal() bool {
- return stdLog.IsFatal()
-}
-
-func IsError() bool {
- return stdLog.IsError()
-}
-
-func IsWarn() bool {
- return stdLog.IsWarn()
-}
-
-func IsInfo() bool {
- return stdLog.IsInfo()
-}
-
-func IsDebug() bool {
- return stdLog.IsDebug()
-}
-
-func IsTrace() bool {
- return stdLog.IsTrace()
-}
diff --git a/vendor/github.com/jcelliott/lumber/multilog.go b/vendor/github.com/jcelliott/lumber/multilog.go
deleted file mode 100644
index c39e877..0000000
--- a/vendor/github.com/jcelliott/lumber/multilog.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package lumber
-
-import (
- "fmt"
- "time"
-)
-
-type MultiLogger struct {
- loggers []Logger
-}
-
-func NewMultiLogger() (l *MultiLogger) {
- return &MultiLogger{}
-}
-
-func (p *MultiLogger) AddLoggers(newLogs ...Logger) {
- for _, l := range newLogs {
- p.loggers = append(p.loggers, l)
- }
-}
-
-func (p *MultiLogger) ClearLoggers() {
- p.loggers = make([]Logger, 0)
-}
-
-// All of these implement the Logger interface and distribute calls to it over
-// all of the member Logger objects.
-func (p *MultiLogger) Fatal(s string, v ...interface{}) {
- for _, logger := range p.loggers {
- logger.Fatal(s, v...)
- }
-}
-
-func (p *MultiLogger) Error(s string, v ...interface{}) {
- for _, logger := range p.loggers {
- logger.Error(s, v...)
- }
-}
-
-func (p *MultiLogger) Warn(s string, v ...interface{}) {
- for _, logger := range p.loggers {
- logger.Warn(s, v...)
- }
-}
-
-func (p *MultiLogger) Info(s string, v ...interface{}) {
- for _, logger := range p.loggers {
- logger.Info(s, v...)
- }
-}
-
-func (p *MultiLogger) Debug(s string, v ...interface{}) {
- for _, logger := range p.loggers {
- logger.Debug(s, v...)
- }
-}
-
-func (p *MultiLogger) Trace(s string, v ...interface{}) {
- for _, logger := range p.loggers {
- logger.Trace(s, v...)
- }
-}
-
-func (p *MultiLogger) Level(i int) {
- for _, logger := range p.loggers {
- logger.Level(i)
- }
-}
-
-func (p *MultiLogger) Prefix(s string) {
- for _, logger := range p.loggers {
- logger.Prefix(s)
- }
-}
-
-func (p *MultiLogger) TimeFormat(s string) {
- for _, logger := range p.loggers {
- logger.TimeFormat(s)
- }
-}
-
-func (p *MultiLogger) Close() {
- for _, logger := range p.loggers {
- logger.Close()
- }
-}
-
-func (p *MultiLogger) output(m *Message) {
- for _, logger := range p.loggers {
- logger.output(m)
- }
-}
-
-func (p *MultiLogger) Print(lvl int, v ...interface{}) {
- p.output(&Message{lvl, fmt.Sprint(v...), time.Now()})
-}
-
-func (p *MultiLogger) Printf(lvl int, format string, v ...interface{}) {
- p.output(&Message{lvl, fmt.Sprintf(format, v...), time.Now()})
-}
-
-func (p *MultiLogger) GetLevel() int {
- level := FATAL
- for _, logger := range p.loggers {
- if logger.GetLevel() <= level {
- level = logger.GetLevel()
- }
- }
- return level
-}
-
-func (p *MultiLogger) IsFatal() bool {
- return p.GetLevel() <= FATAL
-}
-
-func (p *MultiLogger) IsError() bool {
- return p.GetLevel() <= ERROR
-}
-
-func (p *MultiLogger) IsWarn() bool {
- return p.GetLevel() <= WARN
-}
-
-func (p *MultiLogger) IsInfo() bool {
- return p.GetLevel() <= INFO
-}
-
-func (p *MultiLogger) IsDebug() bool {
- return p.GetLevel() <= DEBUG
-}
-
-func (p *MultiLogger) IsTrace() bool {
- return p.GetLevel() <= TRACE
-}
diff --git a/vendor/github.com/mattn/go-isatty/LICENSE b/vendor/github.com/mattn/go-isatty/LICENSE
deleted file mode 100644
index 65dc692..0000000
--- a/vendor/github.com/mattn/go-isatty/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (c) Yasuhiro MATSUMOTO
-
-MIT License (Expat)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/mattn/go-isatty/README.md b/vendor/github.com/mattn/go-isatty/README.md
deleted file mode 100644
index 74845de..0000000
--- a/vendor/github.com/mattn/go-isatty/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# go-isatty
-
-isatty for golang
-
-## Usage
-
-```go
-package main
-
-import (
- "fmt"
- "github.com/mattn/go-isatty"
- "os"
-)
-
-func main() {
- if isatty.IsTerminal(os.Stdout.Fd()) {
- fmt.Println("Is Terminal")
- } else {
- fmt.Println("Is Not Terminal")
- }
-}
-```
-
-## Installation
-
-```
-$ go get github.com/mattn/go-isatty
-```
-
-# License
-
-MIT
-
-# Author
-
-Yasuhiro Matsumoto (a.k.a mattn)
diff --git a/vendor/github.com/mattn/go-isatty/doc.go b/vendor/github.com/mattn/go-isatty/doc.go
deleted file mode 100644
index 17d4f90..0000000
--- a/vendor/github.com/mattn/go-isatty/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package isatty implements interface to isatty
-package isatty
diff --git a/vendor/github.com/mattn/go-isatty/isatty_appengine.go b/vendor/github.com/mattn/go-isatty/isatty_appengine.go
deleted file mode 100644
index 83c5887..0000000
--- a/vendor/github.com/mattn/go-isatty/isatty_appengine.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build appengine
-
-package isatty
-
-// IsTerminal returns true if the file descriptor is terminal which
-// is always false on on appengine classic which is a sandboxed PaaS.
-func IsTerminal(fd uintptr) bool {
- return false
-}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_bsd.go b/vendor/github.com/mattn/go-isatty/isatty_bsd.go
deleted file mode 100644
index 42f2514..0000000
--- a/vendor/github.com/mattn/go-isatty/isatty_bsd.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build darwin freebsd openbsd netbsd dragonfly
-// +build !appengine
-
-package isatty
-
-import (
- "syscall"
- "unsafe"
-)
-
-const ioctlReadTermios = syscall.TIOCGETA
-
-// IsTerminal return true if the file descriptor is terminal.
-func IsTerminal(fd uintptr) bool {
- var termios syscall.Termios
- _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
- return err == 0
-}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_linux.go b/vendor/github.com/mattn/go-isatty/isatty_linux.go
deleted file mode 100644
index 9d24bac..0000000
--- a/vendor/github.com/mattn/go-isatty/isatty_linux.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build linux
-// +build !appengine
-
-package isatty
-
-import (
- "syscall"
- "unsafe"
-)
-
-const ioctlReadTermios = syscall.TCGETS
-
-// IsTerminal return true if the file descriptor is terminal.
-func IsTerminal(fd uintptr) bool {
- var termios syscall.Termios
- _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
- return err == 0
-}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_solaris.go b/vendor/github.com/mattn/go-isatty/isatty_solaris.go
deleted file mode 100644
index 1f0c6bf..0000000
--- a/vendor/github.com/mattn/go-isatty/isatty_solaris.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build solaris
-// +build !appengine
-
-package isatty
-
-import (
- "golang.org/x/sys/unix"
-)
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-// see: http://src.illumos.org/source/xref/illumos-gate/usr/src/lib/libbc/libc/gen/common/isatty.c
-func IsTerminal(fd uintptr) bool {
- var termio unix.Termio
- err := unix.IoctlSetTermio(int(fd), unix.TCGETA, &termio)
- return err == nil
-}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_windows.go b/vendor/github.com/mattn/go-isatty/isatty_windows.go
deleted file mode 100644
index 83c398b..0000000
--- a/vendor/github.com/mattn/go-isatty/isatty_windows.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build windows
-// +build !appengine
-
-package isatty
-
-import (
- "syscall"
- "unsafe"
-)
-
-var kernel32 = syscall.NewLazyDLL("kernel32.dll")
-var procGetConsoleMode = kernel32.NewProc("GetConsoleMode")
-
-// IsTerminal return true if the file descriptor is terminal.
-func IsTerminal(fd uintptr) bool {
- var st uint32
- r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, fd, uintptr(unsafe.Pointer(&st)), 0)
- return r != 0 && e == 0
-}
diff --git a/vendor/github.com/microcosm-cc/bluemonday/.coveralls.yml b/vendor/github.com/microcosm-cc/bluemonday/.coveralls.yml
deleted file mode 100644
index e0c8760..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/.coveralls.yml
+++ /dev/null
@@ -1 +0,0 @@
-repo_token: x2wlA1x0X8CK45ybWpZRCVRB4g7vtkhaw
diff --git a/vendor/github.com/microcosm-cc/bluemonday/.gitignore b/vendor/github.com/microcosm-cc/bluemonday/.gitignore
deleted file mode 100644
index 0026861..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
diff --git a/vendor/github.com/microcosm-cc/bluemonday/.travis.yml b/vendor/github.com/microcosm-cc/bluemonday/.travis.yml
deleted file mode 100644
index 5694dac..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: go
-go:
- - 1.1
- - 1.2
- - 1.3
- - 1.4
- - 1.5
- - 1.6
- - 1.7
- - tip
-matrix:
- allow_failures:
- - go: tip
- fast_finish: true
-install:
- - go get golang.org/x/net/html
-script:
- - go test -v ./...
diff --git a/vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md b/vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md
deleted file mode 100644
index e0e0c81..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributing to bluemonday
-
-Third-party patches are essential for keeping bluemonday secure and offering the features developers want. However there are a few guidelines that we need contributors to follow so that we can maintain the quality of work that developers who use bluemonday expect.
-
-## Getting Started
-
-* Make sure you have a [Github account](https://github.com/signup/free)
-
-## Submitting an Issue
-
-* Submit a ticket for your issue, assuming one does not already exist
-* Clearly describe the issue including the steps to reproduce (with sample input and output) if it is a bug
-
-If you are reporting a security flaw, you may expect that we will provide the code to fix it for you. Otherwise you may want to submit a pull request to ensure the resolution is applied sooner rather than later:
-
-* Fork the repository on Github
-* Issue a pull request containing code to resolve the issue
-
-## Submitting a Pull Request
-
-* Submit a ticket for your issue, assuming one does not already exist
-* Describe the reason for the pull request and if applicable show some example inputs and outputs to demonstrate what the patch does
-* Fork the repository on Github
-* Before submitting the pull request you should
- 1. Include tests for your patch, 1 test should encapsulate the entire patch and should refer to the Github issue
- 1. If you have added new exposed/public functionality, you should ensure it is documented appropriately
- 1. If you have added new exposed/public functionality, you should consider demonstrating how to use it within one of the helpers or shipped policies if appropriate or within a test if modifying a helper or policy is not appropriate
- 1. Run all of the tests `go test -v ./...` or `make test` and ensure all tests pass
- 1. Run gofmt `gofmt -w ./$*` or `make fmt`
- 1. Run vet `go tool vet *.go` or `make vet` and resolve any issues
- 1. Install golint using `go get -u github.com/golang/lint/golint` and run vet `golint *.go` or `make lint` and resolve every warning
-* When submitting the pull request you should
- 1. Note the issue(s) it resolves, i.e. `Closes #6` in the pull request comment to close issue #6 when the pull request is accepted
-
-Once you have submitted a pull request, we *may* merge it without changes. If we have any comments or feedback, or need you to make changes to your pull request we will update the Github pull request or the associated issue. We expect responses from you within two weeks, and we may close the pull request is there is no activity.
-
-### Contributor Licence Agreement
-
-We haven't gone for the formal "Sign a Contributor Licence Agreement" thing that projects like [puppet](https://cla.puppetlabs.com/), [Mojito](https://developer.yahoo.com/cocktails/mojito/cla/) and companies like [Google](http://code.google.com/legal/individual-cla-v1.0.html) are using.
-
-But we do need to know that we can accept and merge your contributions, so for now the act of contributing a pull request should be considered equivalent to agreeing to a contributor licence agreement, specifically:
-
-You accept that the act of submitting code to the bluemonday project is to grant a copyright licence to the project that is perpetual, worldwide, non-exclusive, no-charge, royalty free and irrevocable.
-
-You accept that all who comply with the licence of the project (BSD 3-clause) are permitted to use your contributions to the project.
-
-You accept, and by submitting code do declare, that you have the legal right to grant such a licence to the project and that each of the contributions is your own original creation.
diff --git a/vendor/github.com/microcosm-cc/bluemonday/CREDITS.md b/vendor/github.com/microcosm-cc/bluemonday/CREDITS.md
deleted file mode 100644
index 4422905..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/CREDITS.md
+++ /dev/null
@@ -1,6 +0,0 @@
-
-1. John Graham-Cumming http://jgc.org/
-1. Mike Samuel mikesamuel@gmail.com
-1. Dmitri Shuralyov shurcooL@gmail.com
-1. https://github.com/opennota
-1. https://github.com/Gufran
\ No newline at end of file
diff --git a/vendor/github.com/microcosm-cc/bluemonday/LICENCE.md b/vendor/github.com/microcosm-cc/bluemonday/LICENCE.md
deleted file mode 100644
index f822458..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/LICENCE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2014, David Kitchen
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-* Neither the name of the organisation (Microcosm) nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/microcosm-cc/bluemonday/Makefile b/vendor/github.com/microcosm-cc/bluemonday/Makefile
deleted file mode 100644
index b15dc74..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Targets:
-#
-# all: Builds the code locally after testing
-#
-# fmt: Formats the source files
-# build: Builds the code locally
-# vet: Vets the code
-# lint: Runs lint over the code (you do not need to fix everything)
-# test: Runs the tests
-# cover: Gives you the URL to a nice test coverage report
-#
-# install: Builds, tests and installs the code locally
-
-.PHONY: all fmt build vet lint test cover install
-
-# The first target is always the default action if `make` is called without
-# args we build and install into $GOPATH so that it can just be run
-
-all: fmt vet test install
-
-fmt:
- @gofmt -s -w ./$*
-
-build:
- @go build
-
-vet:
- @go vet *.go
-
-lint:
- @golint *.go
-
-test:
- @go test -v ./...
-
-cover: COVERAGE_FILE := coverage.out
-cover:
- @go test -coverprofile=$(COVERAGE_FILE) && \
- cover -html=$(COVERAGE_FILE) && rm $(COVERAGE_FILE)
-
-install:
- @go install ./...
diff --git a/vendor/github.com/microcosm-cc/bluemonday/README.md b/vendor/github.com/microcosm-cc/bluemonday/README.md
deleted file mode 100644
index b8508ff..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/README.md
+++ /dev/null
@@ -1,346 +0,0 @@
-# bluemonday [](https://travis-ci.org/microcosm-cc/bluemonday) [](https://godoc.org/github.com/microcosm-cc/bluemonday)
-
-bluemonday is a HTML sanitizer implemented in Go. It is fast and highly configurable.
-
-bluemonday takes untrusted user generated content as an input, and will return HTML that has been sanitised against a whitelist of approved HTML elements and attributes so that you can safely include the content in your web page.
-
-If you accept user generated content, and your server uses Go, you **need** bluemonday.
-
-The default policy for user generated content (`bluemonday.UGCPolicy().Sanitize()`) turns this:
-```html
-Hello World
-```
-
-Into a harmless:
-```html
-Hello World
-```
-
-And it turns this:
-```html
-XSS
-```
-
-Into this:
-```html
-XSS
-```
-
-Whilst still allowing this:
-```html
-
- 
-
-```
-
-To pass through mostly unaltered (it gained a rel="nofollow" which is a good thing for user generated content):
-```html
-
-
-
-```
-
-It protects sites from [XSS](http://en.wikipedia.org/wiki/Cross-site_scripting) attacks. There are many [vectors for an XSS attack](https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet) and the best way to mitigate the risk is to sanitize user input against a known safe list of HTML elements and attributes.
-
-You should **always** run bluemonday **after** any other processing.
-
-If you use [blackfriday](https://github.com/russross/blackfriday) or [Pandoc](http://johnmacfarlane.net/pandoc/) then bluemonday should be run after these steps. This ensures that no insecure HTML is introduced later in your process.
-
-bluemonday is heavily inspired by both the [OWASP Java HTML Sanitizer](https://code.google.com/p/owasp-java-html-sanitizer/) and the [HTML Purifier](http://htmlpurifier.org/).
-
-## Technical Summary
-
-Whitelist based, you need to either build a policy describing the HTML elements and attributes to permit (and the `regexp` patterns of attributes), or use one of the supplied policies representing good defaults.
-
-The policy containing the whitelist is applied using a fast non-validating, forward only, token-based parser implemented in the [Go net/html library](https://godoc.org/golang.org/x/net/html) by the core Go team.
-
-We expect to be supplied with well-formatted HTML (closing elements for every applicable open element, nested correctly) and so we do not focus on repairing badly nested or incomplete HTML. We focus on simply ensuring that whatever elements do exist are described in the policy whitelist and that attributes and links are safe for use on your web page. [GIGO](http://en.wikipedia.org/wiki/Garbage_in,_garbage_out) does apply and if you feed it bad HTML bluemonday is not tasked with figuring out how to make it good again.
-
-### Supported Go Versions
-
-bluemonday is regularly tested against Go 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7 and tip.
-
-We do not support Go 1.0 as we depend on `golang.org/x/net/html` which includes a reference to `io.ErrNoProgress` which did not exist in Go 1.0.
-
-## Is it production ready?
-
-*Yes*
-
-We are using bluemonday in production having migrated from the widely used and heavily field tested OWASP Java HTML Sanitizer.
-
-We are passing our extensive test suite (including AntiSamy tests as well as tests for any issues raised). Check for any [unresolved issues](https://github.com/microcosm-cc/bluemonday/issues?page=1&state=open) to see whether anything may be a blocker for you.
-
-We invite pull requests and issues to help us ensure we are offering comprehensive protection against various attacks via user generated content.
-
-## Usage
-
-Install in your `${GOPATH}` using `go get -u github.com/microcosm-cc/bluemonday`
-
-Then call it:
-```go
-package main
-
-import (
- "fmt"
-
- "github.com/microcosm-cc/bluemonday"
-)
-
-func main() {
- p := bluemonday.UGCPolicy()
- html := p.Sanitize(
- `Google`,
- )
-
- // Output:
- // Google
- fmt.Println(html)
-}
-```
-
-We offer three ways to call Sanitize:
-```go
-p.Sanitize(string) string
-p.SanitizeBytes([]byte) []byte
-p.SanitizeReader(io.Reader) bytes.Buffer
-```
-
-If you are obsessed about performance, `p.SanitizeReader(r).Bytes()` will return a `[]byte` without performing any unnecessary casting of the inputs or outputs. Though the difference is so negligible you should never need to care.
-
-You can build your own policies:
-```go
-package main
-
-import (
- "fmt"
-
- "github.com/microcosm-cc/bluemonday"
-)
-
-func main() {
- p := bluemonday.NewPolicy()
-
- // Require URLs to be parseable by net/url.Parse and either:
- // mailto: http:// or https://
- p.AllowStandardURLs()
-
- // We only allow
" +
-
-// Error icon
-"" +
-
-// Warning icon
-"" +
-
-// Info icon
-"" +
-
-// Success icon
-"" + "" +
-
-// Title, text and input
-"
";
-
-exports["default"] = injectedHTML;
-module.exports = exports["default"];
-
-},{}],8:[function(require,module,exports){
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
- value: true
-});
-
-var _isIE8 = require('./utils');
-
-var _getModal$getInput$setFocusStyle = require('./handle-swal-dom');
-
-var _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide = require('./handle-dom');
-
-var alertTypes = ['error', 'warning', 'info', 'success', 'input', 'prompt'];
-
-/*
- * Set type, text and actions on modal
- */
-var setParameters = function setParameters(params) {
- var modal = _getModal$getInput$setFocusStyle.getModal();
-
- var $title = modal.querySelector('h2');
- var $text = modal.querySelector('p');
- var $cancelBtn = modal.querySelector('button.cancel');
- var $confirmBtn = modal.querySelector('button.confirm');
-
- /*
- * Title
- */
- $title.innerHTML = params.html ? params.title : _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.title).split('\n').join('Title
\nText
\n " + - -// Input errors -"\n
" +
-
-// Cancel and confirm buttons
-"" +
-
-// End of modal
-"!
\n Not valid!
\n'); - - /* - * Text - */ - $text.innerHTML = params.html ? params.text : _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.text || '').split('\n').join('
'); - if (params.text) _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.show($text); - - /* - * Custom class - */ - if (params.customClass) { - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass(modal, params.customClass); - modal.setAttribute('data-custom-class', params.customClass); - } else { - // Find previously set classes and remove them - var customClass = modal.getAttribute('data-custom-class'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.removeClass(modal, customClass); - modal.setAttribute('data-custom-class', ''); - } - - /* - * Icon - */ - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.hide(modal.querySelectorAll('.sa-icon')); - - if (params.type && !_isIE8.isIE8()) { - var _ret = (function () { - - var validType = false; - - for (var i = 0; i < alertTypes.length; i++) { - if (params.type === alertTypes[i]) { - validType = true; - break; - } - } - - if (!validType) { - logStr('Unknown alert type: ' + params.type); - return { - v: false - }; - } - - var typesWithIcons = ['success', 'error', 'warning', 'info']; - var $icon = undefined; - - if (typesWithIcons.indexOf(params.type) !== -1) { - $icon = modal.querySelector('.sa-icon.' + 'sa-' + params.type); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.show($icon); - } - - var $input = _getModal$getInput$setFocusStyle.getInput(); - - // Animate icon - switch (params.type) { - - case 'success': - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon, 'animate'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-tip'), 'animateSuccessTip'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-long'), 'animateSuccessLong'); - break; - - case 'error': - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon, 'animateErrorIcon'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-x-mark'), 'animateXMark'); - break; - - case 'warning': - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon, 'pulseWarning'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-body'), 'pulseWarningIns'); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-dot'), 'pulseWarningIns'); - break; - - case 'input': - case 'prompt': - $input.setAttribute('type', params.inputType); - $input.value = params.inputValue; - $input.setAttribute('placeholder', params.inputPlaceholder); - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass(modal, 'show-input'); - setTimeout(function () { - $input.focus(); - $input.addEventListener('keyup', swal.resetInputError); - }, 400); - break; - } - })(); - - if (typeof _ret === 'object') { - return _ret.v; - } - } - - /* - * Custom image - */ - if (params.imageUrl) { - var $customIcon = modal.querySelector('.sa-icon.sa-custom'); - - $customIcon.style.backgroundImage = 'url(' + params.imageUrl + ')'; - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.show($customIcon); - - var _imgWidth = 80; - var _imgHeight = 80; - - if (params.imageSize) { - var dimensions = params.imageSize.toString().split('x'); - var imgWidth = dimensions[0]; - var imgHeight = dimensions[1]; - - if (!imgWidth || !imgHeight) { - logStr('Parameter imageSize expects value with format WIDTHxHEIGHT, got ' + params.imageSize); - } else { - _imgWidth = imgWidth; - _imgHeight = imgHeight; - } - } - - $customIcon.setAttribute('style', $customIcon.getAttribute('style') + 'width:' + _imgWidth + 'px; height:' + _imgHeight + 'px'); - } - - /* - * Show cancel button? - */ - modal.setAttribute('data-has-cancel-button', params.showCancelButton); - if (params.showCancelButton) { - $cancelBtn.style.display = 'inline-block'; - } else { - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.hide($cancelBtn); - } - - /* - * Show confirm button? - */ - modal.setAttribute('data-has-confirm-button', params.showConfirmButton); - if (params.showConfirmButton) { - $confirmBtn.style.display = 'inline-block'; - } else { - _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.hide($confirmBtn); - } - - /* - * Custom text on cancel/confirm buttons - */ - if (params.cancelButtonText) { - $cancelBtn.innerHTML = _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.cancelButtonText); - } - if (params.confirmButtonText) { - $confirmBtn.innerHTML = _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.confirmButtonText); - } - - /* - * Custom color on confirm button - */ - if (params.confirmButtonColor) { - // Set confirm button to selected background color - $confirmBtn.style.backgroundColor = params.confirmButtonColor; - - // Set the confirm button color to the loading ring - $confirmBtn.style.borderLeftColor = params.confirmLoadingButtonColor; - $confirmBtn.style.borderRightColor = params.confirmLoadingButtonColor; - - // Set box-shadow to default focused button - _getModal$getInput$setFocusStyle.setFocusStyle($confirmBtn, params.confirmButtonColor); - } - - /* - * Allow outside click - */ - modal.setAttribute('data-allow-outside-click', params.allowOutsideClick); - - /* - * Callback function - */ - var hasDoneFunction = params.doneFunction ? true : false; - modal.setAttribute('data-has-done-function', hasDoneFunction); - - /* - * Animation - */ - if (!params.animation) { - modal.setAttribute('data-animation', 'none'); - } else if (typeof params.animation === 'string') { - modal.setAttribute('data-animation', params.animation); // Custom animation - } else { - modal.setAttribute('data-animation', 'pop'); - } - - /* - * Timer - */ - modal.setAttribute('data-timer', params.timer); -}; - -exports['default'] = setParameters; -module.exports = exports['default']; - -},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],9:[function(require,module,exports){ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); -/* - * Allow user to pass their own params - */ -var extend = function extend(a, b) { - for (var key in b) { - if (b.hasOwnProperty(key)) { - a[key] = b[key]; - } - } - return a; -}; - -/* - * Convert HEX codes to RGB values (#000000 -> rgb(0,0,0)) - */ -var hexToRgb = function hexToRgb(hex) { - var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); - return result ? parseInt(result[1], 16) + ', ' + parseInt(result[2], 16) + ', ' + parseInt(result[3], 16) : null; -}; - -/* - * Check if the user is using Internet Explorer 8 (for fallbacks) - */ -var isIE8 = function isIE8() { - return window.attachEvent && !window.addEventListener; -}; - -/* - * IE compatible logging for developers - */ -var logStr = function logStr(string) { - if (window.console) { - // IE... - window.console.log('SweetAlert: ' + string); - } -}; - -/* - * Set hover, active and focus-states for buttons - * (source: http://www.sitepoint.com/javascript-generate-lighter-darker-color) - */ -var colorLuminance = function colorLuminance(hex, lum) { - // Validate hex string - hex = String(hex).replace(/[^0-9a-f]/gi, ''); - if (hex.length < 6) { - hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2]; - } - lum = lum || 0; - - // Convert to decimal and change luminosity - var rgb = '#'; - var c; - var i; - - for (i = 0; i < 3; i++) { - c = parseInt(hex.substr(i * 2, 2), 16); - c = Math.round(Math.min(Math.max(0, c + c * lum), 255)).toString(16); - rgb += ('00' + c).substr(c.length); - } - - return rgb; -}; - -exports.extend = extend; -exports.hexToRgb = hexToRgb; -exports.isIE8 = isIE8; -exports.logStr = logStr; -exports.colorLuminance = colorLuminance; - -},{}]},{},[1]) -//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["node_modules/browserify/node_modules/browser-pack/_prelude.js","/Users/Tristan/dev/SweetAlert/dev/sweetalert.es6.js","/Users/Tristan/dev/SweetAlert/dev/modules/default-params.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-click.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-dom.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-key.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-swal-dom.js","/Users/Tristan/dev/SweetAlert/dev/modules/injected-html.js","/Users/Tristan/dev/SweetAlert/dev/modules/set-params.js","/Users/Tristan/dev/SweetAlert/dev/modules/utils.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;sJCgBO,sBAAsB;;;;;;2DAWtB,iBAAiB;;;;;;wHAcjB,2BAA2B;;;;uDAIwB,wBAAwB;;6BACxD,sBAAsB;;;;;;6BAItB,0BAA0B;;;;6BAC1B,sBAAsB;;;;;;;;AAMhD,IAAI,qBAAqB,CAAC;AAC1B,IAAI,iBAAiB,CAAC;;;;;;AAOtB,IAAI,UAAU,EAAE,IAAI,CAAC;;qBAEN,UAAU,GAAG,IAAI,GAAG,YAAW;AAC5C,MAAI,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;;AAElC,0IA9DU,QAAQ,CA8DT,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;AAC1C,4GAhCA,UAAU,EAgCE,CAAC;;;;;;;AAOb,WAAS,iBAAiB,CAAC,GAAG,EAAE;AAC9B,QAAI,IAAI,GAAG,cAAc,CAAC;AAC1B,WAAO,AAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,GAAK,2BAAc,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;GACpE;;AAED,MAAI,cAAc,KAAK,SAAS,EAAE;AAChC,iDA3DF,MAAM,CA2DG,0CAA0C,CAAC,CAAC;AACnD,WAAO,KAAK,CAAC;GACd;;AAED,MAAI,MAAM,GAAG,6CAlEb,MAAM,CAkEc,EAAE,6BAAgB,CAAC;;AAEvC,UAAQ,OAAO,cAAc;;;AAG3B,SAAK,QAAQ;AACX,YAAM,CAAC,KAAK,GAAG,cAAc,CAAC;AAC9B,YAAM,CAAC,IAAI,GAAI,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAClC,YAAM,CAAC,IAAI,GAAI,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAClC,YAAM;;AAAA;AAGR,SAAK,QAAQ;AACX,UAAI,cAAc,CAAC,KAAK,KAAK,SAAS,EAAE;AACtC,qDA7EN,MAAM,CA6EO,2BAA2B,CAAC,CAAC;AACpC,eAAO,KAAK,CAAC;OACd;;AAED,YAAM,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;;AAEpC,WAAK,IAAI,UAAU,gCAAmB;AACpC,cAAM,CAAC,UAAU,CAAC,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;OACpD;;;AAGD,YAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,GAAG,SAAS,GAAG,2BAAc,iBAAiB,CAAC;AACjG,YAAM,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;;;AAGlE,YAAM,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;;AAE3C,YAAM;;AAAA,AAER;AACE,mDAjGJ,MAAM,CAiGK,kEAAkE,GAAG,OAAO,cAAc,CAAC,CAAC;AACnG,aAAO,KAAK,CAAC;;AAAA,GAEhB;;AAED,6BAAc,MAAM,CAAC,CAAC;AACtB,4GAxFA,mBAAmB,EAwFE,CAAC;AACtB,4GA3FA,SAAS,CA2FC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;;;AAGxB,MAAI,KAAK,GAAG,0GAlGZ,QAAQ,EAkGc,CAAC;;;;;AAMvB,MAAI,QAAQ,GAAG,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;AAChD,MAAI,YAAY,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AACnG,MAAI,aAAa,GAAG,uBAAC,CAAC;WAAK,yCA/FpB,YAAY,CA+FqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC;GAAA,CAAC;;AAE1D,OAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;AAC7D,SAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;AACjE,UAAI,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;AACpC,cAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;KAC5C;GACF;;;AAGD,4GAnHA,UAAU,EAmHE,CAAC,OAAO,GAAG,aAAa,CAAC;;AAErC,uBAAqB,GAAG,MAAM,CAAC,SAAS,CAAC;;AAEzC,MAAI,UAAU,GAAG,oBAAC,CAAC;WAAK,2BAAc,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC;GAAA,CAAC;AACxD,QAAM,CAAC,SAAS,GAAG,UAAU,CAAC;;AAE9B,QAAM,CAAC,OAAO,GAAG,YAAY;;AAE3B,cAAU,CAAC,YAAY;;;AAGrB,UAAI,iBAAiB,KAAK,SAAS,EAAE;AACnC,yBAAiB,CAAC,KAAK,EAAE,CAAC;AAC1B,yBAAiB,GAAG,SAAS,CAAC;OAC/B;KACF,EAAE,CAAC,CAAC,CAAC;GACP,CAAC;;;AAGF,MAAI,CAAC,aAAa,EAAE,CAAC;CACtB;;;;;;AAQD,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,GAAG,UAAS,UAAU,EAAE;AAC/D,MAAI,CAAC,UAAU,EAAE;AACf,UAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;GAC3C;AACD,MAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;AAClC,UAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;GAClD;;AAED,+CArKA,MAAM,6BAqKgB,UAAU,CAAC,CAAC;CACnC,CAAC;;;;;AAMF,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,YAAW;AACzC,MAAI,KAAK,GAAG,0GAjKZ,QAAQ,EAiKc,CAAC;;AAEvB,0IAxLQ,OAAO,CAwLP,0GAlKR,UAAU,EAkKU,EAAE,CAAC,CAAC,CAAC;AACzB,0IAzLQ,OAAO,CAyLP,KAAK,EAAE,CAAC,CAAC,CAAC;AAClB,0IA/LoB,WAAW,CA+LnB,KAAK,EAAE,gBAAgB,CAAC,CAAC;AACrC,0IAhMU,QAAQ,CAgMT,KAAK,EAAE,gBAAgB,CAAC,CAAC;AAClC,0IAjMoB,WAAW,CAiMnB,KAAK,EAAE,SAAS,CAAC,CAAC;;;;;AAK9B,MAAI,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAC9D,0IAvMoB,WAAW,CAuMnB,YAAY,EAAE,SAAS,CAAC,CAAC;AACrC,0IAxMoB,WAAW,CAwMnB,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC,CAAC;AACxE,0IAzMoB,WAAW,CAyMnB,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC,CAAC;;AAE1E,MAAI,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;AAC1D,0IA5MoB,WAAW,CA4MnB,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAC5C,0IA7MoB,WAAW,CA6MnB,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,CAAC;;AAEpE,MAAI,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAC9D,0IAhNoB,WAAW,CAgNnB,YAAY,EAAE,cAAc,CAAC,CAAC;AAC1C,0IAjNoB,WAAW,CAiNnB,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;AACvE,0IAlNoB,WAAW,CAkNnB,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAC;;;AAGtE,YAAU,CAAC,YAAW;AACpB,QAAI,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAC1D,4IAvNkB,WAAW,CAuNjB,KAAK,EAAE,WAAW,CAAC,CAAC;GACjC,EAAE,GAAG,CAAC,CAAC;;;AAGR,0IA3NoB,WAAW,CA2NnB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;;;AAG7C,QAAM,CAAC,SAAS,GAAG,qBAAqB,CAAC;AACzC,MAAI,MAAM,CAAC,qBAAqB,EAAE;AAChC,UAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;GACtC;AACD,mBAAiB,GAAG,SAAS,CAAC;AAC9B,cAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;;AAE5B,SAAO,IAAI,CAAC;CACb,CAAC;;;;;;AAOF,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,GAAG,UAAS,YAAY,EAAE;AACvE,MAAI,KAAK,GAAG,0GApNZ,QAAQ,EAoNc,CAAC;;AAEvB,MAAI,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;AACxD,0IAjPU,QAAQ,CAiPT,UAAU,EAAE,MAAM,CAAC,CAAC;;AAE7B,MAAI,eAAe,GAAG,KAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AACjE,0IApPU,QAAQ,CAoPT,eAAe,EAAE,MAAM,CAAC,CAAC;;AAElC,iBAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,YAAY,CAAC;;AAE5D,YAAU,CAAC,YAAW;AACpB,cAAU,CAAC,aAAa,EAAE,CAAC;GAC5B,EAAE,CAAC,CAAC,CAAC;;AAEN,OAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;CACtC,CAAC;;;;;AAMF,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,GAAG,UAAS,KAAK,EAAE;;AAElE,MAAI,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE,EAAE;AACjC,WAAO,KAAK,CAAC;GACd;;AAED,MAAI,MAAM,GAAG,0GA/Ob,QAAQ,EA+Oe,CAAC;;AAExB,MAAI,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;AACzD,0IA5QoB,WAAW,CA4QnB,UAAU,EAAE,MAAM,CAAC,CAAC;;AAEhC,MAAI,eAAe,GAAG,MAAM,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAClE,0IA/QoB,WAAW,CA+QnB,eAAe,EAAE,MAAM,CAAC,CAAC;CACtC,CAAC;;;;;AAKF,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,GAAG,UAAS,KAAK,EAAE;AAChE,MAAI,KAAK,GAAG,0GA5PZ,QAAQ,EA4Pc,CAAC;AACvB,MAAI,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AAC3D,MAAI,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;AACzD,gBAAc,CAAC,QAAQ,GAAG,IAAI,CAAC;AAC/B,eAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;CAC/B,CAAC;;;;;AAKF,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,GAAG,UAAS,KAAK,EAAE;AAC9D,MAAI,KAAK,GAAG,0GAvQZ,QAAQ,EAuQc,CAAC;AACvB,MAAI,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AAC3D,MAAI,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;AACzD,gBAAc,CAAC,QAAQ,GAAG,KAAK,CAAC;AAChC,eAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;CAChC,CAAC;;AAEF,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;;;AAGjC,QAAM,CAAC,UAAU,GAAG,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC;CAC9C,MAAM;AACL,+CA5RA,MAAM,CA4RC,kCAAkC,CAAC,CAAC;CAC5C;;;;;;;;;ACtTD,IAAI,aAAa,GAAG;AAClB,OAAK,EAAE,EAAE;AACT,MAAI,EAAE,EAAE;AACR,MAAI,EAAE,IAAI;AACV,mBAAiB,EAAE,KAAK;AACxB,mBAAiB,EAAE,IAAI;AACvB,kBAAgB,EAAE,KAAK;AACvB,gBAAc,EAAE,IAAI;AACpB,eAAa,EAAE,IAAI;AACnB,mBAAiB,EAAE,IAAI;AACvB,oBAAkB,EAAE,SAAS;AAC7B,kBAAgB,EAAE,QAAQ;AAC1B,UAAQ,EAAE,IAAI;AACd,WAAS,EAAE,IAAI;AACf,OAAK,EAAE,IAAI;AACX,aAAW,EAAE,EAAE;AACf,MAAI,EAAE,KAAK;AACX,WAAS,EAAE,IAAI;AACf,gBAAc,EAAE,IAAI;AACpB,WAAS,EAAE,MAAM;AACjB,kBAAgB,EAAE,EAAE;AACpB,YAAU,EAAE,EAAE;AACd,qBAAmB,EAAE,KAAK;CAC3B,CAAC;;qBAEa,aAAa;;;;;;;;;;8BCzBG,SAAS;;wBACf,mBAAmB;;qCACL,cAAc;;;;;AAMrD,IAAI,YAAY,GAAG,sBAAS,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;AAChD,MAAI,CAAC,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;AAC9B,MAAI,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC;;AAEtC,MAAI,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AACjE,MAAI,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;AACvE,MAAI,cAAc,GAAI,uBAZf,QAAQ,CAYgB,KAAK,EAAE,SAAS,CAAC,CAAC;AACjD,MAAI,kBAAkB,GAAI,MAAM,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,CAAC,wBAAwB,CAAC,KAAK,MAAM,AAAC,CAAC;;;;AAI1G,MAAI,WAAW,EAAE,UAAU,EAAE,WAAW,CAAC;AACzC,MAAI,eAAe,IAAI,MAAM,CAAC,kBAAkB,EAAE;AAChD,eAAW,GAAI,MAAM,CAAC,kBAAkB,CAAC;AACzC,cAAU,GAAK,gBAtBV,cAAc,CAsBW,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC;AAClD,eAAW,GAAI,gBAvBV,cAAc,CAuBW,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC;GACnD;;AAED,WAAS,2BAA2B,CAAC,KAAK,EAAE;AAC1C,QAAI,eAAe,IAAI,MAAM,CAAC,kBAAkB,EAAE;AAChD,YAAM,CAAC,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC;KACtC;GACF;;AAED,UAAQ,CAAC,CAAC,IAAI;AACZ,SAAK,WAAW;AACd,iCAA2B,CAAC,UAAU,CAAC,CAAC;AACxC,YAAM;;AAAA,AAER,SAAK,UAAU;AACb,iCAA2B,CAAC,WAAW,CAAC,CAAC;AACzC,YAAM;;AAAA,AAER,SAAK,WAAW;AACd,iCAA2B,CAAC,WAAW,CAAC,CAAC;AACzC,YAAM;;AAAA,AAER,SAAK,SAAS;AACZ,iCAA2B,CAAC,UAAU,CAAC,CAAC;AACxC,YAAM;;AAAA,AAER,SAAK,OAAO;AACV,UAAI,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AAC3D,UAAI,aAAa,GAAI,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;;AAE1D,UAAI,eAAe,EAAE;AACnB,qBAAa,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;OACxC,MAAM;AACL,sBAAc,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;OACzC;AACD,YAAM;;AAAA,AAER,SAAK,OAAO;AACV,UAAI,cAAc,GAAI,KAAK,KAAK,MAAM,AAAC,CAAC;AACxC,UAAI,mBAAmB,GAAG,uBA5Db,YAAY,CA4Dc,KAAK,EAAE,MAAM,CAAC,CAAC;;;AAGtD,UAAI,CAAC,cAAc,IAAI,CAAC,mBAAmB,IAAI,cAAc,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;AAC1F,cAAM;OACP;;AAED,UAAI,eAAe,IAAI,kBAAkB,IAAI,cAAc,EAAE;AAC3D,qBAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;OAC9B,MAAM,IAAI,kBAAkB,IAAI,cAAc,IAAI,eAAe,EAAE;AAClE,oBAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;OAC7B,MAAM,IAAI,uBAvEE,YAAY,CAuED,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE;AACrE,kBAAU,CAAC,KAAK,EAAE,CAAC;OACpB;AACD,YAAM;AAAA,GACT;CACF,CAAC;;;;;AAKF,IAAI,aAAa,GAAG,uBAAS,KAAK,EAAE,MAAM,EAAE;AAC1C,MAAI,aAAa,GAAG,IAAI,CAAC;;AAEzB,MAAI,uBApFG,QAAQ,CAoFF,KAAK,EAAE,YAAY,CAAC,EAAE;AACjC,iBAAa,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;;AAEnD,QAAI,CAAC,aAAa,EAAE;AAClB,mBAAa,GAAG,EAAE,CAAC;KACpB;GACF;;AAED,QAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;;AAEnC,MAAI,MAAM,CAAC,cAAc,EAAE;AACzB,cAAU,CAAC,KAAK,EAAE,CAAC;GACpB;;AAED,MAAI,MAAM,CAAC,mBAAmB,EAAE;AAC9B,cAAU,CAAC,cAAc,EAAE,CAAC;GAC7B;CACF,CAAC;;;;;AAKF,IAAI,YAAY,GAAG,sBAAS,KAAK,EAAE,MAAM,EAAE;;AAEzC,MAAI,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACnE,MAAI,qBAAqB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,WAAW,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC;;AAEpH,MAAI,qBAAqB,EAAE;AACzB,UAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;GAC5B;;AAED,MAAI,MAAM,CAAC,aAAa,EAAE;AACxB,cAAU,CAAC,KAAK,EAAE,CAAC;GACpB;CACF,CAAC;;qBAGa;AACb,cAAY,EAAZ,YAAY;AACZ,eAAa,EAAb,aAAa;AACb,cAAY,EAAZ,YAAY;CACb;;;;;;;;;AC/HD,IAAI,QAAQ,GAAG,kBAAS,IAAI,EAAE,SAAS,EAAE;AACvC,SAAO,IAAI,MAAM,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC;CAC3E,CAAC;;AAEF,IAAI,QAAQ,GAAG,kBAAS,IAAI,EAAE,SAAS,EAAE;AACvC,MAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;AAC9B,QAAI,CAAC,SAAS,IAAI,GAAG,GAAG,SAAS,CAAC;GACnC;CACF,CAAC;;AAEF,IAAI,WAAW,GAAG,qBAAS,IAAI,EAAE,SAAS,EAAE;AAC1C,MAAI,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;AACpE,MAAI,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;AAC7B,WAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE;AACnD,cAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;KACzD;AACD,QAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;GACrD;CACF,CAAC;;AAEF,IAAI,UAAU,GAAG,oBAAS,GAAG,EAAE;AAC7B,MAAI,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AACxC,KAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9C,SAAO,GAAG,CAAC,SAAS,CAAC;CACtB,CAAC;;AAEF,IAAI,KAAK,GAAG,eAAS,IAAI,EAAE;AACzB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC;AACxB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;CAC9B,CAAC;;AAEF,IAAI,IAAI,GAAG,cAAS,KAAK,EAAE;AACzB,MAAI,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;AAC1B,WAAO,KAAK,CAAC,KAAK,CAAC,CAAC;GACrB;AACD,OAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;AACrC,SAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;GACjB;CACF,CAAC;;AAEF,IAAI,KAAK,GAAG,eAAS,IAAI,EAAE;AACzB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC;AACxB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;CAC7B,CAAC;;AAEF,IAAI,IAAI,GAAG,cAAS,KAAK,EAAE;AACzB,MAAI,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;AAC1B,WAAO,KAAK,CAAC,KAAK,CAAC,CAAC;GACrB;AACD,OAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;AACrC,SAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;GACjB;CACF,CAAC;;AAEF,IAAI,YAAY,GAAG,sBAAS,MAAM,EAAE,KAAK,EAAE;AACzC,MAAI,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC;AAC5B,SAAO,IAAI,KAAK,IAAI,EAAE;AACpB,QAAI,IAAI,KAAK,MAAM,EAAE;AACnB,aAAO,IAAI,CAAC;KACb;AACD,QAAI,GAAG,IAAI,CAAC,UAAU,CAAC;GACxB;AACD,SAAO,KAAK,CAAC;CACd,CAAC;;AAEF,IAAI,YAAY,GAAG,sBAAS,IAAI,EAAE;AAChC,MAAI,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC;AAC5B,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;;AAE7B,MAAI,MAAM,GAAG,IAAI,CAAC,YAAY;MAC1B,OAAO,CAAC;AACZ,MAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE;;AAC3C,WAAO,GAAG,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;GAChF,MAAM;AACL,WAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;GAC/C;;AAED,MAAI,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC;AACrB,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;AAC5B,SAAQ,GAAG,GAAG,QAAQ,CAAC,CAAC,MAAM,GAAG,OAAO,CAAA,GAAI,CAAC,CAAC,GAAG,IAAI,CAAE;CACxD,CAAC;;AAEF,IAAI,MAAM,GAAG,gBAAS,IAAI,EAAE,QAAQ,EAAE;AACpC,MAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE;AAC3B,YAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;AAC1B,QAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;AACvB,QAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;AAC7B,QAAI,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;AACvB,QAAI,IAAI;;;;;;;;;;OAAG,YAAW;AACpB,UAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,GAAG,IAAI,CAAA,GAAI,GAAG,CAAC;AACrE,UAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;;AAEnB,UAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE;AAC3B,kBAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;OAC5B;KACF,CAAA,CAAC;AACF,QAAI,EAAE,CAAC;GACR;AACD,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;CAC9B,CAAC;;AAEF,IAAI,OAAO,GAAG,iBAAS,IAAI,EAAE,QAAQ,EAAE;AACrC,UAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;AAC1B,MAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;AACvB,MAAI,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;AACvB,MAAI,IAAI;;;;;;;;;;KAAG,YAAW;AACpB,QAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,GAAG,IAAI,CAAA,GAAI,GAAG,CAAC;AACrE,QAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;;AAEnB,QAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE;AAC3B,gBAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;KAC5B,MAAM;AACL,UAAI,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;KAC7B;GACF,CAAA,CAAC;AACF,MAAI,EAAE,CAAC;CACR,CAAC;;AAEF,IAAI,SAAS,GAAG,mBAAS,IAAI,EAAE;;;AAG7B,MAAI,OAAO,UAAU,KAAK,UAAU,EAAE;;AAEpC,QAAI,IAAI,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE;AACjC,UAAI,EAAE,MAAM;AACZ,aAAO,EAAE,KAAK;AACd,gBAAU,EAAE,IAAI;KACjB,CAAC,CAAC;AACH,QAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;GAC1B,MAAM,IAAK,QAAQ,CAAC,WAAW,EAAG;;AAEjC,QAAI,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;AAC9C,OAAG,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACrC,QAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;GACzB,MAAM,IAAI,QAAQ,CAAC,iBAAiB,EAAE;AACrC,QAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAE;GAC5B,MAAM,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,UAAU,EAAG;AAC9C,QAAI,CAAC,OAAO,EAAE,CAAC;GAChB;CACF,CAAC;;AAEF,IAAI,oBAAoB,GAAG,8BAAS,CAAC,EAAE;;AAErC,MAAI,OAAO,CAAC,CAAC,eAAe,KAAK,UAAU,EAAE;AAC3C,KAAC,CAAC,eAAe,EAAE,CAAC;AACpB,KAAC,CAAC,cAAc,EAAE,CAAC;GACpB,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE;AACtE,UAAM,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;GAClC;CACF,CAAC;;QAGA,QAAQ,GAAR,QAAQ;QAAE,QAAQ,GAAR,QAAQ;QAAE,WAAW,GAAX,WAAW;QAC/B,UAAU,GAAV,UAAU;QACV,KAAK,GAAL,KAAK;QAAE,IAAI,GAAJ,IAAI;QAAE,KAAK,GAAL,KAAK;QAAE,IAAI,GAAJ,IAAI;QACxB,YAAY,GAAZ,YAAY;QACZ,YAAY,GAAZ,YAAY;QACZ,MAAM,GAAN,MAAM;QAAE,OAAO,GAAP,OAAO;QACf,SAAS,GAAT,SAAS;QACT,oBAAoB,GAApB,oBAAoB;;;;;;;;;8CC/J0B,cAAc;;6BAChC,mBAAmB;;AAGjD,IAAI,aAAa,GAAG,uBAAS,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;AACjD,MAAI,CAAC,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;AAC9B,MAAI,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,CAAC;;AAEnC,MAAI,SAAS,GAAO,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AAC1D,MAAI,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;AACzD,MAAI,aAAa,GAAG,KAAK,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;;AAG/D,MAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;;AAE3C,WAAO;GACR;;AAED,MAAI,cAAc,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC;;AAE9C,MAAI,QAAQ,GAAG,CAAC,CAAC,CAAC;AAClB,OAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AAC7C,QAAI,cAAc,KAAK,aAAa,CAAC,CAAC,CAAC,EAAE;AACvC,cAAQ,GAAG,CAAC,CAAC;AACb,YAAM;KACP;GACF;;AAED,MAAI,OAAO,KAAK,CAAC,EAAE;;AAEjB,QAAI,QAAQ,KAAK,CAAC,CAAC,EAAE;;AAEnB,oBAAc,GAAG,SAAS,CAAC;KAC5B,MAAM;;AAEL,UAAI,QAAQ,KAAK,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;AACzC,sBAAc,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;OACnC,MAAM;AACL,sBAAc,GAAG,aAAa,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;OAC9C;KACF;;AAED,oCA1CK,oBAAoB,CA0CJ,CAAC,CAAC,CAAC;AACxB,kBAAc,CAAC,KAAK,EAAE,CAAC;;AAEvB,QAAI,MAAM,CAAC,kBAAkB,EAAE;AAC7B,qBA7CG,aAAa,CA6CF,cAAc,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC;KAC1D;GACF,MAAM;AACL,QAAI,OAAO,KAAK,EAAE,EAAE;AAClB,UAAI,cAAc,CAAC,OAAO,KAAK,OAAO,EAAE;AACtC,sBAAc,GAAG,SAAS,CAAC;AAC3B,iBAAS,CAAC,KAAK,EAAE,CAAC;OACnB;;AAED,UAAI,QAAQ,KAAK,CAAC,CAAC,EAAE;;AAEnB,sBAAc,GAAG,SAAS,CAAC;OAC5B,MAAM;;AAEL,sBAAc,GAAG,SAAS,CAAC;OAC5B;KACF,MAAM,IAAI,OAAO,KAAK,EAAE,IAAI,MAAM,CAAC,cAAc,KAAK,IAAI,EAAE;AAC3D,oBAAc,GAAG,aAAa,CAAC;AAC/B,sCAhEyB,SAAS,CAgExB,cAAc,EAAE,CAAC,CAAC,CAAC;KAC9B,MAAM;;AAEL,oBAAc,GAAG,SAAS,CAAC;KAC5B;GACF;CACF,CAAC;;qBAEa,aAAa;;;;;;;;;;;;wBCxEH,SAAS;;6DACgC,cAAc;;6BACtD,kBAAkB;;;;;;;;4BAQnB,iBAAiB;;;;AAN1C,IAAI,UAAU,GAAK,cAAc,CAAC;AAClC,IAAI,YAAY,GAAG,gBAAgB,CAAC;;AAOpC,IAAI,oBAAoB,GAAG,gCAAW;AACpC,MAAI,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC9C,WAAS,CAAC,SAAS,4BAAe,CAAC;;;AAGnC,SAAO,SAAS,CAAC,UAAU,EAAE;AAC3B,YAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;GACjD;CACF,CAAC;;;;;AAKF,IAAI,QAAQ;;;;;;;;;;GAAG,YAAW;AACxB,MAAI,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;;AAEhD,MAAI,CAAC,MAAM,EAAE;AACX,wBAAoB,EAAE,CAAC;AACvB,UAAM,GAAG,QAAQ,EAAE,CAAC;GACrB;;AAED,SAAO,MAAM,CAAC;CACf,CAAA,CAAC;;;;;AAKF,IAAI,QAAQ,GAAG,oBAAW;AACxB,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;AACxB,MAAI,MAAM,EAAE;AACV,WAAO,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;GACtC;CACF,CAAC;;;;;AAKF,IAAI,UAAU,GAAG,sBAAW;AAC1B,SAAO,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;CAC7C,CAAC;;;;;AAKF,IAAI,aAAa,GAAG,uBAAS,OAAO,EAAE,OAAO,EAAE;AAC7C,MAAI,QAAQ,GAAG,UAzDR,QAAQ,CAyDS,OAAO,CAAC,CAAC;AACjC,SAAO,CAAC,KAAK,CAAC,SAAS,GAAG,eAAe,GAAG,QAAQ,GAAG,6CAA6C,CAAC;CACtG,CAAC;;;;;AAKF,IAAI,SAAS,GAAG,mBAAS,QAAQ,EAAE;AACjC,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;AACxB,iDAjEkC,MAAM,CAiEjC,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;AACzB,iDAlE0C,IAAI,CAkEzC,MAAM,CAAC,CAAC;AACb,iDAnEgD,QAAQ,CAmE/C,MAAM,EAAE,gBAAgB,CAAC,CAAC;AACnC,iDApEO,WAAW,CAoEN,MAAM,EAAE,gBAAgB,CAAC,CAAC;;AAEtC,QAAM,CAAC,qBAAqB,GAAG,QAAQ,CAAC,aAAa,CAAC;AACtD,MAAI,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;AACvD,WAAS,CAAC,KAAK,EAAE,CAAC;;AAElB,YAAU,CAAC,YAAY;AACrB,mDA3E8C,QAAQ,CA2E7C,MAAM,EAAE,SAAS,CAAC,CAAC;GAC7B,EAAE,GAAG,CAAC,CAAC;;AAER,MAAI,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;;AAE9C,MAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,EAAE,EAAE;AACpC,QAAI,aAAa,GAAG,QAAQ,CAAC;AAC7B,UAAM,CAAC,OAAO,GAAG,UAAU,CAAC,YAAW;AACrC,UAAI,kBAAkB,GAAI,CAAC,aAAa,IAAI,IAAI,CAAA,IAAK,MAAM,CAAC,YAAY,CAAC,wBAAwB,CAAC,KAAK,MAAM,AAAC,CAAC;AAC/G,UAAI,kBAAkB,EAAE;AACtB,qBAAa,CAAC,IAAI,CAAC,CAAC;OACrB,MACI;AACH,kBAAU,CAAC,KAAK,EAAE,CAAC;OACpB;KACF,EAAE,KAAK,CAAC,CAAC;GACX;CACF,CAAC;;;;;;AAMF,IAAI,UAAU,GAAG,sBAAW;AAC1B,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;AACxB,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;;AAExB,iDAtGO,WAAW,CAsGN,MAAM,EAAE,YAAY,CAAC,CAAC;AAClC,QAAM,CAAC,KAAK,GAAG,2BAAc,UAAU,CAAC;AACxC,QAAM,CAAC,YAAY,CAAC,MAAM,EAAE,2BAAc,SAAS,CAAC,CAAC;AACrD,QAAM,CAAC,YAAY,CAAC,aAAa,EAAE,2BAAc,gBAAgB,CAAC,CAAC;;AAEnE,iBAAe,EAAE,CAAC;CACnB,CAAC;;AAGF,IAAI,eAAe,GAAG,yBAAS,KAAK,EAAE;;AAEpC,MAAI,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE,EAAE;AACjC,WAAO,KAAK,CAAC;GACd;;AAED,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;;AAExB,MAAI,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;AACzD,iDAxHO,WAAW,CAwHN,UAAU,EAAE,MAAM,CAAC,CAAC;;AAEhC,MAAI,eAAe,GAAG,MAAM,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAClE,iDA3HO,WAAW,CA2HN,eAAe,EAAE,MAAM,CAAC,CAAC;CACtC,CAAC;;;;;AAMF,IAAI,mBAAmB,GAAG,+BAAW;AACnC,MAAI,MAAM,GAAG,QAAQ,EAAE,CAAC;AACxB,QAAM,CAAC,KAAK,CAAC,SAAS,GAAG,+CApIL,YAAY,CAoIM,QAAQ,EAAE,CAAC,CAAC;CACnD,CAAC;;QAIA,oBAAoB,GAApB,oBAAoB;QACpB,QAAQ,GAAR,QAAQ;QACR,UAAU,GAAV,UAAU;QACV,QAAQ,GAAR,QAAQ;QACR,aAAa,GAAb,aAAa;QACb,SAAS,GAAT,SAAS;QACT,UAAU,GAAV,UAAU;QACV,eAAe,GAAf,eAAe;QACf,mBAAmB,GAAnB,mBAAmB;;;;;;;;AClJrB,IAAI,YAAY;;;AAGd;;;6BAG2B;;;kMAQlB;;;6HAMA;;;uCAG8B;;;+NAS9B,4CAEgC;;;4JAQ3B;;;4GAML;;;qNAM8C;;;6IAS9C;;;QAGD,CAAC;;qBAEI,YAAY;;;;;;;;;;qBChEpB,SAAS;;+CAMT,mBAAmB;;8EAMnB,cAAc;;AAhBrB,IAAI,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;;;;;AAsB5E,IAAI,aAAa,GAAG,uBAAS,MAAM,EAAE;AACnC,MAAI,KAAK,GAAG,iCAhBZ,QAAQ,EAgBc,CAAC;;AAEvB,MAAI,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;AACvC,MAAI,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;AACrC,MAAI,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;AACtD,MAAI,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;;;;;AAKxD,QAAM,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,GAAG,gEAnBhD,UAAU,CAmBiD,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;;;;;AAKlG,OAAK,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,gEAxB9C,UAAU,CAwB+C,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACrG,MAAI,MAAM,CAAC,IAAI,EAAE,gEAxBV,IAAI,CAwBW,KAAK,CAAC,CAAC;;;;;AAK7B,MAAI,MAAM,CAAC,WAAW,EAAE;AACtB,oEAhCQ,QAAQ,CAgCP,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;AACpC,SAAK,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;GAC7D,MAAM;;AAEL,QAAI,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAC1D,oEArCkB,WAAW,CAqCjB,KAAK,EAAE,WAAW,CAAC,CAAC;AAChC,SAAK,CAAC,YAAY,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;GAC7C;;;;;AAKD,kEA1CoB,IAAI,CA0CnB,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;;AAEzC,MAAI,MAAM,CAAC,IAAI,IAAI,CAAC,OAxDpB,KAAK,EAwDsB,EAAE;;;AAE3B,UAAI,SAAS,GAAG,KAAK,CAAC;;AAEtB,WAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AAC1C,YAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE;AACjC,mBAAS,GAAG,IAAI,CAAC;AACjB,gBAAM;SACP;OACF;;AAED,UAAI,CAAC,SAAS,EAAE;AACd,cAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;AAC7C;aAAO,KAAK;UAAC;OACd;;AAED,UAAI,cAAc,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AAC7D,UAAI,KAAK,YAAA,CAAC;;AAEV,UAAI,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;AAC9C,aAAK,GAAG,KAAK,CAAC,aAAa,CAAC,WAAW,GAAG,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;AAC/D,wEAjEG,IAAI,CAiEF,KAAK,CAAC,CAAC;OACb;;AAED,UAAI,MAAM,GAAG,iCA3Ef,QAAQ,EA2EiB,CAAC;;;AAGxB,cAAQ,MAAM,CAAC,IAAI;;AAEjB,aAAK,SAAS;AACZ,0EA5EI,QAAQ,CA4EH,KAAK,EAAE,SAAS,CAAC,CAAC;AAC3B,0EA7EI,QAAQ,CA6EH,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC,CAAC;AAC9D,0EA9EI,QAAQ,CA8EH,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAChE,gBAAM;;AAAA,AAER,aAAK,OAAO;AACV,0EAlFI,QAAQ,CAkFH,KAAK,EAAE,kBAAkB,CAAC,CAAC;AACpC,0EAnFI,QAAQ,CAmFH,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,CAAC;AAC5D,gBAAM;;AAAA,AAER,aAAK,SAAS;AACZ,0EAvFI,QAAQ,CAuFH,KAAK,EAAE,cAAc,CAAC,CAAC;AAChC,0EAxFI,QAAQ,CAwFH,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAC7D,0EAzFI,QAAQ,CAyFH,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAC5D,gBAAM;;AAAA,AAER,aAAK,OAAO,CAAC;AACb,aAAK,QAAQ;AACX,gBAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;AAC9C,gBAAM,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;AACjC,gBAAM,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAC5D,0EAjGI,QAAQ,CAiGH,KAAK,EAAE,YAAY,CAAC,CAAC;AAC9B,oBAAU,CAAC,YAAY;AACrB,kBAAM,CAAC,KAAK,EAAE,CAAC;AACf,kBAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;WACxD,EAAE,GAAG,CAAC,CAAC;AACR,gBAAM;AAAA,OACT;;;;;;GACF;;;;;AAKD,MAAI,MAAM,CAAC,QAAQ,EAAE;AACnB,QAAI,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;;AAE5D,eAAW,CAAC,KAAK,CAAC,eAAe,GAAG,MAAM,GAAG,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAC;AACnE,oEA/GK,IAAI,CA+GJ,WAAW,CAAC,CAAC;;AAElB,QAAI,SAAS,GAAG,EAAE,CAAC;AACnB,QAAI,UAAU,GAAG,EAAE,CAAC;;AAEpB,QAAI,MAAM,CAAC,SAAS,EAAE;AACpB,UAAI,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACxD,UAAI,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAC7B,UAAI,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;;AAE9B,UAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,EAAE;AAC3B,cAAM,CAAC,kEAAkE,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;OAC/F,MAAM;AACL,iBAAS,GAAG,QAAQ,CAAC;AACrB,kBAAU,GAAG,SAAS,CAAC;OACxB;KACF;;AAED,eAAW,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,QAAQ,GAAG,SAAS,GAAG,aAAa,GAAG,UAAU,GAAG,IAAI,CAAC,CAAC;GACjI;;;;;AAKD,OAAK,CAAC,YAAY,CAAC,wBAAwB,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACtE,MAAI,MAAM,CAAC,gBAAgB,EAAE;AAC3B,cAAU,CAAC,KAAK,CAAC,OAAO,GAAG,cAAc,CAAC;GAC3C,MAAM;AACL,oEA3IkB,IAAI,CA2IjB,UAAU,CAAC,CAAC;GAClB;;;;;AAKD,OAAK,CAAC,YAAY,CAAC,yBAAyB,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACxE,MAAI,MAAM,CAAC,iBAAiB,EAAE;AAC5B,eAAW,CAAC,KAAK,CAAC,OAAO,GAAG,cAAc,CAAC;GAC5C,MAAM;AACL,oEArJkB,IAAI,CAqJjB,WAAW,CAAC,CAAC;GACnB;;;;;AAKD,MAAI,MAAM,CAAC,gBAAgB,EAAE;AAC3B,cAAU,CAAC,SAAS,GAAG,gEA7JzB,UAAU,CA6J0B,MAAM,CAAC,gBAAgB,CAAC,CAAC;GAC5D;AACD,MAAI,MAAM,CAAC,iBAAiB,EAAE;AAC5B,eAAW,CAAC,SAAS,GAAG,gEAhK1B,UAAU,CAgK2B,MAAM,CAAC,iBAAiB,CAAC,CAAC;GAC9D;;;;;AAKD,MAAI,MAAM,CAAC,kBAAkB,EAAE;;AAE7B,eAAW,CAAC,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,kBAAkB,CAAC;;;AAG9D,eAAW,CAAC,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,yBAAyB,CAAC;AACrE,eAAW,CAAC,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC,yBAAyB,CAAC;;;AAGtE,qCApLF,aAAa,CAoLG,WAAW,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC;GACvD;;;;;AAKD,OAAK,CAAC,YAAY,CAAC,0BAA0B,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;;;;;AAKzE,MAAI,eAAe,GAAG,MAAM,CAAC,YAAY,GAAG,IAAI,GAAG,KAAK,CAAC;AACzD,OAAK,CAAC,YAAY,CAAC,wBAAwB,EAAE,eAAe,CAAC,CAAC;;;;;AAK9D,MAAI,CAAC,MAAM,CAAC,SAAS,EAAE;AACrB,SAAK,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;GAC9C,MAAM,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,EAAE;AAC/C,SAAK,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;GACxD,MAAM;AACL,SAAK,CAAC,YAAY,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;GAC7C;;;;;AAKD,OAAK,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAChD,CAAC;;qBAEa,aAAa;;;;;;;;;;;;ACzN5B,IAAI,MAAM,GAAG,gBAAS,CAAC,EAAE,CAAC,EAAE;AAC1B,OAAK,IAAI,GAAG,IAAI,CAAC,EAAE;AACjB,QAAI,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;AACzB,OAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;KACjB;GACF;AACD,SAAO,CAAC,CAAC;CACV,CAAC;;;;;AAKF,IAAI,QAAQ,GAAG,kBAAS,GAAG,EAAE;AAC3B,MAAI,MAAM,GAAG,2CAA2C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACnE,SAAO,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC;CAClH,CAAC;;;;;AAKF,IAAI,KAAK,GAAG,iBAAW;AACrB,SAAQ,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAE;CACzD,CAAC;;;;;AAKF,IAAI,MAAM,GAAG,gBAAS,MAAM,EAAE;AAC5B,MAAI,MAAM,CAAC,OAAO,EAAE;;AAElB,UAAM,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC,CAAC;GAC7C;CACF,CAAC;;;;;;AAMF,IAAI,cAAc,GAAG,wBAAS,GAAG,EAAE,GAAG,EAAE;;AAEtC,KAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC7C,MAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;AAClB,OAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;GAC3D;AACD,KAAG,GAAG,GAAG,IAAI,CAAC,CAAC;;;AAGf,MAAI,GAAG,GAAG,GAAG,CAAC;AACd,MAAI,CAAC,CAAC;AACN,MAAI,CAAC,CAAC;;AAEN,OAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;AACtB,KAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACvC,KAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACrE,OAAG,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA,CAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;GACpC;;AAED,SAAO,GAAG,CAAC;CACZ,CAAC;;QAIA,MAAM,GAAN,MAAM;QACN,QAAQ,GAAR,QAAQ;QACR,KAAK,GAAL,KAAK;QACL,MAAM,GAAN,MAAM;QACN,cAAc,GAAd,cAAc","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","// SweetAlert\n// 2014-2015 (c) - Tristan Edwards\n// github.com/t4t5/sweetalert\n\n/*\n * jQuery-like functions for manipulating the DOM\n */\nimport {\n  hasClass, addClass, removeClass,\n  escapeHtml,\n  _show, show, _hide, hide,\n  isDescendant,\n  getTopMargin,\n  fadeIn, fadeOut,\n  fireClick,\n  stopEventPropagation\n} from './modules/handle-dom';\n\n/*\n * Handy utilities\n */\nimport {\n  extend,\n  hexToRgb,\n  isIE8,\n  logStr,\n  colorLuminance\n} from './modules/utils';\n\n/*\n *  Handle sweetAlert's DOM elements\n */\nimport {\n  sweetAlertInitialize,\n  getModal,\n  getOverlay,\n  getInput,\n  setFocusStyle,\n  openModal,\n  resetInput,\n  fixVerticalPosition\n} from './modules/handle-swal-dom';\n\n\n// Handle button events and keyboard events\nimport { handleButton, handleConfirm, handleCancel } from './modules/handle-click';\nimport handleKeyDown from './modules/handle-key';\n\n\n// Default values\nimport defaultParams from './modules/default-params';\nimport setParameters from './modules/set-params';\n\n/*\n * Remember state in cases where opening and handling a modal will fiddle with it.\n * (We also use window.previousActiveElement as a global variable)\n */\nvar previousWindowKeyDown;\nvar lastFocusedButton;\n\n\n/*\n * Global sweetAlert function\n * (this is what the user calls)\n */\nvar sweetAlert, swal;\n\nexport default sweetAlert = swal = function() {\n  var customizations = arguments[0];\n\n  addClass(document.body, 'stop-scrolling');\n  resetInput();\n\n  /*\n   * Use argument if defined or default value from params object otherwise.\n   * Supports the case where a default value is boolean true and should be\n   * overridden by a corresponding explicit argument which is boolean false.\n   */\n  function argumentOrDefault(key) {\n    var args = customizations;\n    return (args[key] === undefined) ?  defaultParams[key] : args[key];\n  }\n\n  if (customizations === undefined) {\n    logStr('SweetAlert expects at least 1 attribute!');\n    return false;\n  }\n\n  var params = extend({}, defaultParams);\n\n  switch (typeof customizations) {\n\n    // Ex: swal(\"Hello\", \"Just testing\", \"info\");\n    case 'string':\n      params.title = customizations;\n      params.text  = arguments[1] || '';\n      params.type  = arguments[2] || '';\n      break;\n\n    // Ex: swal({ title:\"Hello\", text: \"Just testing\", type: \"info\" });\n    case 'object':\n      if (customizations.title === undefined) {\n        logStr('Missing \"title\" argument!');\n        return false;\n      }\n\n      params.title = customizations.title;\n\n      for (let customName in defaultParams) {\n        params[customName] = argumentOrDefault(customName);\n      }\n\n      // Show \"Confirm\" instead of \"OK\" if cancel button is visible\n      params.confirmButtonText = params.showCancelButton ? 'Confirm' : defaultParams.confirmButtonText;\n      params.confirmButtonText = argumentOrDefault('confirmButtonText');\n\n      // Callback function when clicking on \"OK\"/\"Cancel\"\n      params.doneFunction = arguments[1] || null;\n\n      break;\n\n    default:\n      logStr('Unexpected type of argument! Expected \"string\" or \"object\", got ' + typeof customizations);\n      return false;\n\n  }\n\n  setParameters(params);\n  fixVerticalPosition();\n  openModal(arguments[1]);\n\n  // Modal interactions\n  var modal = getModal();\n\n\n  /*\n   * Make sure all modal buttons respond to all events\n   */\n  var $buttons = modal.querySelectorAll('button');\n  var buttonEvents = ['onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'onfocus'];\n  var onButtonEvent = (e) => handleButton(e, params, modal);\n\n  for (let btnIndex = 0; btnIndex < $buttons.length; btnIndex++) {\n    for (let evtIndex = 0; evtIndex < buttonEvents.length; evtIndex++) {\n      let btnEvt = buttonEvents[evtIndex];\n      $buttons[btnIndex][btnEvt] = onButtonEvent;\n    }\n  }\n\n  // Clicking outside the modal dismisses it (if allowed by user)\n  getOverlay().onclick = onButtonEvent;\n\n  previousWindowKeyDown = window.onkeydown;\n\n  var onKeyEvent = (e) => handleKeyDown(e, params, modal);\n  window.onkeydown = onKeyEvent;\n\n  window.onfocus = function () {\n    // When the user has focused away and focused back from the whole window.\n    setTimeout(function () {\n      // Put in a timeout to jump out of the event sequence.\n      // Calling focus() in the event sequence confuses things.\n      if (lastFocusedButton !== undefined) {\n        lastFocusedButton.focus();\n        lastFocusedButton = undefined;\n      }\n    }, 0);\n  };\n  \n  // Show alert with enabled buttons always\n  swal.enableButtons();\n};\n\n\n\n/*\n * Set default params for each popup\n * @param {Object} userParams\n */\nsweetAlert.setDefaults = swal.setDefaults = function(userParams) {\n  if (!userParams) {\n    throw new Error('userParams is required');\n  }\n  if (typeof userParams !== 'object') {\n    throw new Error('userParams has to be a object');\n  }\n\n  extend(defaultParams, userParams);\n};\n\n\n/*\n * Animation when closing modal\n */\nsweetAlert.close = swal.close = function() {\n  var modal = getModal();\n\n  fadeOut(getOverlay(), 5);\n  fadeOut(modal, 5);\n  removeClass(modal, 'showSweetAlert');\n  addClass(modal, 'hideSweetAlert');\n  removeClass(modal, 'visible');\n\n  /*\n   * Reset icon animations\n   */\n  var $successIcon = modal.querySelector('.sa-icon.sa-success');\n  removeClass($successIcon, 'animate');\n  removeClass($successIcon.querySelector('.sa-tip'), 'animateSuccessTip');\n  removeClass($successIcon.querySelector('.sa-long'), 'animateSuccessLong');\n\n  var $errorIcon = modal.querySelector('.sa-icon.sa-error');\n  removeClass($errorIcon, 'animateErrorIcon');\n  removeClass($errorIcon.querySelector('.sa-x-mark'), 'animateXMark');\n\n  var $warningIcon = modal.querySelector('.sa-icon.sa-warning');\n  removeClass($warningIcon, 'pulseWarning');\n  removeClass($warningIcon.querySelector('.sa-body'), 'pulseWarningIns');\n  removeClass($warningIcon.querySelector('.sa-dot'), 'pulseWarningIns');\n\n  // Reset custom class (delay so that UI changes aren't visible)\n  setTimeout(function() {\n    var customClass = modal.getAttribute('data-custom-class');\n    removeClass(modal, customClass);\n  }, 300);\n\n  // Make page scrollable again\n  removeClass(document.body, 'stop-scrolling');\n\n  // Reset the page to its previous state\n  window.onkeydown = previousWindowKeyDown;\n  if (window.previousActiveElement) {\n    window.previousActiveElement.focus();\n  }\n  lastFocusedButton = undefined;\n  clearTimeout(modal.timeout);\n\n  return true;\n};\n\n\n/*\n * Validation of the input field is done by user\n * If something is wrong => call showInputError with errorMessage\n */\nsweetAlert.showInputError = swal.showInputError = function(errorMessage) {\n  var modal = getModal();\n\n  var $errorIcon = modal.querySelector('.sa-input-error');\n  addClass($errorIcon, 'show');\n\n  var $errorContainer = modal.querySelector('.sa-error-container');\n  addClass($errorContainer, 'show');\n\n  $errorContainer.querySelector('p').innerHTML = errorMessage;\n\n  setTimeout(function() {\n    sweetAlert.enableButtons();\n  }, 1);\n\n  modal.querySelector('input').focus();\n};\n\n\n/*\n * Reset input error DOM elements\n */\nsweetAlert.resetInputError = swal.resetInputError = function(event) {\n  // If press enter => ignore\n  if (event && event.keyCode === 13) {\n    return false;\n  }\n\n  var $modal = getModal();\n\n  var $errorIcon = $modal.querySelector('.sa-input-error');\n  removeClass($errorIcon, 'show');\n\n  var $errorContainer = $modal.querySelector('.sa-error-container');\n  removeClass($errorContainer, 'show');\n};\n\n/*\n * Disable confirm and cancel buttons\n */\nsweetAlert.disableButtons = swal.disableButtons = function(event) {\n  var modal = getModal();\n  var $confirmButton = modal.querySelector('button.confirm');\n  var $cancelButton = modal.querySelector('button.cancel');\n  $confirmButton.disabled = true;\n  $cancelButton.disabled = true;\n};\n\n/*\n * Enable confirm and cancel buttons\n */\nsweetAlert.enableButtons = swal.enableButtons = function(event) {\n  var modal = getModal();\n  var $confirmButton = modal.querySelector('button.confirm');\n  var $cancelButton = modal.querySelector('button.cancel');\n  $confirmButton.disabled = false;\n  $cancelButton.disabled = false;\n};\n\nif (typeof window !== 'undefined') {\n  // The 'handle-click' module requires\n  // that 'sweetAlert' was set as global.\n  window.sweetAlert = window.swal = sweetAlert;\n} else {\n  logStr('SweetAlert is a frontend module!');\n}\n","var defaultParams = {\n  title: '',\n  text: '',\n  type: null,\n  allowOutsideClick: false,\n  showConfirmButton: true,\n  showCancelButton: false,\n  closeOnConfirm: true,\n  closeOnCancel: true,\n  confirmButtonText: 'OK',\n  confirmButtonColor: '#8CD4F5',\n  cancelButtonText: 'Cancel',\n  imageUrl: null,\n  imageSize: null,\n  timer: null,\n  customClass: '',\n  html: false,\n  animation: true,\n  allowEscapeKey: true,\n  inputType: 'text',\n  inputPlaceholder: '',\n  inputValue: '',\n  showLoaderOnConfirm: false\n};\n\nexport default defaultParams;\n","import { colorLuminance } from './utils';\nimport { getModal } from './handle-swal-dom';\nimport { hasClass, isDescendant } from './handle-dom';\n\n\n/*\n * User clicked on \"Confirm\"/\"OK\" or \"Cancel\"\n */\nvar handleButton = function(event, params, modal) {\n  var e = event || window.event;\n  var target = e.target || e.srcElement;\n\n  var targetedConfirm = target.className.indexOf('confirm') !== -1;\n  var targetedOverlay = target.className.indexOf('sweet-overlay') !== -1;\n  var modalIsVisible  = hasClass(modal, 'visible');\n  var doneFunctionExists = (params.doneFunction && modal.getAttribute('data-has-done-function') === 'true');\n\n  // Since the user can change the background-color of the confirm button programmatically,\n  // we must calculate what the color should be on hover/active\n  var normalColor, hoverColor, activeColor;\n  if (targetedConfirm && params.confirmButtonColor) {\n    normalColor  = params.confirmButtonColor;\n    hoverColor   = colorLuminance(normalColor, -0.04);\n    activeColor  = colorLuminance(normalColor, -0.14);\n  }\n\n  function shouldSetConfirmButtonColor(color) {\n    if (targetedConfirm && params.confirmButtonColor) {\n      target.style.backgroundColor = color;\n    }\n  }\n\n  switch (e.type) {\n    case 'mouseover':\n      shouldSetConfirmButtonColor(hoverColor);\n      break;\n\n    case 'mouseout':\n      shouldSetConfirmButtonColor(normalColor);\n      break;\n\n    case 'mousedown':\n      shouldSetConfirmButtonColor(activeColor);\n      break;\n\n    case 'mouseup':\n      shouldSetConfirmButtonColor(hoverColor);\n      break;\n\n    case 'focus':\n      let $confirmButton = modal.querySelector('button.confirm');\n      let $cancelButton  = modal.querySelector('button.cancel');\n\n      if (targetedConfirm) {\n        $cancelButton.style.boxShadow = 'none';\n      } else {\n        $confirmButton.style.boxShadow = 'none';\n      }\n      break;\n\n    case 'click':\n      let clickedOnModal = (modal === target);\n      let clickedOnModalChild = isDescendant(modal, target);\n\n      // Ignore click outside if allowOutsideClick is false\n      if (!clickedOnModal && !clickedOnModalChild && modalIsVisible && !params.allowOutsideClick) {\n        break;\n      }\n\n      if (targetedConfirm && doneFunctionExists && modalIsVisible) {\n        handleConfirm(modal, params);\n      } else if (doneFunctionExists && modalIsVisible || targetedOverlay) {\n        handleCancel(modal, params);\n      } else if (isDescendant(modal, target) && target.tagName === 'BUTTON') {\n        sweetAlert.close();\n      }\n      break;\n  }\n};\n\n/*\n *  User clicked on \"Confirm\"/\"OK\"\n */\nvar handleConfirm = function(modal, params) {\n  var callbackValue = true;\n\n  if (hasClass(modal, 'show-input')) {\n    callbackValue = modal.querySelector('input').value;\n\n    if (!callbackValue) {\n      callbackValue = '';\n    }\n  }\n\n  params.doneFunction(callbackValue);\n\n  if (params.closeOnConfirm) {\n    sweetAlert.close();\n  }\n  // Disable cancel and confirm button if the parameter is true\n  if (params.showLoaderOnConfirm) {\n    sweetAlert.disableButtons();\n  }\n};\n\n/*\n *  User clicked on \"Cancel\"\n */\nvar handleCancel = function(modal, params) {\n  // Check if callback function expects a parameter (to track cancel actions)\n  var functionAsStr = String(params.doneFunction).replace(/\\s/g, '');\n  var functionHandlesCancel = functionAsStr.substring(0, 9) === 'function(' && functionAsStr.substring(9, 10) !== ')';\n\n  if (functionHandlesCancel) {\n    params.doneFunction(false);\n  }\n\n  if (params.closeOnCancel) {\n    sweetAlert.close();\n  }\n};\n\n\nexport default {\n  handleButton,\n  handleConfirm,\n  handleCancel\n};\n","var hasClass = function(elem, className) {\n  return new RegExp(' ' + className + ' ').test(' ' + elem.className + ' ');\n};\n\nvar addClass = function(elem, className) {\n  if (!hasClass(elem, className)) {\n    elem.className += ' ' + className;\n  }\n};\n\nvar removeClass = function(elem, className) {\n  var newClass = ' ' + elem.className.replace(/[\\t\\r\\n]/g, ' ') + ' ';\n  if (hasClass(elem, className)) {\n    while (newClass.indexOf(' ' + className + ' ') >= 0) {\n      newClass = newClass.replace(' ' + className + ' ', ' ');\n    }\n    elem.className = newClass.replace(/^\\s+|\\s+$/g, '');\n  }\n};\n\nvar escapeHtml = function(str) {\n  var div = document.createElement('div');\n  div.appendChild(document.createTextNode(str));\n  return div.innerHTML;\n};\n\nvar _show = function(elem) {\n  elem.style.opacity = '';\n  elem.style.display = 'block';\n};\n\nvar show = function(elems) {\n  if (elems && !elems.length) {\n    return _show(elems);\n  }\n  for (var i = 0; i < elems.length; ++i) {\n    _show(elems[i]);\n  }\n};\n\nvar _hide = function(elem) {\n  elem.style.opacity = '';\n  elem.style.display = 'none';\n};\n\nvar hide = function(elems) {\n  if (elems && !elems.length) {\n    return _hide(elems);\n  }\n  for (var i = 0; i < elems.length; ++i) {\n    _hide(elems[i]);\n  }\n};\n\nvar isDescendant = function(parent, child) {\n  var node = child.parentNode;\n  while (node !== null) {\n    if (node === parent) {\n      return true;\n    }\n    node = node.parentNode;\n  }\n  return false;\n};\n\nvar getTopMargin = function(elem) {\n  elem.style.left = '-9999px';\n  elem.style.display = 'block';\n\n  var height = elem.clientHeight,\n      padding;\n  if (typeof getComputedStyle !== \"undefined\") { // IE 8\n    padding = parseInt(getComputedStyle(elem).getPropertyValue('padding-top'), 10);\n  } else {\n    padding = parseInt(elem.currentStyle.padding);\n  }\n\n  elem.style.left = '';\n  elem.style.display = 'none';\n  return ('-' + parseInt((height + padding) / 2) + 'px');\n};\n\nvar fadeIn = function(elem, interval) {\n  if (+elem.style.opacity < 1) {\n    interval = interval || 16;\n    elem.style.opacity = 0;\n    elem.style.display = 'block';\n    var last = +new Date();\n    var tick = function() {\n      elem.style.opacity = +elem.style.opacity + (new Date() - last) / 100;\n      last = +new Date();\n\n      if (+elem.style.opacity < 1) {\n        setTimeout(tick, interval);\n      }\n    };\n    tick();\n  }\n  elem.style.display = 'block'; //fallback IE8\n};\n\nvar fadeOut = function(elem, interval) {\n  interval = interval || 16;\n  elem.style.opacity = 1;\n  var last = +new Date();\n  var tick = function() {\n    elem.style.opacity = +elem.style.opacity - (new Date() - last) / 100;\n    last = +new Date();\n\n    if (+elem.style.opacity > 0) {\n      setTimeout(tick, interval);\n    } else {\n      elem.style.display = 'none';\n    }\n  };\n  tick();\n};\n\nvar fireClick = function(node) {\n  // Taken from http://www.nonobtrusive.com/2011/11/29/programatically-fire-crossbrowser-click-event-with-javascript/\n  // Then fixed for today's Chrome browser.\n  if (typeof MouseEvent === 'function') {\n    // Up-to-date approach\n    var mevt = new MouseEvent('click', {\n      view: window,\n      bubbles: false,\n      cancelable: true\n    });\n    node.dispatchEvent(mevt);\n  } else if ( document.createEvent ) {\n    // Fallback\n    var evt = document.createEvent('MouseEvents');\n    evt.initEvent('click', false, false);\n    node.dispatchEvent(evt);\n  } else if (document.createEventObject) {\n    node.fireEvent('onclick') ;\n  } else if (typeof node.onclick === 'function' ) {\n    node.onclick();\n  }\n};\n\nvar stopEventPropagation = function(e) {\n  // In particular, make sure the space bar doesn't scroll the main window.\n  if (typeof e.stopPropagation === 'function') {\n    e.stopPropagation();\n    e.preventDefault();\n  } else if (window.event && window.event.hasOwnProperty('cancelBubble')) {\n    window.event.cancelBubble = true;\n  }\n};\n\nexport { \n  hasClass, addClass, removeClass, \n  escapeHtml, \n  _show, show, _hide, hide, \n  isDescendant, \n  getTopMargin,\n  fadeIn, fadeOut,\n  fireClick,\n  stopEventPropagation\n};\n","import { stopEventPropagation, fireClick } from './handle-dom';\nimport { setFocusStyle } from './handle-swal-dom';\n\n\nvar handleKeyDown = function(event, params, modal) {\n  var e = event || window.event;\n  var keyCode = e.keyCode || e.which;\n\n  var $okButton     = modal.querySelector('button.confirm');\n  var $cancelButton = modal.querySelector('button.cancel');\n  var $modalButtons = modal.querySelectorAll('button[tabindex]');\n\n\n  if ([9, 13, 32, 27].indexOf(keyCode) === -1) {\n    // Don't do work on keys we don't care about.\n    return;\n  }\n\n  var $targetElement = e.target || e.srcElement;\n\n  var btnIndex = -1; // Find the button - note, this is a nodelist, not an array.\n  for (var i = 0; i < $modalButtons.length; i++) {\n    if ($targetElement === $modalButtons[i]) {\n      btnIndex = i;\n      break;\n    }\n  }\n\n  if (keyCode === 9) {\n    // TAB\n    if (btnIndex === -1) {\n      // No button focused. Jump to the confirm button.\n      $targetElement = $okButton;\n    } else {\n      // Cycle to the next button\n      if (btnIndex === $modalButtons.length - 1) {\n        $targetElement = $modalButtons[0];\n      } else {\n        $targetElement = $modalButtons[btnIndex + 1];\n      }\n    }\n\n    stopEventPropagation(e);\n    $targetElement.focus();\n\n    if (params.confirmButtonColor) {\n      setFocusStyle($targetElement, params.confirmButtonColor);\n    }\n  } else {\n    if (keyCode === 13) {\n      if ($targetElement.tagName === 'INPUT') {\n        $targetElement = $okButton;\n        $okButton.focus();\n      }\n\n      if (btnIndex === -1) {\n        // ENTER/SPACE clicked outside of a button.\n        $targetElement = $okButton;\n      } else {\n        // Do nothing - let the browser handle it.\n        $targetElement = undefined;\n      }\n    } else if (keyCode === 27 && params.allowEscapeKey === true) {\n      $targetElement = $cancelButton;\n      fireClick($targetElement, e);\n    } else {\n      // Fallback - let the browser handle it.\n      $targetElement = undefined;\n    }\n  }\n};\n\nexport default handleKeyDown;\n","import { hexToRgb } from './utils';\nimport { removeClass, getTopMargin, fadeIn, show, addClass } from './handle-dom';\nimport defaultParams from './default-params';\n\nvar modalClass   = '.sweet-alert';\nvar overlayClass = '.sweet-overlay';\n\n/*\n * Add modal + overlay to DOM\n */\nimport injectedHTML from './injected-html';\n\nvar sweetAlertInitialize = function() {\n  var sweetWrap = document.createElement('div');\n  sweetWrap.innerHTML = injectedHTML;\n\n  // Append elements to body\n  while (sweetWrap.firstChild) {\n    document.body.appendChild(sweetWrap.firstChild);\n  }\n};\n\n/*\n * Get DOM element of modal\n */\nvar getModal = function() {\n  var $modal = document.querySelector(modalClass);\n\n  if (!$modal) {\n    sweetAlertInitialize();\n    $modal = getModal();\n  }\n\n  return $modal;\n};\n\n/*\n * Get DOM element of input (in modal)\n */\nvar getInput = function() {\n  var $modal = getModal();\n  if ($modal) {\n    return $modal.querySelector('input');\n  }\n};\n\n/*\n * Get DOM element of overlay\n */\nvar getOverlay = function() {\n  return document.querySelector(overlayClass);\n};\n\n/*\n * Add box-shadow style to button (depending on its chosen bg-color)\n */\nvar setFocusStyle = function($button, bgColor) {\n  var rgbColor = hexToRgb(bgColor);\n  $button.style.boxShadow = '0 0 2px rgba(' + rgbColor + ', 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)';\n};\n\n/*\n * Animation when opening modal\n */\nvar openModal = function(callback) {\n  var $modal = getModal();\n  fadeIn(getOverlay(), 10);\n  show($modal);\n  addClass($modal, 'showSweetAlert');\n  removeClass($modal, 'hideSweetAlert');\n\n  window.previousActiveElement = document.activeElement;\n  var $okButton = $modal.querySelector('button.confirm');\n  $okButton.focus();\n\n  setTimeout(function () {\n    addClass($modal, 'visible');\n  }, 500);\n\n  var timer = $modal.getAttribute('data-timer');\n\n  if (timer !== 'null' && timer !== '') {\n    var timerCallback = callback;\n    $modal.timeout = setTimeout(function() {\n      var doneFunctionExists = ((timerCallback || null) && $modal.getAttribute('data-has-done-function') === 'true');\n      if (doneFunctionExists) { \n        timerCallback(null);\n      }\n      else {\n        sweetAlert.close();\n      }\n    }, timer);\n  }\n};\n\n/*\n * Reset the styling of the input\n * (for example if errors have been shown)\n */\nvar resetInput = function() {\n  var $modal = getModal();\n  var $input = getInput();\n\n  removeClass($modal, 'show-input');\n  $input.value = defaultParams.inputValue;\n  $input.setAttribute('type', defaultParams.inputType);\n  $input.setAttribute('placeholder', defaultParams.inputPlaceholder);\n\n  resetInputError();\n};\n\n\nvar resetInputError = function(event) {\n  // If press enter => ignore\n  if (event && event.keyCode === 13) {\n    return false;\n  }\n\n  var $modal = getModal();\n\n  var $errorIcon = $modal.querySelector('.sa-input-error');\n  removeClass($errorIcon, 'show');\n\n  var $errorContainer = $modal.querySelector('.sa-error-container');\n  removeClass($errorContainer, 'show');\n};\n\n\n/*\n * Set \"margin-top\"-property on modal based on its computed height\n */\nvar fixVerticalPosition = function() {\n  var $modal = getModal();\n  $modal.style.marginTop = getTopMargin(getModal());\n};\n\n\nexport { \n  sweetAlertInitialize,\n  getModal,\n  getOverlay,\n  getInput,\n  setFocusStyle,\n  openModal,\n  resetInput,\n  resetInputError,\n  fixVerticalPosition\n};\n","var injectedHTML = \n\n  // Dark overlay\n  `<div class=\"sweet-overlay\" tabIndex=\"-1\"></div>` +\n\n  // Modal\n  `<div class=\"sweet-alert\">` +\n\n    // Error icon\n    `<div class=\"sa-icon sa-error\">\n      <span class=\"sa-x-mark\">\n        <span class=\"sa-line sa-left\"></span>\n        <span class=\"sa-line sa-right\"></span>\n      </span>\n    </div>` +\n\n    // Warning icon\n    `<div class=\"sa-icon sa-warning\">\n      <span class=\"sa-body\"></span>\n      <span class=\"sa-dot\"></span>\n    </div>` +\n\n    // Info icon\n    `<div class=\"sa-icon sa-info\"></div>` +\n\n    // Success icon\n    `<div class=\"sa-icon sa-success\">\n      <span class=\"sa-line sa-tip\"></span>\n      <span class=\"sa-line sa-long\"></span>\n\n      <div class=\"sa-placeholder\"></div>\n      <div class=\"sa-fix\"></div>\n    </div>` +\n\n    `<div class=\"sa-icon sa-custom\"></div>` +\n\n    // Title, text and input\n    `<h2>Title</h2>\n    <p>Text</p>\n    <fieldset>\n      <input type=\"text\" tabIndex=\"3\" />\n      <div class=\"sa-input-error\"></div>\n    </fieldset>` +\n\n    // Input errors\n    `<div class=\"sa-error-container\">\n      <div class=\"icon\">!</div>\n      <p>Not valid!</p>\n    </div>` +\n\n    // Cancel and confirm buttons\n    `<div class=\"sa-button-container\">\n      <button class=\"cancel\" tabIndex=\"2\">Cancel</button>\n      <div class=\"sa-confirm-button-container\">\n        <button class=\"confirm\" tabIndex=\"1\">OK</button>` + \n\n        // Loading animation\n        `<div class=\"la-ball-fall\">\n          <div></div>\n          <div></div>\n          <div></div>\n        </div>\n      </div>\n    </div>` +\n\n  // End of modal\n  `</div>`;\n\nexport default injectedHTML;\n","var alertTypes = ['error', 'warning', 'info', 'success', 'input', 'prompt'];\n\nimport {\n  isIE8\n} from './utils';\n\nimport {\n  getModal,\n  getInput,\n  setFocusStyle\n} from './handle-swal-dom';\n\nimport {\n  hasClass, addClass, removeClass,\n  escapeHtml,\n  _show, show, _hide, hide\n} from './handle-dom';\n\n\n/*\n * Set type, text and actions on modal\n */\nvar setParameters = function(params) {\n  var modal = getModal();\n\n  var $title = modal.querySelector('h2');\n  var $text = modal.querySelector('p');\n  var $cancelBtn = modal.querySelector('button.cancel');\n  var $confirmBtn = modal.querySelector('button.confirm');\n\n  /*\n   * Title\n   */\n  $title.innerHTML = params.html ? params.title : escapeHtml(params.title).split('\\n').join('<br>');\n\n  /*\n   * Text\n   */\n  $text.innerHTML = params.html ? params.text : escapeHtml(params.text || '').split('\\n').join('<br>');\n  if (params.text) show($text);\n\n  /*\n   * Custom class\n   */\n  if (params.customClass) {\n    addClass(modal, params.customClass);\n    modal.setAttribute('data-custom-class', params.customClass);\n  } else {\n    // Find previously set classes and remove them\n    let customClass = modal.getAttribute('data-custom-class');\n    removeClass(modal, customClass);\n    modal.setAttribute('data-custom-class', '');\n  }\n\n  /*\n   * Icon\n   */\n  hide(modal.querySelectorAll('.sa-icon'));\n\n  if (params.type && !isIE8()) {\n\n    let validType = false;\n\n    for (let i = 0; i < alertTypes.length; i++) {\n      if (params.type === alertTypes[i]) {\n        validType = true;\n        break;\n      }\n    }\n\n    if (!validType) {\n      logStr('Unknown alert type: ' + params.type);\n      return false;\n    }\n\n    let typesWithIcons = ['success', 'error', 'warning', 'info'];\n    let $icon;\n\n    if (typesWithIcons.indexOf(params.type) !== -1) {\n      $icon = modal.querySelector('.sa-icon.' + 'sa-' + params.type);\n      show($icon);\n    }\n\n    let $input = getInput();\n\n    // Animate icon\n    switch (params.type) {\n\n      case 'success':\n        addClass($icon, 'animate');\n        addClass($icon.querySelector('.sa-tip'), 'animateSuccessTip');\n        addClass($icon.querySelector('.sa-long'), 'animateSuccessLong');\n        break;\n\n      case 'error':\n        addClass($icon, 'animateErrorIcon');\n        addClass($icon.querySelector('.sa-x-mark'), 'animateXMark');\n        break;\n\n      case 'warning':\n        addClass($icon, 'pulseWarning');\n        addClass($icon.querySelector('.sa-body'), 'pulseWarningIns');\n        addClass($icon.querySelector('.sa-dot'), 'pulseWarningIns');\n        break;\n\n      case 'input':\n      case 'prompt':\n        $input.setAttribute('type', params.inputType);\n        $input.value = params.inputValue;\n        $input.setAttribute('placeholder', params.inputPlaceholder);\n        addClass(modal, 'show-input');\n        setTimeout(function () {\n          $input.focus();\n          $input.addEventListener('keyup', swal.resetInputError);\n        }, 400);\n        break;\n    }\n  }\n\n  /*\n   * Custom image\n   */\n  if (params.imageUrl) {\n    let $customIcon = modal.querySelector('.sa-icon.sa-custom');\n\n    $customIcon.style.backgroundImage = 'url(' + params.imageUrl + ')';\n    show($customIcon);\n\n    let _imgWidth = 80;\n    let _imgHeight = 80;\n\n    if (params.imageSize) {\n      let dimensions = params.imageSize.toString().split('x');\n      let imgWidth = dimensions[0];\n      let imgHeight = dimensions[1];\n\n      if (!imgWidth || !imgHeight) {\n        logStr('Parameter imageSize expects value with format WIDTHxHEIGHT, got ' + params.imageSize);\n      } else {\n        _imgWidth = imgWidth;\n        _imgHeight = imgHeight;\n      }\n    }\n\n    $customIcon.setAttribute('style', $customIcon.getAttribute('style') + 'width:' + _imgWidth + 'px; height:' + _imgHeight + 'px');\n  }\n\n  /*\n   * Show cancel button?\n   */\n  modal.setAttribute('data-has-cancel-button', params.showCancelButton);\n  if (params.showCancelButton) {\n    $cancelBtn.style.display = 'inline-block';\n  } else {\n    hide($cancelBtn);\n  }\n\n  /*\n   * Show confirm button?\n   */\n  modal.setAttribute('data-has-confirm-button', params.showConfirmButton);\n  if (params.showConfirmButton) {\n    $confirmBtn.style.display = 'inline-block';\n  } else {\n    hide($confirmBtn);\n  }\n\n  /*\n   * Custom text on cancel/confirm buttons\n   */\n  if (params.cancelButtonText) {\n    $cancelBtn.innerHTML = escapeHtml(params.cancelButtonText);\n  }\n  if (params.confirmButtonText) {\n    $confirmBtn.innerHTML = escapeHtml(params.confirmButtonText);\n  }\n\n  /*\n   * Custom color on confirm button\n   */\n  if (params.confirmButtonColor) {\n    // Set confirm button to selected background color\n    $confirmBtn.style.backgroundColor = params.confirmButtonColor;\n\n    // Set the confirm button color to the loading ring\n    $confirmBtn.style.borderLeftColor = params.confirmLoadingButtonColor;\n    $confirmBtn.style.borderRightColor = params.confirmLoadingButtonColor;\n\n    // Set box-shadow to default focused button\n    setFocusStyle($confirmBtn, params.confirmButtonColor);\n  }\n\n  /*\n   * Allow outside click\n   */\n  modal.setAttribute('data-allow-outside-click', params.allowOutsideClick);\n\n  /*\n   * Callback function\n   */\n  var hasDoneFunction = params.doneFunction ? true : false;\n  modal.setAttribute('data-has-done-function', hasDoneFunction);\n\n  /*\n   * Animation\n   */\n  if (!params.animation) {\n    modal.setAttribute('data-animation', 'none');\n  } else if (typeof params.animation === 'string') {\n    modal.setAttribute('data-animation', params.animation); // Custom animation\n  } else {\n    modal.setAttribute('data-animation', 'pop');\n  }\n\n  /*\n   * Timer\n   */\n  modal.setAttribute('data-timer', params.timer);\n};\n\nexport default setParameters;\n","/*\n * Allow user to pass their own params\n */\nvar extend = function(a, b) {\n  for (var key in b) {\n    if (b.hasOwnProperty(key)) {\n      a[key] = b[key];\n    }\n  }\n  return a;\n};\n\n/*\n * Convert HEX codes to RGB values (#000000 -> rgb(0,0,0))\n */\nvar hexToRgb = function(hex) {\n  var result = /^#?([a-f\\d]{2})([a-f\\d]{2})([a-f\\d]{2})$/i.exec(hex);\n  return result ? parseInt(result[1], 16) + ', ' + parseInt(result[2], 16) + ', ' + parseInt(result[3], 16) : null;\n};\n\n/*\n * Check if the user is using Internet Explorer 8 (for fallbacks)\n */\nvar isIE8 = function() {\n  return (window.attachEvent && !window.addEventListener);\n};\n\n/*\n * IE compatible logging for developers\n */\nvar logStr = function(string) {\n  if (window.console) {\n    // IE...\n    window.console.log('SweetAlert: ' + string);\n  }\n};\n\n/*\n * Set hover, active and focus-states for buttons \n * (source: http://www.sitepoint.com/javascript-generate-lighter-darker-color)\n */\nvar colorLuminance = function(hex, lum) {\n  // Validate hex string\n  hex = String(hex).replace(/[^0-9a-f]/gi, '');\n  if (hex.length < 6) {\n    hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];\n  }\n  lum = lum || 0;\n\n  // Convert to decimal and change luminosity\n  var rgb = '#';\n  var c;\n  var i;\n\n  for (i = 0; i < 3; i++) {\n    c = parseInt(hex.substr(i * 2, 2), 16);\n    c = Math.round(Math.min(Math.max(0, c + c * lum), 255)).toString(16);\n    rgb += ('00' + c).substr(c.length);\n  }\n\n  return rgb;\n};\n\n\nexport {\n  extend,\n  hexToRgb,\n  isIE8,\n  logStr,\n  colorLuminance\n};\n"]} - - - /* - * Use SweetAlert with RequireJS - */ - - if (typeof define === 'function' && define.amd) { - define(function () { - return sweetAlert; - }); - } else if (typeof module !== 'undefined' && module.exports) { - module.exports = sweetAlert; - } - -})(window, document); \ No newline at end of file diff --git a/static/js/websockets.js b/static/js/websockets.js deleted file mode 100644 index 3c6950e..0000000 --- a/static/js/websockets.js +++ /dev/null @@ -1,99 +0,0 @@ -var selfDestruct = false; - -$(document).ready(function() { - var isTyping = false; - var typingTimer; //timer identifier - var updateInterval; - var uhohTimer; - var doneTypingInterval = 500; //time in ms, 5 second for example - var pollToGetNewestCopyInterval = 30000; - //on keyup, start the countdown - $('#emit').keyup(function() { - clearTimeout(typingTimer); - clearInterval(updateInterval); - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-remove"); - typingTimer = setTimeout(doneTyping, doneTypingInterval); - }); - - //on keydown, clear the countdown - $('#emit').keydown(function() { - clearTimeout(typingTimer); - clearInterval(updateInterval); - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-remove"); - document.title = '✗ ' + title_name; - }); - - //user is "finished typing," do something - function doneTyping() { - payload = JSON.stringify({ TextData: currentText(), Title: title_name, UpdateServer: true, UpdateClient: false }) - send(payload) - uhohTimer = setTimeout(uhoh, 30000); - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-open"); - console.log("Done typing") - updateInterval = setInterval(updateText, pollToGetNewestCopyInterval); - document.title = "✓ " + title_name; - if (currentText().indexOf("self-destruct\n") > -1 || currentText().indexOf("\nself-destruct") > -1) { - if (selfDestruct == false) { - selfDestruct = true; - swal({ title: "Info", text: "This page is primed to self-destruct.", timer: 1000, showConfirmButton: true }); - } - } else { - if (selfDestruct == true) { - selfDestruct = false; - swal({ title: "Info", text: "This page is no longer primed to self-destruct.", timer: 1000, showConfirmButton: true }); - } - } - } - - function uhoh() { - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-remove"); - setInterval(location.reload(), 1000); - } - - function updateText() { - console.log("Getting server's latest copy") - payload = JSON.stringify({ TextData: currentText(), Title: title_name, UpdateServer: false, UpdateClient: true }) - send(payload) - clearTimeout(uhohTimer); - } - - // websockets - url = socketType + '://'+external_ip+'/ws'; - c = new WebSocket(url); - - send = function(data){ - - console.log("Sending: " + data) - c.send(data) - } - - c.onmessage = function(msg){ - console.log(msg) - data = JSON.parse(msg.data); - if (data.UpdateClient == true) { - console.log("Updating...") - $('#emit_data').val(data.TextData) - document.title = " " + title_name; - } - console.log((data.TextData == "saved")) - console.log(data.TextData) - if (data.TextData == "saved") { - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-saved"); - clearTimeout(uhohTimer); - } - console.log(data) - } - - c.onopen = function(){ - // updateText(); - updateInterval = setInterval(updateText, pollToGetNewestCopyInterval); - } - - - $('.postselfdestruct').click(function(event) { - event.preventDefault(); - $('#emit_data').val("self-destruct\n\n"+currentText() + "\n\n"); - doneTyping(); - }); - -}); diff --git a/static/js/xml.js b/static/js/xml.js deleted file mode 100644 index f987a3a..0000000 --- a/static/js/xml.js +++ /dev/null @@ -1,394 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -var htmlConfig = { - autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true, - 'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true, - 'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true, - 'track': true, 'wbr': true, 'menuitem': true}, - implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true, - 'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true, - 'th': true, 'tr': true}, - contextGrabbers: { - 'dd': {'dd': true, 'dt': true}, - 'dt': {'dd': true, 'dt': true}, - 'li': {'li': true}, - 'option': {'option': true, 'optgroup': true}, - 'optgroup': {'optgroup': true}, - 'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true, - 'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true, - 'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true, - 'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true, - 'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true}, - 'rp': {'rp': true, 'rt': true}, - 'rt': {'rp': true, 'rt': true}, - 'tbody': {'tbody': true, 'tfoot': true}, - 'td': {'td': true, 'th': true}, - 'tfoot': {'tbody': true}, - 'th': {'td': true, 'th': true}, - 'thead': {'tbody': true, 'tfoot': true}, - 'tr': {'tr': true} - }, - doNotIndent: {"pre": true}, - allowUnquoted: true, - allowMissing: true, - caseFold: true -} - -var xmlConfig = { - autoSelfClosers: {}, - implicitlyClosed: {}, - contextGrabbers: {}, - doNotIndent: {}, - allowUnquoted: false, - allowMissing: false, - caseFold: false -} - -CodeMirror.defineMode("xml", function(editorConf, config_) { - var indentUnit = editorConf.indentUnit - var config = {} - var defaults = config_.htmlMode ? htmlConfig : xmlConfig - for (var prop in defaults) config[prop] = defaults[prop] - for (var prop in config_) config[prop] = config_[prop] - - // Return variables for tokenizers - var type, setStyle; - - function inText(stream, state) { - function chain(parser) { - state.tokenize = parser; - return parser(stream, state); - } - - var ch = stream.next(); - if (ch == "<") { - if (stream.eat("!")) { - if (stream.eat("[")) { - if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>")); - else return null; - } else if (stream.match("--")) { - return chain(inBlock("comment", "-->")); - } else if (stream.match("DOCTYPE", true, true)) { - stream.eatWhile(/[\w\._\-]/); - return chain(doctype(1)); - } else { - return null; - } - } else if (stream.eat("?")) { - stream.eatWhile(/[\w\._\-]/); - state.tokenize = inBlock("meta", "?>"); - return "meta"; - } else { - type = stream.eat("/") ? "closeTag" : "openTag"; - state.tokenize = inTag; - return "tag bracket"; - } - } else if (ch == "&") { - var ok; - if (stream.eat("#")) { - if (stream.eat("x")) { - ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";"); - } else { - ok = stream.eatWhile(/[\d]/) && stream.eat(";"); - } - } else { - ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";"); - } - return ok ? "atom" : "error"; - } else { - stream.eatWhile(/[^&<]/); - return null; - } - } - inText.isInText = true; - - function inTag(stream, state) { - var ch = stream.next(); - if (ch == ">" || (ch == "/" && stream.eat(">"))) { - state.tokenize = inText; - type = ch == ">" ? "endTag" : "selfcloseTag"; - return "tag bracket"; - } else if (ch == "=") { - type = "equals"; - return null; - } else if (ch == "<") { - state.tokenize = inText; - state.state = baseState; - state.tagName = state.tagStart = null; - var next = state.tokenize(stream, state); - return next ? next + " tag error" : "tag error"; - } else if (/[\'\"]/.test(ch)) { - state.tokenize = inAttribute(ch); - state.stringStartCol = stream.column(); - return state.tokenize(stream, state); - } else { - stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/); - return "word"; - } - } - - function inAttribute(quote) { - var closure = function(stream, state) { - while (!stream.eol()) { - if (stream.next() == quote) { - state.tokenize = inTag; - break; - } - } - return "string"; - }; - closure.isInAttribute = true; - return closure; - } - - function inBlock(style, terminator) { - return function(stream, state) { - while (!stream.eol()) { - if (stream.match(terminator)) { - state.tokenize = inText; - break; - } - stream.next(); - } - return style; - }; - } - function doctype(depth) { - return function(stream, state) { - var ch; - while ((ch = stream.next()) != null) { - if (ch == "<") { - state.tokenize = doctype(depth + 1); - return state.tokenize(stream, state); - } else if (ch == ">") { - if (depth == 1) { - state.tokenize = inText; - break; - } else { - state.tokenize = doctype(depth - 1); - return state.tokenize(stream, state); - } - } - } - return "meta"; - }; - } - - function Context(state, tagName, startOfLine) { - this.prev = state.context; - this.tagName = tagName; - this.indent = state.indented; - this.startOfLine = startOfLine; - if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent)) - this.noIndent = true; - } - function popContext(state) { - if (state.context) state.context = state.context.prev; - } - function maybePopContext(state, nextTagName) { - var parentTagName; - while (true) { - if (!state.context) { - return; - } - parentTagName = state.context.tagName; - if (!config.contextGrabbers.hasOwnProperty(parentTagName) || - !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) { - return; - } - popContext(state); - } - } - - function baseState(type, stream, state) { - if (type == "openTag") { - state.tagStart = stream.column(); - return tagNameState; - } else if (type == "closeTag") { - return closeTagNameState; - } else { - return baseState; - } - } - function tagNameState(type, stream, state) { - if (type == "word") { - state.tagName = stream.current(); - setStyle = "tag"; - return attrState; - } else { - setStyle = "error"; - return tagNameState; - } - } - function closeTagNameState(type, stream, state) { - if (type == "word") { - var tagName = stream.current(); - if (state.context && state.context.tagName != tagName && - config.implicitlyClosed.hasOwnProperty(state.context.tagName)) - popContext(state); - if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) { - setStyle = "tag"; - return closeState; - } else { - setStyle = "tag error"; - return closeStateErr; - } - } else { - setStyle = "error"; - return closeStateErr; - } - } - - function closeState(type, _stream, state) { - if (type != "endTag") { - setStyle = "error"; - return closeState; - } - popContext(state); - return baseState; - } - function closeStateErr(type, stream, state) { - setStyle = "error"; - return closeState(type, stream, state); - } - - function attrState(type, _stream, state) { - if (type == "word") { - setStyle = "attribute"; - return attrEqState; - } else if (type == "endTag" || type == "selfcloseTag") { - var tagName = state.tagName, tagStart = state.tagStart; - state.tagName = state.tagStart = null; - if (type == "selfcloseTag" || - config.autoSelfClosers.hasOwnProperty(tagName)) { - maybePopContext(state, tagName); - } else { - maybePopContext(state, tagName); - state.context = new Context(state, tagName, tagStart == state.indented); - } - return baseState; - } - setStyle = "error"; - return attrState; - } - function attrEqState(type, stream, state) { - if (type == "equals") return attrValueState; - if (!config.allowMissing) setStyle = "error"; - return attrState(type, stream, state); - } - function attrValueState(type, stream, state) { - if (type == "string") return attrContinuedState; - if (type == "word" && config.allowUnquoted) {setStyle = "string"; return attrState;} - setStyle = "error"; - return attrState(type, stream, state); - } - function attrContinuedState(type, stream, state) { - if (type == "string") return attrContinuedState; - return attrState(type, stream, state); - } - - return { - startState: function(baseIndent) { - var state = {tokenize: inText, - state: baseState, - indented: baseIndent || 0, - tagName: null, tagStart: null, - context: null} - if (baseIndent != null) state.baseIndent = baseIndent - return state - }, - - token: function(stream, state) { - if (!state.tagName && stream.sol()) - state.indented = stream.indentation(); - - if (stream.eatSpace()) return null; - type = null; - var style = state.tokenize(stream, state); - if ((style || type) && style != "comment") { - setStyle = null; - state.state = state.state(type || style, stream, state); - if (setStyle) - style = setStyle == "error" ? style + " error" : setStyle; - } - return style; - }, - - indent: function(state, textAfter, fullLine) { - var context = state.context; - // Indent multi-line strings (e.g. css). - if (state.tokenize.isInAttribute) { - if (state.tagStart == state.indented) - return state.stringStartCol + 1; - else - return state.indented + indentUnit; - } - if (context && context.noIndent) return CodeMirror.Pass; - if (state.tokenize != inTag && state.tokenize != inText) - return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0; - // Indent the starts of attribute names. - if (state.tagName) { - if (config.multilineTagIndentPastTag !== false) - return state.tagStart + state.tagName.length + 2; - else - return state.tagStart + indentUnit * (config.multilineTagIndentFactor || 1); - } - if (config.alignCDATA && /$/, - blockCommentStart: "", - - configuration: config.htmlMode ? "html" : "xml", - helperType: config.htmlMode ? "html" : "xml", - - skipAttribute: function(state) { - if (state.state == attrValueState) - state.state = attrState - } - }; -}); - -CodeMirror.defineMIME("text/xml", "xml"); -CodeMirror.defineMIME("application/xml", "xml"); -if (!CodeMirror.mimeModes.hasOwnProperty("text/html")) - CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true}); - -}); diff --git a/static/text/adjectives b/static/text/adjectives deleted file mode 100644 index 56f9661..0000000 --- a/static/text/adjectives +++ /dev/null @@ -1,16027 +0,0 @@ -abducent -adducent -nascent -emergent -dissilient -parturient -dying -moribund -last -abridged -cut -potted -unabridged -absolute -direct -implicit -infinite -living -relative -relational -absorbent -absorbefacient -assimilating -hygroscopic -receptive -spongy -thirsty -nonabsorbent -repellent -adsorbent -chemisorptive -nonadsorbent -absorbable -adsorbable -abstemious -abstinent -ascetic -gluttonous -crapulous -crapulent -edacious -greedy -hoggish -overgreedy -abstract -conceptional -conceptual -ideal -ideological -concrete -objective -real -abundant -abounding -ample -copious -easy -exuberant -thick -long -overabundant -plentiful -rampant -rank -superabundant -teeming -torrential -verdant -scarce -rare -tight -abused -battered -unabused -acceptable -bankable -unexceptionable -unobjectionable -unacceptable -exceptionable -accessible -approachable -handy -inaccessible -outback -pathless -unapproachable -accommodating -complaisant -unaccommodating -disobliging -accurate -close -surgical -straight -true -veracious -inaccurate -away -faulty -unfaithful -wide -accustomed -unaccustomed -new -unused -acidic -acid -alkaline -alkalescent -basic -saltlike -amphoteric -acidophilic -acknowledged -accepted -assumptive -declarable -given -putative -unacknowledged -unappreciated -unavowed -unconfessed -unrecognized -acquisitive -accumulative -avaricious -possessive -plundering -predaceous -rapacious -sordid -unacquisitive -acropetal -basipetal -active -about -acrobatic -agile -hot -hyperactive -sporty -inactive -abeyant -hypoactive -inert -sedentary -active -activated -inactive -off -retired -active -brisk -bustling -busy -open -springy -inactive -dark -dead -dull -idle -strikebound -active -progressive -inactive -flat -indolent -latent -quiescent -active -activist -proactive -passive -resistless -active -eruptive -dormant -quiescent -extinct -dead -active -alive -active -stative -active -passive -active -activated -counteractive -inactive -quiescent -active -quiet -actual -effective -potential -latent -acute -subacute -chronic -degenerative -virulent -deadly -avirulent -adaptive -accommodative -adaptational -adjustive -maladaptive -dysfunctional -maladjustive -addicted -alcoholic -dependent -unaddicted -clean -addictive -nonaddictive -additive -accumulative -addable -extra -complemental -incremental -intercalary -summational -supplementary -subtractive -ablative -reductive -addressed -unaddressed -adequate -competent -inadequate -deficient -incapable -adhesive -adherent -agglutinate -bondable -coherent -cohesive -gluey -gooey -gummed -pitchy -sticky -nonadhesive -nonglutinous -nonresinous -ungummed -adjective -substantive -adoptable -unadoptable -adorned -beady -bedaubed -bespectacled -brocaded -buttony -carbuncled -champleve -clinquant -crested -crested -crested -crocketed -feathery -frilled -fringed -inflamed -inlaid -inwrought -tessellated -mounted -paneled -studded -tapestried -tasseled -tufted -unadorned -plain -untufted -cholinergic -anticholinergic -adroit -clean -clever -coordinated -deft -handy -maladroit -bumbling -inept -uncoordinated -unmechanical -advantageous -beneficial -plus -discriminatory -disadvantageous -minus -adventurous -audacious -sporting -swaggering -unadventurous -safe -advisable -inadvisable -considered -aerobic -aerobiotic -oxidative -anaerobic -aerobic -anaerobic -aesthetic -artistic -cosmetic -painterly -sensuous -inaesthetic -inartistic -affected -smitten -subject -taken -unaffected -immune -unimpressed -uninfluenced -affected -agonistic -artificial -constrained -elocutionary -mannered -plummy -unaffected -lifelike -unmannered -unselfconscious -unstilted -affirmative -assentient -negative -dissentient -acceptive -accepting -rejective -dismissive -repudiative -agoraphobic -alarmed -algophobic -apprehensive -hangdog -claustrophobic -fearful -frightened -horrified -hunted -hydrophobic -mysophobic -panicky -numb -shitless -triskaidekaphobic -unnerved -xenophobic -unafraid -unapprehensive -unblinking -unfrightened -aggressive -battleful -competitive -hostile -obstreperous -predatory -pugnacious -scrappy -truculent -unaggressive -agitated -aroused -distraught -jolted -feverish -frantic -hysterical -psychedelic -unagitated -agitated -churning -churning -jolted -rippled -seething -stirred -unagitated -nonturbulent -unstirred -agreeable -disagreeable -annoying -harsh -unsweet -alert -fly -lidless -unalert -algorithmic -recursive -heuristic -alienable -appropriable -assignable -inalienable -absolute -nontransferable -alive -liveborn -viable -vital -dead -asleep -assassinated -bloodless -breathless -cold -d.o.a. -deathlike -defunct -doomed -executed -fallen -late -lifeless -murdered -nonviable -slain -stillborn -apocrine -eccrine -artesian -subartesian -live -living -dead -extinct -lifeless -alphabetic -abecedarian -alphabetized -analphabetic -altricial -precocial -altruistic -egoistic -ambiguous -enigmatic -multivalent -polysemous -uncertain -unambiguous -monosemous -ambitious -pushful -aspirant -compulsive -manque -overambitious -unambitious -shiftless -ametropic -emmetropic -ample -full -generous -wide -meager -bare -exiguous -hardscrabble -measly -anabolic -catabolic -anaclinal -cataclinal -anastigmatic -astigmatic -anticlinal -synclinal -anadromous -catadromous -diadromous -anabatic -katabatic -anal -oral -analogue -digital -analytic -synthetic -analytic -isolating -synthetic -agglutinative -analytic -synthetic -inflectional -derivational -apocarpous -syncarpous -angry -aggravated -angered -black -choleric -huffy -indignant -irate -livid -smoldering -wrathful -unangry -resentful -acrimonious -rancorous -unresentful -unbitter -sentient -sensate -insentient -unfeeling -animate -inanimate -nonconscious -animated -enlivened -reanimated -unanimated -lifeless -wan -enlivened -unenlivened -animate -inanimate -anonymous -nameless -onymous -binomial -pseudonymous -antemortem -postmortem -antecedent -anterior -anticipatory -preexistent -subsequent -attendant -later -antrorse -retrorse -decurved -aquatic -marine -semiaquatic -subaqueous -terrestrial -onshore -overland -amphibious -amphibiotic -preceding -above -foregoing -introductory -precedent -premedical -preparatory -previous -succeeding -ensuing -following -following -postmortem -precedented -unprecedented -new -prehensile -nonprehensile -prenatal -perinatal -postnatal -preprandial -postprandial -prewar -postwar -retrograde -anterograde -antemeridian -postmeridian -anterior -frontal -frontal -prefrontal -posterior -back -caudal -retral -dorsal -ventral -dorsoventral -appealable -unappealable -appendaged -unappendaged -appetizing -unappetizing -approachable -accessible -unapproachable -offish -appropriate -befitting -pat -proper -inappropriate -unbefitting -improper -due -callable -collect -collectible -delinquent -receivable -repayable -undue -due -undue -apropos -apposite -malapropos -inapposite -apteral -amphiprostylar -prostyle -peripteral -monopteral -peristylar -arbitrable -nonarbitrable -columned -amphistylar -columnar -columniform -colonnaded -pillared -noncolumned -astylar -unpillared -arboreal -nonarboreal -arenaceous -argillaceous -armed -equipped -militarized -unarmed -barehanded -clean -defenseless -weaponless -armored -bulletproof -scaled -unarmored -armed -barbed -bristlelike -brushlike -thistlelike -clawed -unarmed -thornless -armed -armlike -brachiate -armless -armored -scaly -unarmored -scaleless -artful -crafty -cute -designing -deep -elusive -manipulative -pawky -artless -careless -articulate -eloquent -inarticulate -aphasic -aphonic -dumb -dumb -incoherent -mute -speechless -unarticulated -speaking -tongued -nonspeaking -articulated -jointed -unarticulated -unjointed -ashamed -discredited -embarrassed -guilty -shamefaced -unashamed -audacious -shameless -unabashed -assertive -cocky -emphatic -unassertive -nonassertive -reticent -associative -associable -nonassociative -attached -bespoken -intended -involved -unattached -unengaged -affixed -appendant -basifixed -glued -mounted -unaffixed -sessile -pedunculate -sessile -vagile -attached -detached -freestanding -semidetached -stuck -cragfast -unstuck -attachable -bindable -detachable -clastic -wary -shy -unwary -gullible -unguarded -attentive -captive -advertent -observant -oversolicitous -solicitous -inattentive -absent -distracted -dreamy -drowsy -forgetful -attractive -bewitching -charismatic -cunning -dinky -engaging -fetching -glossy -hypnotic -irresistible -personable -photogenic -prepossessing -winsome -unattractive -homely -subfusc -unprepossessing -attractive -repulsive -appealing -attractive -unappealing -unattractive -attributable -ascribable -credited -traceable -unattributable -attributive -predicative -pregnant -big -nonpregnant -audible -clunky -sonic -sounding -inaudible -breathed -infrasonic -silent -silent -supersonic -unheard -sonic -subsonic -supersonic -auspicious -bright -fortunate -inauspicious -unpromising -propitious -golden -gracious -unpropitious -ill -thunderous -authorized -accredited -approved -canonized -empowered -unauthorized -unaccredited -constitutional -unconstitutional -autochthonous -allochthonous -autoecious -heteroecious -autogenous -heterogenous -automatic -autoloading -automated -semiautomatic -smart -manual -available -accessible -acquirable -addressable -easy -forthcoming -gettable -lendable -visible -open -purchasable -ready -unavailable -inaccessible -awake -astir -awakened -insomniac -unsleeping -waking -asleep -dormant -drowsy -hypnoid -sleepy -slumberous -unawakened -astringent -styptic -nonastringent -aware -alert -conscious -sensible -unaware -oblivious -unconscious -unsuspecting -witting -unwitting -alarming -appalling -atrocious -awful -baleful -bloodcurdling -chilling -creepy -formidable -ghastly -hairy -petrifying -stupefying -terrific -unalarming -anemophilous -entomophilous -reassuring -assuasive -assuring -comforting -unreassuring -back -backmost -rear -front -advance -foremost -frontal -leading -directing -guiding -following -pursuing -backed -hardbacked -razorback -backless -backward -backswept -cacuminal -converse -inverse -rearward -receding -reflexive -regardant -retracted -retral -retroflex -returning -forward -guardant -headfirst -forward -reverse -backward -bashful -forward -brash -bumptious -overfamiliar -fresh -assumptive -balconied -unbalconied -barreled -unbarreled -beaked -beaklike -billed -duckbill -rostrate -beakless -bedded -bedless -beneficed -unbeneficed -stratified -foliate -laminar -layered -sheetlike -unstratified -ferned -braky -fernlike -fernless -grassy -grasslike -rushlike -sedgy -grassless -gusseted -ungusseted -hairless -bald -balding -beardless -depilatory -depilous -glabrescent -glabrous -nonhairy -tonsured -hairy -canescent -comate -downy -floccose -furlike -furred -fuzzed -hispid -lanate -pappose -pilous -tomentose -wiry -wooly -awned -bearded -awnless -bearing -nonbearing -beautiful -beauteous -bonny -dishy -exquisite -glorious -gorgeous -lovely -picturesque -pretty -pulchritudinous -ravishing -scenic -stunning -ugly -disfigured -fugly -grotesque -hideous -scrofulous -unlovely -unsightly -bellied -bellyless -banded -unbanded -belted -banded -beltlike -unbelted -beneficent -benefic -maleficent -baleful -malefic -malicious -despiteful -leering -malevolent -bitchy -poisonous -venomed -vixenish -unmalicious -benign -kindly -malign -cancerous -best -champion -first -optimum -primo -superfine -unexcelled -unsurpassable -worst -bottom -last -pessimal -better -amended -finer -improved -worse -worsened -better -fitter -worse -bettering -ameliorating -amendatory -corrective -remedial -worsening -bicameral -unicameral -bidirectional -biface -duplex -unidirectional -simplex -unifacial -faced -featured -visaged -faceless -anonymous -bibbed -bibless -unilateral -multilateral -bilateral -bipartite -joint -multipartite -quadrilateral -quadripartite -tetramerous -trilateral -tripartite -bimodal -unimodal -binaural -stereophonic -monaural -mono -binucleate -mononuclear -trinucleate -bipedal -quadrupedal -black -colored -negro -negroid -white -Caucasian -blond -fair -flaxen -nordic -redheaded -brunet -adust -bronzed -brown -dark -grizzled -nutbrown -blemished -acned -blebbed -blotchy -flyblown -marred -pocked -unblemished -stainless -bloody -bloodstained -bloodsucking -bloodthirsty -crimson -homicidal -gory -internecine -bloodless -nonviolent -bold -audacious -daredevil -emboldened -foolhardy -heroic -nervy -overreaching -overvaliant -timid -bashful -coy -fearful -intimidated -mousy -bound -chained -fettered -furled -pinioned -tethered -trussed -wired -unbound -unchained -untethered -laced -unlaced -tied -knotted -untied -tangled -afoul -enmeshed -entangled -knotty -matted -rootbound -thrown -untangled -disentangled -bound -brassbound -cased -paperback -unbound -looseleaf -bordered -boxed -deckled -edged -fringed -lined -seagirt -unbordered -lotic -lentic -proletarian -propertyless -bourgeois -bourgeois -quality -propertied -u -tweedy -wellborn -brachycephalic -dolichocephalic -brave -desperate -gallant -game -lionhearted -stalwart -undaunted -valiant -cowardly -caitiff -chicken -craven -dastard -faint -funky -poltroon -pusillanimous -gutsy -gutless -nursed -breathing -breathless -asphyxiating -smothering -blown -crystalline -crystallized -microcrystalline -polycrystalline -noncrystalline -amorphous -landed -landless -light -ablaze -autofluorescent -bioluminescent -bright -candescent -floodlit -fluorescent -illuminated -incandescent -lamplit -livid -luminescent -phosphorescent -sunlit -white -dark -Acheronian -aphotic -black -caliginous -Cimmerian -crepuscular -darkened -darkening -darkling -darkling -dim -dusky -glooming -lightless -semidark -tenebrous -shaded -murky -shady -unshaded -unshadowed -shaded -hatched -unshaded -moonlit -moonless -bridgeable -unbridgeable -bright -agleam -aglow -aglitter -beady -beaming -blazing -brilliant -ardent -glimmery -glistening -iridescent -lurid -noctilucent -satiny -shimmery -silver -twinkling -dull -flat -lackluster -soft -dimmed -undimmed -prejudiced -homophobic -jaundiced -loaded -racist -sexist -unprejudiced -broad -catholic -dogmatic -illiberal -opinionated -petty -reconstructed -unreconstructed -broken -unbroken -broken -unbroken -broken -dashed -fitful -halting -unbroken -solid -uninterrupted -brotherly -sisterly -exergonic -endergonic -fraternal -identical -buried -belowground -unburied -busy -drudging -engaged -overbusy -idle -faineant -lackadaisical -leisured -unengaged -bony -bone -boned -bonelike -boneless -boned -buttoned -botonee -unbuttoned -capitalistic -bourgeois -competitive -individualistic -socialistic -collective -collectivist -cacophonous -cackly -croaky -grating -gruff -jangling -jarring -raucous -rending -euphonious -golden -silvern -calculable -computable -countable -incalculable -countless -incomputable -indeterminable -calm -placid -settled -windless -stormy -angry -billowy -blustering -boisterous -blowy -choppy -dirty -gusty -squally -thundery -camphorated -uncamphorated -capable -able -confident -resourceful -incapable -unable -capable -incapable -attended -neglected -untended -careful -certain -close -conscientious -detailed -minute -overcareful -particular -protective -studious -thorough -careless -casual -haphazard -heedless -incautious -offhand -carnivorous -piscivorous -predacious -herbivorous -anthophagous -baccivorous -carpophagous -saprophagous -saprophytic -omnivorous -insectivorous -apivorous -myrmecophagous -holozoic -holophytic -carpellate -acarpelous -carpeted -uncarpeted -carved -engraved -graven -lapidarian -sliced -uncarved -acatalectic -catalectic -hypercatalectic -cauline -radical -censored -expurgated -uncensored -unexpurgated -caudate -bobtail -caudal -tailed -acaudate -anurous -caulescent -acaulescent -causative -abortifacient -activating -anorectic -causal -conducive -errhine -fast -inductive -motivative -motive -precipitating -responsible -sternutatory -noncausative -cautious -cagey -fabian -gingerly -guarded -overcautious -incautious -hotheaded -cellular -cancellate -alveolate -multicellular -noncellular -coherent -incoherent -compartmented -compartmental -uncompartmented -porous -porose -nonporous -central -amidship -bicentric -bifocal -center -centered -centric -focal -median -middlemost -nuclear -peripheral -circumferential -fringy -encircling -centrifugal -centripetal -afferent -centripetal -corticoafferent -efferent -centrifugal -corticoefferent -neuromotor -centralizing -centripetal -consolidative -decentralizing -centrifugal -certain -definite -indisputable -uncertain -indefinite -certain -convinced -uncertain -ambivalent -doubtful -groping -convinced -unconvinced -dubious -confident -assured -cocksure -reassured -diffident -certain -bound -doomed -foreordained -uncertain -chancy -contingent -certified -certifiable -certificated -credentialled -uncertified -inevitable -fatal -ineluctable -necessary -evitable -preventable -unpreventable -changeable -adjustable -astatic -checkered -distortable -erratic -fluid -fluid -jittering -kaleidoscopic -mobile -reversible -volatile -unchangeable -changeless -confirmed -fixed -static -commutable -alterable -convertible -incommutable -inconvertible -unalterable -alterable -unalterable -incurable -final -modifiable -unmodifiable -adjusted -focused -weighted -unadjusted -maladjusted -adjusted -maladjusted -unadapted -altered -adjusted -changed -emended -paraphrastic -revised -unaltered -dateless -unedited -unreduced -unrevised -amended -revised -unamended -changed -denatured -exchanged -transformed -varied -unchanged -idempotent -same -isometric -isotonic -ionized -nonionized -mutable -immutable -characteristic -diagnostic -distinctive -peculiar -uncharacteristic -charged -hot -negative -positive -polar -uncharged -neutral -dead -charitable -beneficent -uncharitable -chartered -unchartered -owned -unowned -chaste -celibate -pure -unchaste -cyprian -easy -fallen -licentious -cheerful -beaming -beamish -blithe -buoyant -cheery -chipper -depressing -blue -somber -chlamydeous -achlamydeous -chondritic -achondritic -monoclinic -triclinic -monochromatic -polychromatic -chromatic -amber -amethyst -auburn -aureate -avocado -azure -beige -blae -blue -blushful -bronze -brown -buff -canary -caramel -carnation -chartreuse -chestnut -coppery -coral -creamy -dun -earthlike -fuscous -green -hazel -honey -jade -khaki -lavender -magenta -maroon -mauve -mousy -ocher -olive -orange -peachy -pink -purple -red -rose -russet -rust -sage -sapphire -snuff -sorrel -stone -straw -tan -tannish -tangerine -tawny -ultramarine -umber -vermilion -vinaceous -yellow -achromatic -argent -blackish -canescent -chalky -charcoal -ebon -grey -hueless -pearly -sable -whitish -black -white -albescent -saturated -intense -unsaturated -dull -color -colored -crimson -bay -bicolor -black -ginger -indigo -monochromatic -motley -polychromatic -roan -trichromatic -uncolored -achromatous -achromic -stained -unstained -untreated -colorful -ablaze -bright -changeable -deep -fluorescent -prismatic -psychedelic -shrill -vibrant -colorless -ashen -bleached -drab -dulled -etiolate -lurid -pale -pasty -prefaded -waxen -white -colorful -brave -flashy -noisy -picturesque -colorless -neutral -pale -light -pale -palish -pastel -powdery -dark -darkish -chromatic -diatonic -cismontane -cisalpine -tramontane -transalpine -christian -christianly -christlike -unchristian -christless -unchristianly -civilized -advanced -civil -humane -noncivilized -barbarian -barbarous -preliterate -primitive -classical -classical -neoclassic -nonclassical -modern -popular -classified -categorized -grouped -unclassified -uncategorized -classified -confidential -restricted -secret -sensitive -unclassified -declassified -nonsensitive -analyzed -unanalyzed -crude -clean -cleanable -cleanly -fresh -immaculate -pristine -scrubbed -unsoiled -unsullied -washed -dirty -Augean -bedraggled -befouled -begrimed -black -buggy -cobwebby -feculent -filthy -flyblown -greasy -lousy -maculate -mucky -ratty -scummy -smudgy -snotty -sooty -uncleanly -unswept -unwashed -clean -antiseptic -dirty -bawdy -blasphemous -cruddy -lewd -scabrous -scatological -clean -dirty -radioactive -hot -nonradioactive -clean -halal -kosher -unclean -nonkosher -untouchable -clear -broad -limpid -unmistakable -vivid -unclear -blurred -confusing -obscure -clear -crystalline -hyaline -liquid -translucent -unclouded -unfrosted -opaque -cloudy -fogged -frosted -glaucous -lightproof -milky -semiopaque -solid -radiolucent -radiopaque -clearheaded -clear -unclouded -confused -addlebrained -addled -befogged -clouded -dazed -dazzled -trancelike -clement -lenient -inclement -unsparing -clement -balmy -inclement -smart -astute -cagey -streetwise -stupid -anserine -blockheaded -cloddish -dense -gaumless -lumpish -nitwitted -weak -clockwise -dextrorotary -counterclockwise -levorotary -far -cold -distant -distant -faraway -farther -farthermost -further -outlying -near -adjacent -nearby -warm -hot -distant -deep -extreme -nonadjacent -yonder -close -adjacent -ambient -appressed -approximate -contiguous -encompassing -enveloping -juxtaposed -nestled -proximate -scalelike -distant -faraway -removed -ulterior -close -approximate -boon -chummy -confidential -cozy -dear -familiar -intimate -cousinly -uncousinly -clothed -appareled -arrayed -breeched -caparisoned -cassocked -coated -costumed -cowled -dighted -dressed -gowned -habited -overdressed -petticoated -suited -surpliced -togged -tuxedoed -underdressed -uniformed -vestmented -unclothed -bare -bareheaded -barelegged -bottomless -clothesless -exposed -seminude -starkers -stripped -unappareled -saddled -unsaddled -bareback -clear -cloudless -fair -serene -cloudy -brumous -fogbound -cloudlike -dull -heavy -miasmal -smoggy -coastal -coastwise -inshore -maritime -seaward -inland -interior -landlocked -inshore -offshore -coherent -seamless -incoherent -confused -fuzzy -collapsible -foldable -telescopic -noncollapsible -nontelescopic -crannied -uncrannied -collective -agglomerate -aggregate -collectivized -knockdown -distributive -allocable -diffusing -immanent -permeant -separative -suffusive -publicized -advertised -heralded -promulgated -suppressed -burked -quelled -unreleased -published -unpublished -publishable -unpublishable -reported -according -notifiable -reportable -unreported -reportable -unreportable -combinative -combinatorial -combinable -noncombinative -noncombining -combustible -burnable -comburent -flammable -ignescent -incendiary -noncombustible -fireproof -flameproof -nonflammable -explosive -detonative -nonexplosive -lighted -ablaze -ignited -unlighted -unkindled -commodious -roomy -incommodious -cramped -comfortable -cozy -easy -homelike -soothing -uncomfortable -bad -comfortless -irritating -miserable -uneasy -warm -comfortable -comforted -uncomfortable -awkward -disquieting -commensurate -coextensive -commensurable -proportionate -incommensurate -disproportionate -incommensurable -proportionate -proportionable -proportional -proportional -disproportionate -commercial -commercialized -mercantile -mercantile -technical -noncommercial -nonprofit -uncommercial -uncommercialized -residential -nonresidential -commissioned -noncommissioned -common -average -democratic -demotic -frequent -general -grassroots -standard -uncommon -especial -rare -unusual -unwonted -usual -accustomed -chronic -regular -unusual -different -extraordinary -odd -peculiar -unaccustomed -unique -hydrophobic -hydrophilic -deliquescent -oleophilic -lipophilic -oleophobic -common -communal -public -individual -idiosyncratic -individualist -respective -singular -communicative -anecdotic -blabbermouthed -chatty -communicable -communicational -expansive -expressive -gesticulating -gestural -gestural -heraldic -narrative -nonverbal -nonverbal -openhearted -outspoken -verbal -uncommunicative -blank -close -deadpan -incommunicado -inexpressive -mum -unpronounceable -compact -clayey -consolidated -impacted -packed -serried -tight -loose -light -shifting -silty -unconsolidated -comparable -incomparable -incommensurable -matchless -alone -compassionate -caring -nurturant -tenderhearted -uncompassionate -hardhearted -compatible -congenial -congruous -harmonious -incompatible -antagonistic -clashing -contradictory -uncongenial -compatible -incompatible -miscible -compatible -immiscible -incompatible -competent -able -effective -workmanlike -incompetent -feckless -ineffective -unworkmanlike -competent -incompetent -competitive -agonistic -emulous -matched -noncompetitive -accommodative -monopolistic -uncompetitive -complaining -fretful -protestant -uncomplaining -compressible -compressed -incompressible -whole -entire -integral -livelong -undivided -fractional -aliquot -divisional -fragmental -half -halfway -whole -half -committed -pledged -uncommitted -floating -undecided -dedicated -devoted -devoted -sacred -undedicated -complete -absolute -accomplished -all -allover -clean -completed -dead -exhaustive -full -good -hearty -sound -incomplete -broken -half -neither -partial -rudimentary -sketchy -uncompleted -comprehensive -citywide -countywide -countrywide -cosmopolitan -encyclopedic -large -omnibus -plenary -spatiotemporal -schoolwide -statewide -super -umbrella -noncomprehensive -limited -composed -calm -imperturbable -collected -cool -unflurried -discomposed -abashed -blushful -bothered -discombobulated -flustered -unstrung -comprehensible -accessible -apprehensible -fathomable -incomprehensible -dark -enigmatic -unfathomable -impenetrable -indecipherable -lost -opaque -concave -acetabular -biconcave -bursiform -cuplike -cupular -dished -planoconcave -recessed -umbilicate -convex -biconvex -gibbous -planoconvex -umbellate -concentrated -bunchy -thick -cumulous -single -thickset -distributed -apportioned -broken -diffuse -diffused -dispensed -dispersed -divided -encyclical -fanned -rationed -scattered -separated -sparse -splashed -straggly -unfocused -concentric -coaxial -eccentric -acentric -concerned -afraid -afraid -haunted -solicitous -unconcerned -blase -blithe -casual -degage -indifferent -concise -aphoristic -brief -compendious -crisp -cryptic -elliptic -pithy -telegraphic -prolix -diffuse -verbal -pleonastic -conclusive -definitive -inconclusive -equivocal -indeterminate -nisi -consummated -completed -fulfilled -unconsummated -coordinating -subordinating -accordant -according -agreeable -concordant -consensual -consentaneous -discordant -dissentious -contracted -contractile -expanded -atrophied -hypertrophied -conditional -counterfactual -contingent -dependent -probationary -provisory -unconditional -blunt -vested -enforceable -unenforceable -enforced -unenforced -conductive -semiconducting -nonconductive -confined -claustrophobic -close -homebound -pent -snowbound -stormbound -unconfined -crowded -huddled -jammed -thronged -uncrowded -congenial -sociable -uncongenial -disagreeable -congruent -coincident -identical -incongruent -congruous -harmonious -incongruous -discrepant -inappropriate -inharmonious -ironic -conjunctive -copulative -connective -disjunctive -adversative -alternative -contrastive -divisional -partitive -separative -conjunct -disjunct -connected -adjacent -adjunctive -affined -conterminous -coupled -engaged -unconnected -apart -asternal -detached -disjoined -exploded -unattached -uncoupled -conquerable -beatable -subduable -unconquerable -impregnable -indomitable -insuperable -invincible -conscious -semiconscious -sentient -unconscious -cold -comatose -innocent -insensible -nonconscious -semicomatose -subconscious -consecrated -ordained -votive -desecrated -deconsecrated -profaned -priestly -unpriestly -conservative -blimpish -fusty -hidebound -ultraconservative -liberal -liberalistic -neoliberal -progressive -socialized -welfarist -consistent -accordant -pursuant -reconciled -unchanging -inconsistent -discrepant -spotty -unconformable -unreconciled -conspicuous -big -bold -crying -featured -marked -outstanding -inconspicuous -obscure -discernible -indiscernible -distinguishable -differentiable -discriminable -indistinguishable -constant -steadfast -unfailing -inconstant -false -fickle -constructive -creative -formative -formative -inferential -reconstructive -structural -destructive -annihilative -blasting -cataclysmal -caustic -crushing -damaging -erosive -iconoclastic -ravaging -wasteful -contented -complacent -satisfied -smug -discontented -disaffected -disgruntled -restless -contestable -challengeable -debatable -shakable -incontestable -demonstrable -demonstrated -inarguable -unassailable -unanswerable -continent -incontinent -leaky -continual -insistent -running -perennial -persistent -recurring -sporadic -fitful -intermittent -periodic -irregular -isolated -continuous -ceaseless -continual -dogging -endless -straight -sustained -discontinuous -disrupted -disjunct -continuous -discontinuous -continued -continuing -discontinued -interrupted -controlled -contained -disciplined -dominated -harnessed -obsessed -regimented -uncontrolled -anarchic -errant -irrepressible -loose -lordless -rampant -runaway -torrential -undisciplined -wild -controversial -arguable -contentious -disputed -polemic -uncontroversial -unchallengeable -undisputed -argumentative -quarrelsome -contentious -eristic -unargumentative -noncontentious -convenient -handy -favorable -inconvenient -awkward -conventional -received -customary -formulaic -stodgy -unconventional -bohemian -irregular -conventional -square -stereotyped -unconventional -alternative -bizarre -funky -conformist -nonconformist -nuclear -thermonuclear -conventional -traditional -conventional -traditionalistic -nontraditional -convergent -confluent -focused -divergent -branching -radiating -branchy -arboreal -brachiate -branched -bushy -maplelike -branchless -palmlike -unbranched -convincing -credible -disenchanting -unconvincing -unpersuasive -cooked -baked -barbecued -boiled -braised -broiled -burned -done -fried -lyonnaise -medium -overdone -parched -roast -saute -seared -steamed -toasted -raw -rare -uncooked -untoasted -cooperative -collaborative -synergetic -uncooperative -corrupt -corrupted -corruptible -depraved -dirty -Praetorian -putrid -incorrupt -antiseptic -incorruptible -uncorrupted -uncorrupted -synergistic -antagonistic -antacid -antiphlogistic -considerable -appreciable -goodly -significant -inconsiderable -substantial -insubstantial -aeriform -shadowy -stringy -material -physical -physical -immaterial -intangible -bodied -incarnate -unbodied -bodiless -formless -brainwashed -unbrainwashed -corporeal -bodily -bodied -reincarnate -incorporeal -discorporate -spiritual -correct -accurate -straight -incorrect -erroneous -fallacious -false -right -wrong -wrongheaded -corrected -aplanatic -apochromatic -rectified -uncorrected -unremedied -corrigible -amendable -improvable -redeemable -incorrigible -unreformable -uncontrollable -cosmopolitan -traveled -provincial -bumpkinly -insular -jerkwater -costive -laxative -aperient -cathartic -constipated -bound -unconstipated -diarrheal -lax -considerate -thoughtful -inconsiderate -thoughtless -courteous -chivalrous -discourteous -abrupt -brusque -caddish -unceremonious -polite -mannerly -courteous -impolite -bratty -discourteous -unparliamentary -civil -uncivil -civil -sidereal -creative -fanciful -fictive -imaginative -yeasty -uncreative -sterile -credible -likely -presumptive -incredible -astounding -fabulous -improbable -undreamed -credulous -credible -overcredulous -unquestioning -incredulous -disbelieving -critical -captious -censorious -deprecative -hypercritical -searing -scathing -uncritical -judgmental -faultfinding -nonjudgmental -critical -appraising -discriminative -uncritical -critical -acute -dangerous -desperate -noncritical -acritical -critical -supercritical -noncritical -crossed -crosstown -decussate -uncrossed -crossed -uncrossed -walleyed -crowned -capped -chapleted -comate -royal -uncrowned -crowned -capped -uncrowned -uncapped -crucial -critical -pivotal -noncrucial -crystallized -uncrystallized -cubic -blockish -boxlike -cubelike -isometric -solid -linear -collinear -lineal -linelike -rectilinear -planar -coplanar -flat -placoid -planate -tabular -unidimensional -multidimensional -dimensional -cut -chopped -incised -perforated -pierced -severed -split -uncut -imperforate -unpierced -cut -uncut -cut -hewn -sheared -slashed -uncut -unsheared -curious -inquisitive -nosy -overcurious -incurious -uninterested -uninquiring -current -actual -afoot -circulating -contemporary -incumbent -live -live -occurrent -ongoing -topical -noncurrent -back -dead -disused -outdated -obsolescent -cursed -accursed -blasted -damn -damnable -blessed -fortunate -endowed -dowered -unendowed -dowerless -unblessed -curtained -draped -curtainless -bespoke -made -prefab -handmade -handsewn -overhand -homemade -homespun -boughten -manufactured -cyclic -alternate -alternate -circular -noncyclic -cyclic -bicyclic -heterocyclic -homocyclic -acyclic -aliphatic -cyclic -verticillate -acyclic -annual -biennial -perennial -diurnal -nocturnal -damaged -battered -bedraggled -bent -broken -hurt -riddled -undamaged -intact -datable -undatable -dateless -dateless -deaf -deafened -hearing -decent -indecent -crude -Hollywood -indelicate -obscene -suggestive -decisive -deciding -fateful -peremptory -indecisive -decisive -unhesitating -indecisive -hesitant -suspensive -declarative -interrogative -declared -alleged -announced -asserted -avowed -professed -undeclared -unacknowledged -unavowed -decorous -sedate -indecorous -deductible -allowable -nondeductible -deep -abysmal -bottomless -profound -shallow -fordable -neritic -reefy -deep -heavy -profound -shallow -light -defeasible -indefeasible -unforfeitable -defeated -licked -subjugated -undefeated -triumphant -unbeaten -unbowed -defiant -insubordinate -obstreperous -recalcitrant -compliant -amenable -lamblike -nonresistant -defined -undefined -indefinable -derived -derivable -derivative -plagiaristic -underived -original -primary -inflected -uninflected -inflected -modulated -uninflected -definite -certain -decisive -distinct -indefinite -coy -indecisive -nebulous -noncommittal -one -dehiscent -indehiscent -dejected -amort -chapfallen -gloomy -glum -lonely -elated -exultant -gladdened -high -sublime -uplifted -delicate -dainty -ethereal -fragile -overdelicate -pastel -tender -rugged -knockabout -sturdy -breakable -brittle -crumbly -short -delicate -frangible -splintery -unbreakable -infrangible -shatterproof -demanding -exigent -needy -rigorous -stern -undemanding -lenient -easygoing -light -unexacting -imperative -adjuratory -clamant -peremptory -desperate -pressing -strident -beseeching -adjuratory -importunate -mendicant -petitionary -precatory -suppliant -democratic -antiauthoritarian -classless -parliamentary -parliamentary -participatory -popular -representative -republican -undemocratic -authoritarian -despotic -monarchal -totalitarian -arbitrary -absolute -capricious -discretionary -nonarbitrary -prescribed -demonstrative -effusive -epideictic -undemonstrative -restrained -deniable -disavowable -questionable -undeniable -incontestable -incontrovertible -denotative -appellative -designative -extensional -referent -referential -connotative -connotational -implicative -inferential -intensional -reliable -certain -tested -undeviating -unreliable -erratic -uncertain -unsound -dependent -babelike -helpless -interdependent -myrmecophilous -parasitic -reliant -symbiotic -underage -independent -autarkic -autonomous -autonomous -breakaway -commutative -indie -individual -unaffiliated -unconditional -independent -dependent -partisan -tendentious -nonpartisan -bipartisan -independent -unbiased -aligned -allied -nonaligned -neutral -descriptive -prescriptive -descriptive -undescriptive -desirable -coveted -delectable -enviable -plummy -preferable -undesirable -unenviable -destroyed -annihilated -blighted -broken -burned -demolished -despoiled -extinguished -fallen -finished -scorched -shattered -totaled -wrecked -preserved -conserved -preservable -protected -retained -destructible -abolishable -destroyable -indestructible -undestroyable -determinable -ascertainable -definable -judicable -indeterminable -indeterminate -unascertainable -unpredictable -determinate -fixed -indeterminate -determinate -cymose -indeterminate -racemose -developed -formulated -mature -undeveloped -budding -vestigial -dextral -dexter -dextrorse -sinistral -sinister -sinistrorse -diabatic -adiabatic -differentiated -undifferentiated -dedifferentiated -difficult -ambitious -arduous -awkward -baffling -catchy -delicate -fractious -herculean -nasty -rocky -rugged -serious -tall -thorny -troublesome -trying -vexed -easy -casual -clean -cushy -elementary -painless -simplified -smooth -digitigrade -plantigrade -dignified -courtly -distinguished -undignified -demeaning -pathetic -statesmanlike -unstatesmanlike -presidential -unpresidential -dicotyledonous -monocotyledonous -diligent -assiduous -hardworking -negligent -derelict -lax -inattentive -diluted -cut -watery -white -undiluted -black -concentrated -neat -saturated -unsaturated -monounsaturated -polyunsaturated -saturated -supersaturated -unsaturated -diplomatic -politic -tactful -undiplomatic -conciliatory -appeasing -pacific -propitiative -soft -antagonistic -alienating -direct -nonstop -straightforward -undeviating -through -indirect -askance -devious -diversionary -meandering -direct -alternating -direct -bluff -blunt -brutal -plain -pointed -square -upfront -indirect -allusive -backhanded -circuitous -circumlocutious -devious -digressive -hearsay -mealymouthed -tortuous -direct -inverse -reciprocal -direct -retrograde -immediate -direct -mediate -indirect -mediated -discerning -clear -prescient -undiscerning -obtuse -uncomprehending -discreet -indiscreet -bigmouthed -imprudent -discriminate -indiscriminate -promiscuous -sweeping -discriminating -appreciative -diacritic -discerning -discriminative -eclectic -good -selective -undiscriminating -indiscriminate -scattershot -unperceptive -unselective -disposable -throwaway -nondisposable -returnable -revertible -nonreturnable -disposable -available -expendable -fluid -nondisposable -frozen -distal -proximal -distal -lateral -mesial -medial -sagittal -distinct -chiseled -clear -crisp -crystalline -defined -knifelike -indistinct -bedimmed -bleary -cloudy -dim -faint -veiled -focused -unfocused -diversified -varied -undiversified -general -monolithic -solid -undistributed -divisible -cleavable -dissociable -dissociative -dividable -partible -indivisible -indiscrete -undividable -inseparable -documented -referenced -registered -undocumented -unregistered -domineering -authoritarian -autocratic -blustery -cavalier -oppressive -submissive -abject -bowed -meek -cringing -dominated -servile -bootlicking -obsequious -slavish -slavelike -unservile -dominant -ascendant -controlling -governing -overriding -possessive -sovereign -superior -subordinate -adjunct -associate -secondary -under -dominant -recessive -dramatic -melodramatic -spectacular -hammy -undramatic -unspectacular -actable -unactable -theatrical -histrionic -showy -stagy -untheatrical -drinkable -undrinkable -intoxicated -bacchanalian -beery -besotted -potty -bibulous -doped -high -sober -dry -uninebriated -dull -blunt -blunted -edgeless -unsharpened -sharp -carnassial -edged -incisive -keen -knifelike -penetrative -sharpened -sharp -acute -cutting -fulgurating -salt -dull -deadened -eventful -lively -uneventful -lively -alive -bouncing -breezy -bubbly -bubbling -burbling -live -warm -dull -arid -bovine -drab -heavy -humdrum -lackluster -dynamic -changing -driving -energizing -projectile -propellant -slashing -undynamic -backward -stagnant -eager -anxious -hot -impatient -overeager -uneager -reluctant -eared -auriculate -earless -early -aboriginal -advance -archean -archeozoic -azoic -earlier -earlyish -premature -previous -proterozoic -proto -wee -middle -intervening -mid -late -advanced -latish -posthumous -early -archaic -new -crude -embryonic -incipient -precocious -late -advanced -tardive -early -Old -middle -late -Modern -New -earned -attained -unearned -honorary -easy -uneasy -apprehensive -precarious -east -eastbound -easterly -easterly -eastern -easternmost -eastside -west -westbound -western -westerly -westernmost -westside -western -occidental -eastern -oriental -western -southwestern -midwestern -northwestern -eastern -northeastern -southeastern -ectomorphic -asthenic -endomorphic -mesomorphic -athletic -edible -killable -nonpoisonous -pareve -inedible -poisonous -educated -knowing -literate -semiliterate -uneducated -ignorant -ignorant -undereducated -unschooled -unstudied -numerate -innumerate -operative -operant -effective -operational -working -inoperative -down -dead -defunct -effective -impelling -impressive -ineffective -toothless -unproductive -effortful -arduous -dragging -exhausting -heavy -leaden -Sisyphean -arduous -effortless -facile -unforced -efficacious -effective -inefficacious -efficient -businesslike -economic -expeditious -streamlined -inefficient -uneconomical -forceful -bruising -drastic -emphatic -firm -forcible -impellent -impetuous -sharp -forceless -wimpish -elastic -bouncy -chewy -elasticized -expandable -fictile -flexible -rubbery -springlike -stretch -stretchable -viscoelastic -inelastic -dead -nonresilient -springless -elective -electoral -nonappointive -appointive -nominated -nonelective -assigned -allotted -appointed -unassigned -optional -elective -facultative -nonmandatory -obligatory -bounden -compulsory -imposed -indispensable -prerequisite -elegant -dandified -deluxe -fine -exquisite -neat -ritzy -soigne -inelegant -gauche -homely -eligible -bailable -desirable -entitled -legal -pensionable -ineligible -disqualified -disqualified -undesirable -unentitled -emotional -affectional -bathetic -cathartic -charged -funky -little -lyric -moody -overemotional -soulful -unemotional -chilly -dry -impassive -philosophical -phlegmatic -stoic -unblinking -empirical -confirmable -experiential -experimental -experimental -semiempirical -theoretical -abstractive -conjectural -notional -metaphysical -theoretical -abstract -academic -pure -applied -forensic -practical -salaried -freelance -employed -engaged -hired -working -unemployed -discharged -idle -employable -unemployable -enchanted -beguiled -bewitched -fascinated -disenchanted -disabused -disillusioned -encouraging -exhortative -heartening -promotive -rallying -discouraging -daunting -demoralizing -frustrating -unencouraging -encumbered -burdened -clogged -involved -mortgaged -unencumbered -burdenless -clear -burdened -laden -saddled -unburdened -unencumbered -endocentric -exocentric -endogamous -exogamous -autogamous -endogamous -exogamous -endoergic -exoergic -endothermic -decalescent -exothermic -endogenous -exogenous -energetic -physical -alert -canty -driving -indefatigable -strenuous -vigorous -lethargic -dazed -dreamy -listless -enfranchised -disenfranchised -exportable -marketable -unexportable -exploratory -alpha -beta -preliminary -searching -wildcat -nonexploratory -inquiring -inquisitive -inquisitorial -inquisitorial -inquisitory -uninquiring -increased -accrued -augmented -enhanced -hyperbolic -exaggerated -multiplied -raised -redoubled -decreased -ablated -attenuate -attenuated -bated -belittled -cut -diminished -minimized -remittent -shriveled -reducible -irreducible -enlightened -edified -unenlightened -benighted -enterprising -energetic -entrepreneurial -unenterprising -slowgoing -enthusiastic -ardent -avid -crazy -evangelical -glowing -overenthusiastic -unenthusiastic -cold -halfhearted -desirous -appetent -athirst -avid -covetous -nostalgic -homesick -undesirous -entozoic -epizoic -equal -equivalent -close -coequal -coordinate -equidistant -equilateral -even -isochronal -isoclinal -isometric -isothermal -quits -tied -unequal -anisometric -mismatched -nonequivalent -unbalanced -unequalized -balanced -counterbalanced -harmonious -poised -stable -unbalanced -labile -isotonic -hypertonic -hypotonic -equivocal -double -evasive -indeterminate -unequivocal -absolute -straightforward -unquestionable -eradicable -delible -effaceable -exterminable -obliterable -ineradicable -indelible -inexpungible -inexterminable -esoteric -abstruse -arcane -cabalistic -mysterious -exoteric -essential -basal -biogenic -constituent -must -staple -substantial -virtual -vital -inessential -accessorial -adscititious -incidental -dispensable -indispensable -critical -estimable -admirable -contemptible -abject -bastardly -pathetic -ethical -unethical -complimentary -encomiastic -laudatory -uncomplimentary -belittling -derogative -dyslogistic -supercilious -flattering -adulatory -becoming -ingratiating -unflattering -euphemistic -dysphemistic -euphoric -euphoriant -expansive -dysphoric -even -flat -flatbottom -flush -justified -level -true -uneven -crinkled -irregular -jagged -lumpy -patchy -ragged -unparallel -even -odd -evergreen -coniferous -deciduous -broadleaf -exact -direct -literal -mathematical -perfect -photographic -rigorous -inexact -approximate -free -odd -round -convertible -cashable -inconvertible -irredeemable -exchangeable -commutable -fungible -transposable -vicarious -unexchangeable -incommutable -excitable -quick -skittish -unexcitable -steady -excited -aflutter -agog -crazy -fevered -intoxicated -overexcited -stimulated -teased -thrilled -thrillful -unexcited -exciting -breathless -elating -electric -electrifying -glamorous -heady -titillating -tickling -unexciting -commonplace -uninspired -tame -exculpatory -absolvitory -extenuating -justificative -inculpatory -accusative -comminatory -condemnatory -criminative -damnatory -recriminative -exhaustible -depletable -inexhaustible -renewable -unfailing -exhausted -unexhausted -leftover -unconsumed -unspent -existent -active -nonexistent -lacking -barren -nonextant -vanished -extant -living -surviving -extinct -dead -expected -anticipated -due -expectable -unexpected -unannounced -unanticipated -unhoped -upset -expedient -advantageous -opportunist -carpetbag -inexpedient -inadvisable -expendable -consumable -sacrificeable -unexpendable -expensive -costly -overpriced -cheap -catchpenny -sixpenny -experienced -intimate -old -practiced -seasoned -inexperienced -fledgling -raw -uninitiate -unpracticed -unseasoned -expired -invalid -terminated -unexpired -valid -explicable -explainable -inexplicable -cryptic -paradoxical -unaccountable -unexplained -explicit -declared -definitive -express -graphic -implicit -silent -unexpressed -exploited -employed -unexploited -fallow -untapped -expressible -describable -representable -speakable -inexpressible -indefinable -extensile -protractile -protrusile -nonextensile -extricable -inextricable -unresolvable -bowed -arco -plucked -pizzicato -fingered -digitate -fingerless -expansive -distensible -erectile -expandable -inflatable -unexpansive -extinguishable -inextinguishable -external -outer -outside -internal -inner -interior -internecine -intrinsic -outer -out -outermost -outside -satellite -inner -inmost -inside -outward -external -outer -inward -indwelling -inmost -inner -secret -exterior -out -outside -interior -indoor -inside -eyed -eyelike -popeyed -eyeless -playable -unplayable -fair -foul -fair -antimonopoly -clean -unfair -cheating -raw -equitable -honest -evenhanded -inequitable -faithful -firm -true -unfaithful -apostate -punic -untrue -faithful -unfaithful -adulterous -loyal -allegiant -doglike -leal -liege -disloyal -faithless -insurgent -mutinous -rebellious -recreant -fallible -errant -erring -undependable -weak -infallible -foolproof -inerrable -familiar -acquainted -beaten -old -unfamiliar -strange -unacquainted -strange -antic -crazy -curious -eerie -exotic -freaky -gothic -oddish -other -quaint -quaint -weird -familiar -common -everyday -fashionable -latest -cool -dapper -faddish -groovy -in -mod -swank -trendsetting -trendy -unfashionable -antique -dated -dowdy -fogyish -out -prehistoric -stylish -chic -chichi -classy -snazzy -styleless -dowdy -fast -accelerated -alacritous -blistering -express -fleet -hurrying -immediate -instantaneous -meteoric -quick -rapid -rapid -smart -winged -windy -slow -dilatory -lazy -sluggish -fast -allegro -allegretto -andantino -presto -prestissimo -vivace -slow -adagio -andante -lento -lentissimo -largo -larghetto -larghissimo -moderato -fast -slow -fastidious -choosy -dainty -finical -meticulous -pernickety -unfastidious -fastidious -unfastidious -fat -abdominous -blubbery -chubby -buxom -corpulent -dumpy -fattish -fleshy -gross -portly -thin -anorexic -bony -gangling -lank -rawboned -reedy -twiggy -scarecrowish -scraggy -shriveled -slender -spare -stringy -wisplike -fatty -adipose -buttery -greasy -suety -superfatted -nonfat -light -skim -fatal -deadly -deadly -terminal -nonfatal -nonlethal -curable -incurable -fathomable -unfathomable -unsoundable -favorable -following -unfavorable -adverse -favorable -approving -indulgent -unfavorable -admonitory -adverse -disapproving -discriminatory -feathered -aftershafted -feathery -featherlike -fledged -flighted -pennate -plumaged -plumate -plumed -plumelike -unfeathered -plucked -unfledged -felicitous -congratulatory -happy -infelicitous -awkward -unfortunate -fertile -conceptive -fecund -fertilizable -rank -sterile -barren -sterilized -unfertilized -finished -complete -done -up -unfinished -incomplete -pending -undone -unended -finished -dressed -fattened -fattening -unfinished -raw -roughhewn -undressed -unfattened -unhewn -finite -bounded -exhaustible -impermanent -limited -infinite -boundless -dateless -endless -inexhaustible -finite -tensed -infinite -opening -beginning -inaugural -introductory -starting -closing -concluding -terminative -first -archetypal -basic -initial -firstborn -freshman -original -premier -premier -prime -last -senior -sunset -ultimate -intermediate -grey -halfway -junior -penultimate -sophomore -subterminal -antepenultimate -terminal -first -second -fissile -nonfissile -fissionable -nonfissionable -fit -able -conditioned -unfit -afflicted -apractic -bandy -crippled -crookback -disabled -gammy -soft -spavined -dipped -maimed -fit -acceptable -suitable -worthy -unfit -subhuman -unsuitable -flat -contrasty -flexible -bendable -limber -limber -spinnable -stretched -inflexible -rigid -semirigid -flexible -limber -negotiable -inflexible -adamant -fossilized -ironclad -uncompromising -compromising -yielding -rigid -semirigid -nonrigid -adaptable -adjustable -convertible -elastic -filmable -universal -variable -unadaptable -inflexible -campylotropous -orthotropous -anatropous -amphitropous -curly -curled -crisp -permed -ringleted -wavy -straight -uncurled -unpermed -footed -pedate -footless -apodal -toed -toeless -splayfooted -splay -fore -foremost -aft -after -aftermost -forehand -backhand -native -connatural -adopted -foreign -adventive -alien -nonnative -established -imported -tramontane -unnaturalized -native -autochthonal -domestic -homegrown -native -nonnative -foreign -abroad -external -domestic -home -municipal -domestic -domesticated -housewifely -husbandly -undomestic -undomesticated -forgettable -unmemorable -unforgettable -haunting -memorable -forgiving -kind -unvindictive -unforgiving -revengeful -formal -ceremonial -ceremonious -dress -nominal -positive -semiformal -starchy -informal -casual -folksy -unceremonious -formal -literary -informal -colloquial -common -epistolary -slangy -subliterary -unliterary -former -latter -fortunate -felicitous -fortuitous -good -lucky -unfortunate -abject -black -dispossessed -hapless -doomed -downtrodden -infelicitous -regrettable -fragrant -aromatic -odoriferous -perfumed -musky -malodorous -bilgy -fetid -fusty -gamey -miasmic -niffy -odoriferous -reeking -sour -odorous -alliaceous -redolent -scented -odorless -scentless -scented -scentless -free -liberated -unbound -bound -conjugate -conjugate -fixed -fast -geostationary -geosynchronous -leaded -stationary -taped -unadjustable -unfixed -detached -floating -unfirm -free -autonomous -available -aweigh -clear -emancipated -footloose -unconfined -unconstrained -unhampered -unrestricted -unfree -adscript -apprenticed -captive -entangled -nonautonomous -prisonlike -serflike -free -freeborn -unfree -servile -slaveholding -frequent -prevailing -regular -infrequent -occasional -rare -fresh -caller -crisp -good -hot -strong -stale -addled -bad -cold -hard -flyblown -limp -moldy -rancid -rotten -corrupt -putrid -putrescent -fresh -unprocessed -preserved -aged -candied -canned -corned -cured -dried -lyophilized -pickled -potted -salted -smoked -fresh -salty -brackish -saliferous -saline -saltish -friendly -affable -chummy -companionate -comradely -couthie -cozy -neighborly -social -unfriendly -chilly -uncordial -unneighborly -friendly -hostile -friendly -unfriendly -frozen -frostbitten -glaciated -icebound -icy -sleety -unthawed -unfrozen -liquescent -slushy -thawed -fruitful -berried -bountiful -breeding -fat -generative -prolific -unfruitful -abortive -acarpous -childless -full -afloat -brimful -chockablock -congested -filled -fraught -glutted -heavy -instinct -laden -overladen -riddled -stuffed -stuffed -untouched -empty -bare -blank -glassy -lifeless -looted -vacant -vacant -vacuous -void -drained -empty -exhausted -undrained -regular -irregular -underemployed -functional -structural -utilitarian -nonfunctional -nonstructural -cosmetic -functioning -running -up -malfunctioning -amiss -bad -functional -organic -rigged -lateen -outrigged -unrigged -equipped -accoutered -armored -helmeted -outfitted -prepared -transistorized -visored -unequipped -fledged -fledgling -unfledged -unfeathered -framed -unframed -furnished -appointed -stocked -volumed -unfurnished -funded -unfunded -fueled -unfueled -unfed -specified -mere -nominative -specific -unspecified -geared -engaged -ungeared -general -broad -generic -gross -overall -pandemic -universal -widespread -specific -circumstantial -limited -particular -particular -particularized -proper -unique -specific -nonspecific -national -federal -local -cosmopolitan -endemic -branchiate -abranchiate -federal -unitary -centralized -decentralized -localized -redistributed -suburbanized -technical -nontechnical -nonproprietary -generic -unpatented -proprietary -branded -copyrighted -patented -trademarked -generous -benevolent -big -lavish -unselfish -stingy -beggarly -cheap -cheeseparing -closefisted -grudging -mean -parsimonious -generous -big -ungrudging -ungenerous -genuine -authentic -attested -good -counterfeit -assumed -bad -base -bogus -inauthentic -mock -ostensible -pinchbeck -pseudo -synthetic -geocentric -Ptolemaic -heliocentric -Copernican -talented -untalented -glazed -glassy -glossy -icy -unglazed -unvitrified -glazed -unglazed -glorious -bright -celebrated -divine -empyreal -illustrious -incandescent -lustrous -inglorious -obscure -go -good -goodish -hot -redeeming -satisfactory -solid -superb -bad -atrocious -corked -deplorable -fearful -hard -hopeless -horrid -icky -ill -incompetent -mediocre -naughty -negative -poor -pretty -rubber -severe -swingeing -uncool -unfavorable -unsuitable -good -angelic -redemptive -white -evil -atrocious -bad -black -corruptive -demonic -despicable -devilish -amiable -equable -atrabilious -bristly -cantankerous -choleric -churlish -crabbed -cranky -crusty -currish -dark -disagreeable -huffish -misanthropic -misogynous -shirty -shrewish -snappish -spoiled -surly -vinegary -graceful -elegant -fluent -gainly -gracile -lissome -awkward -gawky -graceless -labored -wooden -gracious -elegant -merciful -ungracious -churlish -graceless -gradual -gradational -sudden -abrupt -choppy -emergent -explosive -fulminant -sharp -gradual -easy -sloping -steep -abrupt -bluff -heavy -perpendicular -steepish -grammatical -ungrammatical -incorrect -grateful -appreciative -glad -ungrateful -unappreciative -haploid -diploid -polyploid -triploid -happy -blessed -blissful -bright -golden -laughing -unhappy -lovesick -miserable -regretful -unregretful -hard -adamantine -corneous -tumid -firm -granitic -hardened -woody -petrous -semihard -steely -unyielding -soft -brushed -cheeselike -compressible -cottony -cushioned -demulcent -downy -flaccid -flocculent -yielding -mushy -overstuffed -softish -spongy -velvet -hard -calculating -steely -soft -mellow -hard -velar -soft -fricative -palatal -hard -soft -hardhearted -flinty -softhearted -alcoholic -dry -hard -intoxicant -spirituous -wet -nonalcoholic -harmless -innocent -harmful -abusive -bad -bruising -deleterious -calumniatory -catastrophic -counterproductive -damaging -ill -insidious -mischievous -nocent -stabbing -harmonious -consonant -harmonic -pure -symphonic -inharmonious -discordant -false -unresolved -healthful -anthelmintic -antimicrobial -carminative -cathartic -curative -drugless -good -medicative -organic -orthomolecular -preventive -recuperative -unhealthful -crippling -cytopathogenic -infective -unmedicinal -unhealthy -medical -surgical -preoperative -postoperative -operable -inoperable -pyretic -antipyretic -healthy -flushed -bouncing -firm -good -hale -hearty -hearty -anicteric -rubicund -wholesome -unhealthy -angry -arthritic -asthmatic -bad -blebby -puffy -bloodshot -cankerous -carbuncled -carious -caseous -chilblained -colicky -cytomegalic -dehydrated -diseased -edematous -enlarged -foaming -gangrenous -inflamed -inflammatory -ingrowing -jaundiced -membranous -mental -proinflammatory -sallow -sunburned -varicose -windburned -dry -phlegmy -heavenly -ambrosial -celestial -divine -divine -paradisiacal -providential -translunar -earthly -earthborn -earthbound -earthlike -mundane -sublunar -temporal -digestible -assimilable -light -predigested -indigestible -flatulent -heavy -nondigestible -undigested -stodgy -headed -bicephalous -headlike -headless -acephalous -beheaded -headed -unheaded -heavy -dense -doughy -hefty -massive -ponderous -light -lightweight -airy -buoyant -weighty -weightless -light -heavy -industrial -heavy -burdensome -distressing -leaden -oppressive -weighty -light -fooling -heavy -harsh -light -heavy -light -heavy -big -light -easy -light -heavy -light -heavy -heedless -careless -deaf -heedful -enabling -facultative -sanctionative -disabling -helpful -accommodating -adjuvant -assistive -facilitative -facilitatory -implemental -laborsaving -ministrant -reformative -stabilizing -steadying -unhelpful -unaccommodating -unconstructive -heterodactyl -zygodactyl -heterogeneous -assorted -disparate -inhomogeneous -homogeneous -consistent -solid -solid -homogenized -homozygous -heterozygous -heterosexual -straight -homosexual -butch -gay -homoerotic -lesbian -pederastic -transgender -transsexual -transvestic -tribadistic -bisexual -hierarchical -gradable -graded -vertical -nonhierarchical -ungraded -high -altitudinous -commanding -eminent -steep -upper -low -deep -lowset -nether -squat -raised -elevated -up -upraised -lowered -down -advanced -necked -decollete -necklike -throated -neckless -ceilinged -raftered -floored -high -advanced -broad -graduate -higher -higher -last -soaring -low -debased -depressed -reduced -high -adenoidal -altissimo -alto -countertenor -falsetto -peaky -shrill -screaky -soprano -sopranino -tenor -tenor -low -alto -baritone -bass -contrabass -throaty -imitative -apish -mimetic -mimic -parrotlike -simulated -nonimitative -echoic -nonechoic -multistory -storied -upland -alpestrine -alpine -mountainous -lowland -home -away -homologous -heterologous -autologous -homologous -homologic -heterologous -analogous -gabled -hipped -mansard -hipped -hipless -honest -downright -dishonest -ambidextrous -beguiling -deceitful -deceptive -false -picaresque -rascally -thieving -truthful -honest -veracious -untruthful -mendacious -honorable -august -laureate -dishonorable -black -debasing -shabby -unprincipled -yellow -hopeful -anticipant -hopeless -abject -black -despairing -despondent -forlorn -futureless -helpless -insoluble -institutionalized -noninstitutionalized -institutional -institutionalized -uninteresting -noninstitutional -iodinating -consolable -inconsolable -desolate -horizontal -crosswise -flat -level -naiant -vertical -plumb -upended -upright -inclined -atilt -aslant -monoclinal -pitched -salient -sidelong -skew -erect -erectile -fastigiate -orthostatic -passant -rampant -standing -statant -straight -unerect -accumbent -bended -cernuous -couchant -dormant -flat -hunched -procumbent -prone -supine -standing -seated -standing -running -running -gushing -jetting -standing -dead -slack -still -running -passing -hospitable -kind -inhospitable -bare -godforsaken -hostile -windswept -hospitable -welcoming -inhospitable -hostile -aggressive -antagonistic -bitter -dirty -ill -opponent -unfriendly -amicable -friendly -hot -baking -blistering -calefacient -calefactory -calorifacient -calorific -fervent -fiery -heatable -heated -hottish -overheated -scorching -sizzling -sultry -sweltering -thermal -torrid -tropical -white -cold -acold -algid -arctic -bleak -chilly -crisp -frigorific -frore -frosty -heatless -refrigerant -refrigerated -shivery -unheated -vernal -summery -aestival -autumnal -wintry -brumal -hot -fiery -heated -sensual -torrid -cold -emotionless -frigid -human -anthropoid -anthropomorphic -earthborn -fallible -hominal -hominian -hominine -nonhuman -anthropoid -bloodless -dehumanized -inhuman -superhuman -divine -herculean -subhuman -infrahuman -humane -inhumane -barbarous -beastly -cannibalic -cold -pitiless -humorous -bantering -buffoonish -amusing -droll -dry -farcical -Gilbertian -hilarious -jesting -killing -seriocomic -slapstick -tragicomic -waggish -witty -humorless -sobersided -unfunny -hungry -empty -famished -peckish -supperless -thirsty -hurried -flying -hasty -hasty -rush -unhurried -careful -easy -identifiable -acknowledgeable -classifiable -diagnosable -recognizable -specifiable -unidentifiable -elusive -intangible -unclassifiable -undiagnosable -unrecognizable -immanent -transeunt -impaired -anosmic -broken -dicky -diminished -dysfunctional -dyslectic -unimpaired -important -alpha -beta -big -burning -cardinal -chief -consequential -Copernican -distinguished -grand -grave -great -historic -measurable -serious -strategic -unimportant -inconsequent -immaterial -fiddling -lightweight -potty -impressive -amazing -arresting -astonishing -baronial -dazzling -dramatic -expansive -formidable -gallant -brilliant -grandiose -palatial -signal -thundering -unimpressive -unimposing -noticeable -broad -detectable -discernible -marked -noted -unnoticeable -insignificant -improved -built -developed -landscaped -unimproved -dirt -scrub -cleared -improved -uncleared -unimproved -inaugural -exaugural -valedictory -inboard -outboard -portable -inbred -interbred -outbred -inclined -apt -fond -prone -disinclined -afraid -antipathetic -reluctant -incoming -outgoing -incoming -inbound -designate -elect -future -in -inflowing -inpouring -outgoing -outbound -effluent -out -past -inductive -deductive -deducible -illative -illative -inferential -indulgent -decadent -dissipated -epicurean -gay -hedonic -intemperate -overindulgent -pampering -nonindulgent -austere -blue -corrective -monkish -renunciant -severe -industrial -developed -industrialized -postindustrial -nonindustrial -developing -unindustrialized -infectious -catching -contagious -corrupting -noninfectious -noncommunicable -infernal -chthonian -Hadean -Stygian -supernal -informative -advisory -exemplifying -newsy -revealing -uninformative -newsless -gnostic -agnostic -nescient -informed -abreast -advised -conversant -educated -hep -knowing -knowledgeable -privy -uninformed -clueless -ignorant -innocent -newsless -unadvised -uninstructed -unread -ingenuous -candid -undistorted -disingenuous -distorted -inhabited -colonized -haunted -occupied -peopled -populated -populous -underpopulated -uninhabited -abandoned -depopulated -unoccupied -unpeopled -lonely -unsettled -inheritable -ancestral -familial -monogenic -polygenic -inheriting -nee -noninheritable -acquired -congenital -nonhereditary -nurtural -inhibited -smothered -uninhibited -abandoned -earthy -unrepressed -unsuppressed -injectable -uninjectable -injured -disjointed -eviscerate -hurt -lacerate -raw -uninjured -intact -uncut -unharmed -unwounded -innocent -absolved -acquitted -blameless -guilty -blameworthy -bloodguilty -chargeable -criminal -delinquent -finable -punishable -inspiring -ennobling -uninspiring -instructive -clarifying -demonstrative -didactic -doctrinaire -educative -educational -explanatory -expository -interpretative -ostensive -preachy -uninstructive -edifying -unedifying -enlightening -unenlightening -integrated -desegrated -interracial -mainstreamed -segregated -isolated -separate -sequestered -white -integrated -coordinated -embedded -incorporated -introjected -nonintegrated -blended -alloyed -homogenized -unblended -unhomogenized -combined -compounded -conglomerate -occluded -one -uncombined -uncompounded -integrative -combinative -compositional -consolidative -endogenic -disintegrative -clastic -decompositional -intellectual -highbrow -rational -reflective -good -sophisticated -nonintellectual -lowbrow -mindless -intelligent -agile -apt -brainy -bright -natural -quick -prehensile -scintillating -searching -unintelligent -brainless -intelligible -unintelligible -slurred -intended -conscious -deliberate -intentional -unintended -accidental -causeless -unintentional -designed -fashioned -undesigned -intensifying -aggravating -augmentative -deepening -heightening -moderating -alleviative -analgesic -tempering -weakening -interspecies -intraspecies -interested -curious -uninterested -apathetic -blase -dismissive -dulled -interesting -absorbing -entertaining -amusing -intriguing -newsworthy -uninteresting -boring -insipid -narcotic -pedestrian -ponderous -putdownable -intramural -internal -extramural -intercollegiate -intermural -interscholastic -outside -intrinsic -inner -extrinsic -adventitious -adscititious -alien -external -extraneous -introspective -extrospective -introversive -introvertish -extroversive -extrovert -extrovertish -ambiversive -intrusive -encroaching -interfering -unintrusive -intrusive -intruding -protrusive -beetle -bellied -obtrusive -jutting -overshot -starting -underhung -ventricose -igneous -aqueous -intrusive -irruptive -extrusive -volcanic -invasive -aggressive -confined -invasive -noninvasive -invigorating -animating -bracing -corroborant -exhilarating -renewing -debilitating -debilitative -draining -inviting -invitatory -tantalizing -tantalizing -uninviting -unattractive -ironed -pressed -smoothed -unironed -roughdried -unpressed -wrinkled -unsmoothed -unwrinkled -isotropic -identical -anisotropic -aeolotropic -glad -gladsome -sad -bittersweet -doleful -heavyhearted -melancholy -pensive -tragic -tragicomic -joyful -beatific -overjoyed -sorrowful -anguished -bereaved -bitter -brokenhearted -dolorous -elegiac -grievous -lamenting -lugubrious -mournful -sad -woebegone -joyous -ecstatic -elated -gay -gay -joyless -funereal -mirthless -unsmiling -juicy -lush -sappy -juiceless -sapless -just -conscionable -fitting -retributive -rightful -unjust -actionable -wrongful -merited -condign -unmerited -gratuitous -undeserved -keyed -keyless -kind -benignant -benign -charitable -gentle -kindhearted -unkind -cutting -harsh -hurtful -unkindly -knowable -unknowable -transcendent -known -celebrated -identified -legendary -proverbial -unknown -chartless -unbeknown -undiagnosed -undiscovered -unidentified -understood -appreciated -interpreted -ununderstood -misunderstood -uncomprehended -undigested -ungrasped -labeled -unlabeled -lamented -unlamented -aerial -marine -oceangoing -oceanic -offshore -oversea -suboceanic -laureled -unlaureled -large -ample -astronomic -bigger -biggish -bouffant -broad -bulky -capacious -colossal -deep -double -enormous -cosmic -elephantine -epic -extensive -gigantic -great -grand -huge -hulking -humongous -macroscopic -macro -massive -massive -monstrous -mountainous -outsize -overlarge -plumping -rangy -super -titanic -volumed -voluminous -whacking -small -atomic -subatomic -bantam -bitty -dinky -dwarfish -elfin -gnomish -infinitesimal -lesser -microscopic -micro -miniature -minuscule -puny -slender -smaller -smallish -undersize -greater -lesser -lawful -unlawful -lawless -wrongful -leaded -antiknock -unleaded -leaky -drafty -drippy -oozing -holey -tight -airtight -dripless -hermetic -leakproof -rainproof -snug -watertight -caulked -chinked -uncaulked -leavened -unleavened -leeward -downwind -windward -upwind -legal -judicial -jural -lawful -ratified -statutory -illegal -amerciable -banned -bootleg -criminal -dirty -embezzled -extrajudicial -extralegal -hot -illegitimate -ineligible -misbranded -penal -unratified -legible -clean -clear -illegible -dirty -indecipherable -deciphered -undeciphered -biological -begotten -natural -adoptive -foster -legitimate -morganatic -true -illegitimate -adulterine -base -bastardly -fatherless -unlawful -leptorrhine -catarrhine -platyrrhine -leptosporangiate -eusporangiate -like -suchlike -unlike -alike -unalike -like -unlike -likely -apt -probable -promising -unlikely -farfetched -last -outside -probable -equiprobable -presumptive -verisimilar -improbable -supposed -limbed -boughed -limbless -boughless -limited -minor -narrow -unlimited -bottomless -oceanic -untrammeled -lineal -matrilineal -patrilineal -unilateral -collateral -linear -bilinear -nonlinear -lined -unlined -listed -unlisted -literal -denotative -figurative -analogical -extended -metaphorical -metonymic -poetic -synecdochic -tropical -literate -belletristic -literary -illiterate -literate -illiterate -analphabetic -preliterate -semiliterate -semiliterate -live -unfilmed -recorded -canned -filmed -prerecorded -taped -livable -habitable -unlivable -uninhabitable -liveried -unliveried -loaded -live -undischarged -unloaded -blank -dud -loamy -loamless -local -localized -topical -general -systemic -epidemic -epiphytotic -epizootic -pandemic -pestilent -ecdemic -endemic -enzootic -gloved -gauntleted -gloveless -hatted -turbaned -hatless -guided -unguided -legged -leglike -legless -logical -dianoetic -formal -ratiocinative -illogical -absurd -inconsequential -intuitive -extended -outspread -outstretched -sprawly -stretched -unextended -mini -midi -maxi -lossy -lossless -long -elongate -elongated -extendible -far -lank -oblong -polysyllabic -stretch -short -abbreviated -close -curtal -shortish -snub -stubby -telescoped -truncate -long -agelong -bimestrial -chronic -daylong -durable -endless -hourlong -lifelong -longish -longitudinal -longstanding -monthlong -nightlong -perennial -weeklong -yearlong -short -abbreviated -brief -clipped -fleeting -long -short -long -short -lengthwise -axial -linear -longitudinal -crosswise -cross -lidded -lidless -loose -baggy -flyaway -tight -choky -clenched -close -skintight -viselike -constricted -narrowed -pinched -stenosed -unconstricted -open -lost -mislaid -gone -missing -squandered -stray -straying -found -recovered -lost -cursed -destroyed -saved -blessed -ransomed -rescued -ransomed -salvageable -lost -confiscate -won -loud -big -blaring -clarion -deafening -earthshaking -shattering -shouted -vocal -soft -dull -euphonious -gentle -hushed -little -low -murmuring -murmurous -full -booming -grumbling -plangent -rich -orotund -heavy -sounding -thin -pale -piano -pianissimo -forte -fortemente -fortissimo -hardened -soft -lovable -adorable -angelic -cuddlesome -hateful -abominable -unlovable -liked -likable -disliked -dislikable -unlikable -loved -admired -adored -beloved -cherished -favored -unloved -alienated -bereft -despised -disinherited -jilted -loveless -loving -adoring -affectionate -amative -amatory -attached -captivated -enamored -idolatrous -loverlike -overfond -tenderhearted -uxorious -unloving -cold -loveless -detached -unromantic -lowercase -little -uppercase -capital -lucky -apotropaic -hot -serendipitous -unlucky -hexed -lyric -dramatic -made -unmade -magnetic -attractable -antimagnetic -magnetic -geographic -true -magnetic -nonmagnetic -major -better -minor -major -minor -major -minor -major -minor -major -minor -major -leading -minor -insignificant -secondary -major -minor -majuscule -majuscular -minuscule -manageable -administrable -controllable -directed -steerable -unmanageable -indocile -uncheckable -manly -unmanly -effeminate -womanish -male -male -antheral -phallic -priapic -female -female -pistillate -androgynous -bisexual -gynandromorphic -hermaphroditic -intersexual -pseudohermaphroditic -unisex -manned -unmanned -pilotless -marked -asterisked -barred -scarred -masked -unmarked -unasterisked -branded -unbranded -married -joined -mated -ringed -wed -unmarried -divorced -mateless -unwed -widowed -mated -paired -unmated -mateless -masculine -butch -male -mannish -feminine -fair -female -maidenlike -womanly -matronly -womanlike -unwomanly -hoydenish -mannish -unfeminine -masculine -feminine -neuter -matched -coordinated -duplicate -mated -mismatched -odd -material -crucial -immaterial -mature -adult -abloom -fruiting -headed -marriageable -overblown -prime -immature -adolescent -embryonic -inchoative -larval -prepubescent -prepupal -pubescent -pupal -underdeveloped -mature -autumnal -mellow -ripe -immature -adolescent -babyish -childish -ripe -aged -mellow -overripe -green -unaged -seasonal -seasonable -unseasonable -seasoned -cured -unseasoned -uncured -premature -maximal -supreme -minimal -borderline -negligible -nominal -stripped -meaningful -meaty -meaning -purposeful -meaningless -empty -insignificant -mindless -nonsense -measurable -immeasurable -abysmal -illimitable -meaty -meatless -mechanical -automatic -mechanic -mechanistic -mechanized -windup -nonmechanical -nonmechanistic -unmechanized -melodious -ariose -canorous -cantabile -dulcet -lyrical -unmelodious -tuneful -tuneless -membered -memberless -mined -unmined -musical -chanted -liquid -singable -unmusical -musical -philharmonic -unmusical -melted -dissolved -fusible -molten -thawed -unmelted -frozen -undissolved -merciful -merciless -cutthroat -mortal -pitiless -tigerish -metabolic -ametabolic -mild -gentle -moderate -intense -aggravated -bad -brutal -cold -concentrated -consuming -deep -exquisite -extreme -fierce -intensified -intensive -main -profound -raging -screaming -severe -smart -strong -terrific -thick -unabated -violent -intensive -extensive -involved -active -concerned -embroiled -engaged -implicated -uninvolved -unconcerned -military -expeditionary -martial -combatant -noncombatant -civilian -civil -noncombatant -military -militaristic -soldierly -warlike -unmilitary -unsoldierly -mitigated -alleviated -lessened -quenched -unmitigated -arrant -bally -bodacious -undiminished -tempered -untempered -unmoderated -tempered -curable -sunbaked -untempered -brittle -mobile -airborne -ambulant -floating -maneuverable -mechanized -motile -movable -perambulating -racy -raisable -rangy -rotatable -seaborne -transplantable -versatile -waterborne -immobile -immovable -nonmotile -stiff -portable -movable -takeout -unportable -removable -dismissible -extractable -irremovable -tenured -metallic -aluminiferous -antimonial -argentiferous -auriferous -bimetal -bronze -gold -metallike -silver -tinny -nonmetallic -metalloid -metamorphic -epimorphic -hemimetabolous -heterometabolous -holometabolic -metamorphous -changed -nonmetamorphic -ametabolic -moderate -average -cautious -fair -indifferent -limited -minimalist -modest -immoderate -abnormal -exaggerated -excessive -exorbitant -extraordinary -extreme -extreme -extremist -far -stark -modern -contemporary -neo -ultramodern -moderne -nonmodern -antebellum -medieval -Victorian -modest -coy -decent -decent -shamefaced -immodest -indecent -modest -retiring -immodest -important -overweening -modified -adapted -restricted -unmodified -unadapted -unrestricted -modulated -softened -unmodulated -flat -molar -molecular -monoclinous -hermaphroditic -diclinous -monoecious -autoicous -heteroicous -synoicous -paroicous -dioecious -monophonic -homophonic -monodic -polyphonic -monogamous -monandrous -monogynous -polygamous -bigamous -polyandrous -polygynous -monolingual -multilingual -bilingual -polyglot -trilingual -monovalent -polyvalent -univalent -bivalent -multivalent -monotonic -nonmonotonic -monovalent -polyvalent -moral -chaste -clean -moralistic -righteous -incorrupt -immoral -debauched -disgraceful -scrofulous -licit -illicit -adulterous -unlawful -principled -unprincipled -many -galore -numerous -some -umpteen -few -much -overmuch -some -such -untold -little -small -more -less -most -least -more -fewer -less -most -fewest -mortal -earthborn -immortal -amaranthine -deathless -deific -motivated -actuated -driven -unmotivated -causeless -motiveless -motorized -bimotored -trimotored -unmotorized -moved -sick -unmoved -moving -affecting -haunting -heartwarming -stirring -unmoving -unaffecting -moving -afoot -ahorse -oncoming -automotive -awheel -blown -aflare -kinetic -mobile -restless -wiggly -vibratory -nonmoving -inactive -becalmed -fixed -frozen -inert -sitting -stationary -moving -animated -still -mown -unmown -seamanlike -unseamanlike -lubberly -continental -transcontinental -intercontinental -worldwide -national -nationalist -international -global -internationalist -multinational -supranational -interstate -intrastate -natural -earthy -unnatural -violent -natural -unbleached -artificial -arranged -bionic -bleached -cardboard -celluloid -conventionalized -dummy -ersatz -factitious -fake -near -painted -natural -physical -supernatural -apparitional -eerie -eldritch -elfin -charming -marvelous -metaphysical -necromantic -nonnatural -talismanic -transmundane -witchlike -natural -sharp -flat -ultimate -crowning -eventual -final -supreme -proximate -immediate -necessary -essential -incumbent -needed -obligatory -unnecessary -excess -gratuitous -inessential -spare -net -clear -gross -overall -neurotic -abulic -compulsive -delusional -disturbed -hypochondriac -hysteric -megalomaniacal -monomaniacal -nymphomaniacal -obsessional -pathological -phobic -psychosomatic -schizoid -unneurotic -together -nice -good -pleasant -nasty -dirty -grotty -hateful -nidicolous -nidifugous -noble -dignifying -exalted -greathearted -ignoble -base -currish -noble -aristocratic -august -coroneted -imperial -kingly -monarchal -princely -queenly -royal -lowborn -base -common -ignoble -normal -average -median -modal -natural -regular -typical -abnormal -aberrant -anomalous -antidromic -atypical -brachydactylic -defective -freakish -kinky -subnormal -supernormal -vicarious -normal -abnormal -exceptional -hypertensive -hypotensive -normotensive -normal -paranormal -parapsychological -psychic -psychokinetic -supernormal -north -northbound -northerly -northerly -northernmost -northeastern -northeasterly -northeastward -northwestern -northwesterly -northwestward -south -southbound -southerly -southerly -southernmost -southeast -southeasterly -southeastward -southwest -southwesterly -southwestward -northern -boreal -septrional -southern -austral -meridional -northern -blue -Union -Yankee -southern -Confederate -grey -nosed -noseless -noticed -detected -unnoticed -disregarded -ignored -overlooked -unobserved -unperceived -detected -perceived -sensed -heard -undetected -undiscovered -unobserved -determined -ascertained -undetermined -unexplained -noxious -baneful -corrupting -vesicatory -innocuous -innoxious -obedient -acquiescent -conformable -dutiful -disobedient -contrary -fractious -froward -recusant -obtrusive -unobtrusive -objective -clinical -impersonal -verifiable -subjective -personal -prejudiced -unobjective -obligated -beholden -indebted -indebted -supposed -tributary -unobligated -unbeholden -obligate -facultative -obvious -apparent -axiomatic -demonstrable -frank -transparent -unobvious -unapparent -unprovable -obstructed -barricaded -blocked -choked -deadlocked -impeded -occluded -stopped -stuffy -thrombosed -unobstructed -clear -patent -unimpeded -unclogged -occupied -busy -filled -unoccupied -free -spare -occupied -unoccupied -relinquished -offensive -abhorrent -charnel -creepy -disgusting -ghoulish -hideous -objectionable -rank -scrimy -verminous -inoffensive -innocuous -savory -unsavory -odoriferous -offensive -abusive -inoffensive -offenseless -offensive -antipersonnel -assaultive -incursive -marauding -defensive -antiaircraft -antisubmarine -antitank -defending -offending -sinning -offensive -unoffending -apologetic -defensive -unapologetic -official -authoritative -formal -formalized -semiofficial -unofficial -drumhead -informal -unauthorized -unsanctioned -confirmed -official -unconfirmed -unofficial -established -entrenched -grooved -legitimate -official -recognized -unestablished -unrecognized -conditioned -unconditioned -naive -offstage -onstage -old -antediluvian -antique -auld -hoary -immemorial -longtime -patched -secondhand -sunset -yellow -new -fresh -hot -newborn -newfound -novel -parvenu -recent -revolutionary -rising -sunrise -untested -unused -virgin -young -old -aged -aged -aging -ancient -anile -centenarian -darkened -doddering -emeritus -grey -nonagenarian -octogenarian -oldish -overage -sexagenarian -venerable -young -adolescent -infantile -boyish -childlike -early -girlish -junior -little -newborn -preteen -puppyish -tender -youngish -youthful -on -connected -off -disconnected -on -off -onside -offside -open -ajar -shut -open -opened -unstoppered -yawning -closed -blocked -drawn -stoppered -nonopening -open -agape -agaze -yawning -closed -blinking -compressed -squinched -spaced -leaded -unspaced -unleaded -enclosed -basined -besieged -boxed -capsulate -clathrate -closed -coarctate -embedded -fencelike -included -involved -surrounded -unenclosed -hypaethral -open -unfenced -tanned -untanned -tapped -abroach -untapped -open -closed -operational -active -effective -nonoperational -opportune -good -timely -inopportune -inconvenient -opposable -unopposable -opposed -conflicting -unopposed -opposite -alternate -optimistic -bullish -cheerful -sanguine -pessimistic -bearish -demoralized -oral -buccal -buccal -aboral -actinal -abactinal -orderly -disorderly -boisterous -mobbish -raucous -ordered -consecutive -progressive -disordered -organized -methodical -disorganized -broken -chaotic -scrambled -unmethodical -unstuck -organized -arranged -configured -corporate -reorganized -unorganized -uncoordinated -unformed -unincorporated -structured -unstructured -ambiguous -unregulated -ordinary -average -banausic -characterless -common -commonplace -everyday -indifferent -extraordinary -bonzer -exceeding -extraordinaire -fantastic -phenomenal -frightful -great -one -preternatural -pyrotechnic -rare -remarkable -some -special -wonderworking -organic -inorganic -organic -integrated -nonsynthetic -inorganic -amorphous -artificial -mineral -holistic -atomistic -arranged -laid -placed -disarranged -disarrayed -disturbed -misplaced -oriented -adjusted -bound -directed -headed -homeward -minded -unoriented -alienated -confused -orienting -aligning -dimensioning -familiarizing -homing -disorienting -confusing -estranging -stunning -stupefying -original -freehand -fresh -germinal -innovative -newfangled -underivative -unoriginal -banal -bromidic -cliched -cold -slavish -orthodox -antiheretical -canonic -conforming -conventional -traditional -unreformed -unorthodox -dissentient -dissident -iconoclastic -nonconforming -Reformed -outdoor -alfresco -outdoorsy -indoor -outside -extracurricular -extracurricular -right -inside -wrong -covered -ariled -awninged -beaded -blanketed -canopied -cloaked -crusted -dabbled -drenched -dusty -muffled -peritrichous -plastered -overgrown -sealed -smothered -splashy -thickspread -tiled -white -bare -bald -naked -undraped -unroofed -coated -backed -glazed -oily -uncoated -roofed -roofless -leafy -bifoliate -bowery -foliaceous -foliate -foliolate -ivied -leafed -leaflike -petallike -unifoliate -leafless -aphyllous -defoliate -scapose -lipped -bilabiate -labiate -lipless -overt -bald -naked -undisguised -visible -covert -backstair -black -clandestine -secret -collusive -cloaked -secret -subterranean -undisclosed -paid -cashed -compensable -compensated -mercenary -postpaid -square -unpaid -buckshee -complimentary -outstanding -uncompensated -painful -aching -agonized -agonizing -biting -chafed -poignant -itchy -racking -sensitive -traumatic -painless -painted -finished -stained -whitewashed -unpainted -bare -unoiled -unstained -painted -rouged -unpainted -unrouged -delineated -depicted -described -diagrammatic -undelineated -undepicted -undrawn -paintable -unpaintable -palatable -unpalatable -brackish -distasteful -palpable -perceptible -impalpable -elusive -parallel -antiparallel -collateral -nonconvergent -oblique -bias -catacorner -crabwise -diagonal -nonparallel -perpendicular -normal -orthogonal -right -pardonable -excusable -expiable -minor -unpardonable -deadly -inexcusable -inexpiable -excusable -justifiable -inexcusable -indefensible -parental -filial -daughterly -partial -biased -impartial -disinterested -dispassionate -indifferent -indifferent -particulate -nonparticulate -passable -navigable -negotiable -surmountable -traversable -impassable -unsurmountable -unnavigable -untraversable -passionate -ablaze -ardent -choleric -fanatic -lustful -wild -passionless -platonic -unimpassioned -past -ago -ancient -bygone -chivalric -early -erstwhile -former -historic -last -late -olden -other -prehistoric -then -ultimo -present -existing -immediate -instant -future -approaching -early -emerging -proximo -born -hatched -unborn -unhatched -parented -unparented -orphaned -fatherless -motherless -paternal -fatherly -paternalistic -maternal -maternalistic -motherlike -motherly -wifely -husbandly -patient -diligent -enduring -forbearing -tolerant -unhurried -impatient -restive -unforbearing -patriarchal -patriarchic -patricentric -matriarchal -matriarchic -matricentric -patronized -unpatronized -briefless -packaged -prepackaged -unpackaged -loose -paved -sealed -unpaved -patriotic -chauvinistic -unpatriotic -peaceful -halcyon -irenic -nonbelligerent -pacific -pacifist -peaceable -unpeaceful -belligerent -militant -stormy -unpeaceable -penitent -contrite -penitential -impenitent -perceptive -acute -apprehensive -apperceptive -insightful -observant -subtle -understanding -unperceptive -blind -unobservant -perceptible -detectable -discernible -faint -palpable -perceivable -recognizable -sensible -imperceptible -impalpable -incognizable -indiscernible -subliminal -unobservable -perfect -clean -clear -cold -complete -down -errorless -faultless -flawless -ideal -idealized -idyllic -mint -perfectible -pluperfect -uncorrupted -imperfect -blemished -broken -corrupt -defective -imperfectible -irregular -perishable -biodegradable -decayable -imperishable -durable -imputrescible -permanent -abiding -ageless -indissoluble -standing -impermanent -acting -ephemeral -episodic -evanescent -improvised -interim -shipboard -temporal -terminable -working -persistent -caducous -deciduous -reversible -correctable -rechargeable -irreversible -permanent -reversible -nonreversible -revocable -rescindable -reversible -irrevocable -sealed -permissible -impermissible -forbidden -unmentionable -untouchable -admissible -admittable -allowable -permissible -inadmissible -impermissible -permissive -indulgent -unpermissive -permissive -bailable -preventive -blockading -clogging -deterrent -frustrating -precautionary -preclusive -preemptive -prohibitive -perplexed -baffled -metagrobolized -questioning -stuck -unperplexed -unbaffled -personal -individual -individualized -own -personalized -private -impersonal -nonpersonal -persuasive -coaxing -cogent -compelling -glib -dissuasive -admonitory -discouraging -penetrable -impenetrable -dense -permeable -porous -semipermeable -impermeable -retentive -pervious -receptive -impervious -fast -colorfast -greaseproof -mothproof -proof -resistant -runproof -soundproof -petalous -gamopetalous -polypetalous -salverform -apetalous -puncturable -punctureless -psychoactive -hallucinogenic -psychedelic -nonpsychoactive -physical -animal -bodily -material -personal -physiologic -somatogenic -mental -intellectual -moral -psychic -psychogenic -psychological -monotheistic -polytheistic -pious -devotional -godly -prayerful -impious -godless -secular -religious -religious -churchgoing -churchly -devout -interfaith -irreligious -atheistic -heathen -lapsed -nonobservant -placable -appeasable -mitigable -implacable -grim -unmitigable -plain -patterned -banded -blotched -brindled -burled -checked -dappled -dotted -figured -floral -freckled -laced -marbled -moire -patched -pointillist -pinstriped -ringed -slashed -sprigged -streaked -striped -tessellated -veined -plain -austere -bare -chaste -dry -dry -featureless -homely -inelaborate -literal -simple -tailored -vanilla -fancy -aureate -baroque -busy -dressy -crackle -damascene -damask -elaborate -embattled -fanciful -fantastic -lacy -puff -rococo -vermicular -planned -contrived -preset -unplanned -casual -casual -unpremeditated -studied -unstudied -candid -plausible -arguable -glib -implausible -improbable -pleasant -beautiful -dulcet -enjoyable -grateful -idyllic -unpleasant -acerb -beastly -dour -dreadful -embarrassing -harsh -harsh -hot -afflictive -rebarbative -sharp -ungrateful -unhappy -pleased -amused -chuffed -delighted -gratified -displeased -annoyed -exasperated -disgusted -frowning -offended -pleasing -admirable -charming -delightful -easy -fabulous -good -gratifying -ingratiating -sweet -displeasing -disconcerting -exasperating -pointed -acanthoid -acuate -barreled -fusiform -nibbed -peaked -pyramidal -sharpened -spiked -spikelike -pointless -blunt -acute -obtuse -polished -bright -finished -unpolished -raw -rough -unburnished -politic -expedient -sagacious -impolitic -inexpedient -political -governmental -semipolitical -nonpolitical -apolitical -ponderable -assessable -imponderable -popular -fashionable -favorite -hot -touristed -unpopular -pro -anti -positive -affirmative -constructive -negative -antagonistic -perverse -neutral -neutralized -viewless -plus -nonnegative -positive -minus -negative -positive -negative -positive -negative -possible -accomplishable -affirmable -attainable -contingent -feasible -mathematical -impossible -hopeless -impracticable -out -unachievable -potent -equipotent -multipotent -impotent -ineffective -impuissant -potent -impotent -powerful -almighty -coercive -compelling -mighty -muscular -potent -puissant -regent -regnant -powerless -feeble -helpless -weak -powered -supercharged -unpowered -influential -authoritative -potent -prestigious -uninfluential -placental -transplacental -aplacental -planted -cropped -naturalized -potbound -quickset -seeded -unplanted -uncropped -unseeded -plowed -tilled -unplowed -fallow -untilled -cultivated -uncultivated -uncultivable -potted -unpotted -practical -applicative -functional -interoperable -operable -serviceable -unimaginative -working -impractical -crazy -meshugge -quixotic -unfunctional -unwieldy -precise -dead -fine -finespun -meticulous -microscopic -nice -very -imprecise -general -precocious -advanced -retarded -backward -imbecile -moronic -cretinous -delayed -predictable -foreseeable -inevitable -unpredictable -aleatory -capricious -episodic -unforeseeable -premeditated -aforethought -unpremeditated -impulsive -prepared -braced -embattled -equipped -preconditioned -precooked -processed -ready -spread -up -unprepared -prescription -nonprescription -present -attendant -existing -here -omnipresent -absent -away -introuvable -truant -ostentatious -flaunty -flamboyant -unostentatious -quiet -pretentious -arty -grandiloquent -grandiose -sententious -sesquipedalian -unpretentious -honest -modest -unpompous -primary -capital -direct -firsthand -original -particular -secondary -alternate -auxiliary -collateral -indirect -secondhand -standby -thirdhand -tributary -utility -vicarious -basic -basal -elementary -fundamental -grassroots -radical -incidental -omissible -parenthetic -peripheral -secondary -private -clannish -cloistered -close -confidential -confidential -insular -nonpublic -offstage -privy -semiprivate -public -national -open -semipublic -unexclusive -exclusive -alone -inner -inside -selective -inclusive -comprehensive -privileged -sweetheart -underprivileged -deprived -underclass -productive -amentiferous -arable -fecund -rich -unproductive -bootless -dry -nonproductive -generative -consumptive -exploitative -reproducible -duplicable -unreproducible -inimitable -unrepeatable -professional -nonrecreational -professed -nonprofessional -amateur -lay -professional -unprofessional -amateurish -profitable -bankable -fat -gainful -economic -lucrative -unprofitable -dead -lean -marginal -unremunerative -profound -deep -thoughtful -superficial -apparent -dilettante -facile -glib -looking -shallow -prognathous -opisthognathous -chinless -progressive -advanced -advancing -modernized -regressive -atavistic -retrograde -returning -unmodernized -progressive -degressive -regressive -pronounceable -rolled -unpronounceable -proper -becoming -correct -correct -fitting -halal -kosher -priggish -improper -indecent -wrong -prophetic -adumbrative -apocalyptic -clairvoyant -Delphic -divinatory -fateful -precursory -predictive -unprophetic -nonprognosticative -unpredictive -prospective -likely -future -retrospective -protected -bastioned -battlemented -burglarproof -covert -moated -shielded -snug -stormproof -weatherproof -unprotected -exposed -naked -unshielded -protective -cautionary -contraceptive -custodial -evasive -overprotective -preservative -protecting -restrictive -unprotective -proud -arrogant -beaming -big -bigheaded -boastful -dignified -disdainful -conceited -overproud -pleased -humble -broken -meek -proved -established -evidenced -tested -verified -unproved -unverified -provident -careful -farseeing -forehanded -forethoughtful -improvident -short -thriftless -unforethoughtful -provocative -agitative -challenging -charged -incendiary -rousing -unprovocative -disarming -noninflammatory -prudent -circumspect -judicious -provident -prudential -imprudent -injudicious -rash -punctual -prompt -timely -unpunctual -behindhand -belated -benighted -punished -unpunished -uncorrected -punitive -correctional -penal -penitentiary -retaliatory -rehabilitative -purebred -pedigree -crossbred -bigeneric -hybrid -underbred -pure -immaculate -white -impure -defiled -pure -axenic -clean -clean -fine -native -plain -pristine -sublimate -unadulterated -unalloyed -uncontaminated -virginal -impure -adulterate -alloyed -bastardized -contaminated -dirty -unpurified -contaminated -uncontaminated -purposeful -businesslike -purposeless -adrift -desultory -qualified -unqualified -quack -trained -disciplined -drilled -housebroken -untrained -primitive -undisciplined -qualified -conditional -hedged -limited -unqualified -categoric -clean -cool -outright -qualitative -soft -quantitative -decimal -duodecimal -numeric -quantifiable -valued -vicenary -questionable -alleged -apocryphal -debatable -doubtful -equivocal -fishy -impugnable -unquestionable -acknowledged -mathematical -unimpeachable -quiet -noiseless -silent -stilly -tiptoe -noisy -blatant -abuzz -clangorous -clanking -clattery -creaky -rackety -reedy -stertorous -swishy -thundering -whirring -restful -slumberous -restless -quiet -quiescent -untroubled -unquiet -disruptive -squally -random -ergodic -haphazard -stochastic -nonrandom -purposive -rational -coherent -demythologized -intelligent -reasonable -irrational -blind -reasonless -nonrational -superstitious -emotional -cerebral -racial -biracial -interracial -multiracial -racist -nonracial -reactive -activated -labile -oxidizable -thermolabile -unstable -unreactive -inactive -inert -noble -stable -ready -fit -prompt -ripe -waiting -unready -napping -unripe -real -actual -actual -objective -historical -unreal -dreamed -envisioned -fabled -fabricated -fabulous -fanciful -fantastic -hallucinatory -illusional -illusive -real -proper -true -unreal -deceptive -dreamlike -phantom -real -nominal -realistic -hardheaded -graphic -living -veridical -virtual -unrealistic -chimerical -delusive -fantastic -kafkaesque -phantasmagoric -reasonable -commonsense -healthy -tenable -unreasonable -counterintuitive -indefensible -mindless -undue -reciprocal -bilateral -trilateral -correlative -interactional -reciprocative -reciprocative -nonreciprocal -nonreciprocating -unanswered -refined -civilized -couth -dainty -debonair -finespun -gentlemanlike -ladylike -patrician -overrefined -unrefined -agrestic -artless -boorish -coarse -crass -low -robust -rough -ungentlemanly -unladylike -processed -cured -milled -unprocessed -natural -streaming -unvulcanized -refined -unrefined -treated -activated -aerated -burned -doped -fumed -proofed -untreated -raw -oiled -unoiled -treated -bandaged -dosed -dressed -untreated -recoverable -redeemable -retrievable -unrecoverable -irretrievable -lost -regenerate -reformed -unregenerate -cussed -impenitent -unconverted -registered -certified -recorded -unregistered -unlisted -registered -unregistered -regular -lawful -official -standard -timed -uniform -weak -irregular -asymmetrical -casual -improper -randomized -strong -regular -irregular -regulated -unregulated -remediable -irremediable -renewable -unrenewable -rentable -unrentable -reparable -maintainable -irreparable -repeatable -unrepeatable -repetitive -iterative -nonrepetitive -printable -unprintable -requested -unrequested -unasked -rhymed -alliterative -assonant -unrhymed -uniform -single -multiform -polymorphic -periodic -cyclic -oscillatory -diurnal -daily -nightly -weekly -semiweekly -hourly -fortnightly -annual -semiannual -biennial -triennial -monthly -bimonthly -semimonthly -semestral -midweekly -aperiodic -noncyclic -nonoscillatory -regular -standing -irregular -related -affinal -agnate -akin -allied -descendant -enate -kindred -unrelated -unconnected -related -affiliated -cognate -connate -coreferent -correlative -corresponding -unrelated -misrelated -orthogonal -uncorrelated -relevant -applicable -germane -pertinent -irrelevant -digressive -extraneous -inapplicable -moot -mindful -careful -evocative -unmindful -amnesic -replaceable -exchangeable -irreplaceable -representational -delineative -eidetic -figural -mimetic -naturalistic -nonrepresentational -abstract -conventional -geometric -hieratic -protogeometric -semiabstract -representative -allegorical -emblematic -nonrepresentative -reputable -esteemed -estimable -redoubtable -respected -disreputable -discreditable -discredited -louche -seamy -receptive -acceptive -admissive -assimilative -hospitable -unreceptive -closed -reconcilable -harmonizable -resolvable -irreconcilable -hostile -inconsistent -reserved -aloof -diffident -indrawn -unreserved -reserved -booked -bookable -unreserved -unbooked -resistible -irresistible -overpowering -resolute -bent -determined -desperate -firm -foursquare -spartan -stalwart -undaunted -undeterred -irresolute -discouraged -infirm -unstable -vacillant -respectable -decent -presentable -upstanding -unrespectable -respectful -deferent -honorific -disrespectful -annihilating -contemptuous -contumelious -derisive -impious -impudent -undeferential -responsible -accountable -answerable -amenable -liable -trustworthy -irresponsible -carefree -feckless -idle -unaccountable -unreliable -responsive -answering -unresponsive -refractory -restrained -close -unexpansive -unrestrained -excessive -freewheeling -highflying -unbridled -unbuttoned -unhampered -restricted -circumscribed -closed -unrestricted -discretionary -open -restrictive -confining -inhibitory -limiting -regulative -sumptuary -suppressive -unrestrictive -emancipative -nonrestrictive -retentive -unretentive -reticulate -cancellate -crisscross -fretted -interconnected -lacy -meshed -networklike -nonreticulate -retractile -retractable -nonretractile -reflective -mirrorlike -reflecting -nonreflective -echoless -reflected -echoic -mirrored -unreflected -absorbed -reverberant -bright -clinking -echoing -hollow -jingling -live -resonant -tinkling -vibrant -unreverberant -anechoic -dead -dull -reverent -adoring -awed -respectful -irreverent -blasphemous -aweless -revived -recrudescent -redux -renewed -resurgent -resuscitated -revitalized -unrevived -awakened -aroused -unawakened -awed -overawed -unawed -aweless -revolutionary -counterrevolutionary -rewarding -bountied -rewardful -unrewarding -thankless -profitless -rhetorical -bombastic -flowery -empurpled -forensic -grandiloquent -oratorical -poetic -stylistic -unrhetorical -plainspoken -rhythmical -Adonic -cadenced -danceable -jazzy -lilting -measured -Sapphic -chantlike -syncopated -throbbing -unrhythmical -arrhythmic -nonrhythmic -unmeasured -ribbed -costate -riblike -ribless -rich -affluent -comfortable -poor -broke -destitute -moneyless -rich -poor -resourceless -rich -deluxe -lavish -poor -beggarly -slummy -moneyed -moneyless -solvent -insolvent -bankrupt -rich -lean -rimmed -rimless -handed -handless -handled -handleless -dextral -right -left -sinistral -ambidextrous -equipoised -right -conservative -oldline -reactionary -rightish -rightist -left -leftish -leftist -liberal -center -centrist -right -far -rightmost -starboard -left -leftmost -near -port -horned -antlered -bicorn -horny -hornless -right -ethical -wrong -condemnable -base -misguided -righteous -good -sound -unrighteous -sinful -robust -beefy -hardy -hardy -vigorous -frail -decrepit -round -bulblike -capitate -coccoid -cumuliform -discoid -moonlike -nutlike -ringlike -roundish -square -quadrate -squared -squarish -rounded -allantoid -annular -aspheric -auriform -bowfront -crescent -cycloid -cylindrical -disciform -domed -ellipsoid -hyperboloidal -lingulate -olivelike -parabolic -paraboloidal -pineal -plumlike -rotund -terete -umbrellalike -angular -angled -asteroid -bicuspid -cuspate -equiangular -isogonic -rectangular -triangular -tricuspid -unicuspid -oblate -prolate -rural -agrarian -agrestic -arcadian -campestral -countrified -hobnailed -urban -citified -urbanized -rusted -rusty -rustless -rustproof -undercoated -holy -beatified -Blessed -consecrated -hallowed -unholy -profane -sacred -divine -ineffable -inspirational -inviolable -numinous -religious -reverend -sacral -taboo -profane -laic -profanatory -sadistic -masochistic -safe -dangerous -breakneck -chancy -desperate -hazardous -insidious -mordacious -parlous -treacherous -safe -out -down -salable -marketable -marketable -unsalable -unmarketable -unmarketable -same -assonant -comparable -duplicate -homophonic -identical -one -synoptic -different -antithetic -assorted -contrary -contrasting -diametric -divergent -disparate -distinct -diverse -divers -opposite -several -variant -same -aforesaid -identical -other -different -another -different -new -opposite -opposite -opposite -otherwise -similar -akin -analogous -confusable -connatural -corresponding -quasi -sympathetic -dissimilar -sane -lucid -insane -amuck -balmy -brainsick -certifiable -crackbrained -crazed -fey -hebephrenic -lunatic -maniacal -maniclike -paranoid -psychopathic -psychotic -schizophrenic -satiate -jaded -satiable -insatiate -quenchless -unsated -unsatisfiable -sarcastic -barbed -black -corrosive -sardonic -satirical -saturnine -unsarcastic -satisfactory -adequate -alright -comforting -copacetic -passing -right -unsatisfactory -disappointing -failing -off -unacceptable -scalable -ascendable -unscalable -scholarly -academic -bookish -erudite -unscholarly -unlearned -unstudious -scientific -technological -unscientific -pseudoscientific -scrupulous -religious -unscrupulous -conscientious -unconscientious -conscienceless -sealed -unopened -unsealed -open -sealed -unsealed -wrapped -unwrapped -seaworthy -unseaworthy -airworthy -unairworthy -concealed -bushwhacking -dark -furtive -hidden -hidden -incognito -sealed -secret -sneaking -unconcealed -blatant -exhibitionistic -concealing -revealing -indicative -sectarian -denominational -nonsectarian -ecumenic -interchurch -nondenominational -undenominational -secure -insecure -overanxious -unassured -secure -assured -firm -sure -insecure -precarious -unguaranteed -secure -steady -tight -insecure -fastened -unfastened -unbarred -undone -insured -insurable -uninsured -uninsurable -seductive -alluring -corrupting -insidious -teasing -unseductive -uninviting -selfish -egotistic -unselfish -sharing -senior -elder -major -precedential -ranking -junior -minor -younger -sensational -lurid -scandalmongering -screaming -unsensational -sensible -insensible -anesthetic -asleep -sensitive -delicate -erogenous -excitable -irritable -radiosensitive -nociceptive -reactive -insensitive -dead -unreactive -sensitive -alive -huffy -oversensitive -insensitive -callous -dead -dull -insensible -soulless -sensitizing -desensitizing -numbing -sensory -extrasensory -clairvoyant -telegnostic -telepathic -sent -unsent -separate -apart -asunder -detached -discrete -disjoint -disjunct -isolable -unaccompanied -joint -clannish -concerted -conjoined -corporate -cosignatory -sanitary -hygienic -unsanitary -unhygienic -septic -abscessed -dirty -contaminative -purulent -infectious -putrefactive -septicemic -antiseptic -aseptic -bactericidal -cleansing -nonpurulent -uninfected -germfree -axenic -germy -unsterilized -adulterating -extraneous -purifying -ablutionary -antiseptic -detergent -serious -earnest -grave -overserious -real -thoughtful -sobering -solid -frivolous -airheaded -flighty -flippant -idle -light -trivial -playful -coltish -devilish -elfin -arch -kittenish -mocking -unplayful -selected -elect -unselected -serviceable -durable -functional -unserviceable -inoperable -unrepaired -resident -nonresident -settled -based -located -nonnomadic -relocated -unsettled -aimless -erratic -homeless -migrant -mobile -peripatetic -itinerant -rootless -unlocated -migratory -nonmigratory -settled -accomplished -appointed -determined -deterministic -firm -preconcerted -unsettled -doubtful -open -sexy -aroused -autoerotic -coquettish -erotic -blue -hot -intimate -juicy -lascivious -lecherous -leering -lubricious -orgiastic -oversexed -pornographic -provocative -raunchy -sexed -unsexy -sexless -sexless -undersexed -sexual -intersexual -sexed -unisexual -asexual -agamic -fissiparous -neuter -vegetal -castrated -altered -cut -spayed -uncastrated -entire -aphrodisiac -anaphrodisiac -estrous -monestrous -polyestrous -anestrous -diestrous -shapely -bosomy -callipygian -Junoesque -modeled -retrousse -unshapely -acromegalic -chunky -clubfooted -deformed -knobby -nodular -nodulose -shapeless -torulose -breasted -bosomed -breastless -formed -ductile -bacillar -biform -botuliform -catenulate -navicular -perfected -phylliform -precast -shaped -vermiform -unformed -amorphous -unshaped -shared -common -joint -unshared -exclusive -individual -undivided -shaven -beardless -unshaven -bearded -bestubbled -goateed -mustachioed -sheared -unsheared -sheathed -cased -clad -ironclad -podlike -unsheathed -shockable -unshockable -shod -booted -ironshod -roughshod -sandaled -slippered -unshod -barefoot -stockinged -calced -discalced -nearsighted -farsighted -hyperopic -telescopic -shrinkable -unshrinkable -sighted -seeing -blind -blinded -blindfold -dazzled -deuteranopic -eyeless -protanopic -tritanopic -signed -autographed -subscribed -unsigned -significant -momentous -epochal -earthshaking -evidential -fundamental -large -monumental -noteworthy -probative -operative -portentous -insignificant -flimsy -inappreciable -light -superficial -significant -nonsignificant -silenced -suppressed -unsilenced -simple -acerate -acuminate -apiculate -caudate -cordate -cuneate -deltoid -dolabriform -elliptic -ensiform -hastate -lanceolate -linear -lyrate -needled -obtuse -oblanceolate -oblong -obovate -orbiculate -ovate -pandurate -peltate -perfoliate -reniform -sagittate -spatulate -unlobed -compound -bilobate -binate -bipartite -bipinnate -bipinnatifid -cleft -conjugate -decompound -incised -lobed -palmate -palmatifid -parted -pedate -pinnate -pinnatifid -pinnatisect -quinquefoliate -radiate -ternate -trifoliate -trilobate -tripinnate -tripinnatifid -simple -simplex -simplistic -unanalyzable -uncomplicated -complex -analyzable -Byzantine -colonial -complicated -composite -compound -daedal -Gordian -interlacing -intricate -labyrinthine -multifactorial -multiplex -thickening -sincere -cordial -dear -honest -genuine -insincere -bootlicking -buttery -dissimulative -false -feigned -gilded -hypocritical -plausible -singular -plural -dual -singular -plural -cardinal -zero -one -two -three -four -five -six -seven -eight -nine -ten -eleven -twelve -thirteen -fourteen -fifteen -sixteen -seventeen -eighteen -nineteen -twenty -thirty -forty -fifty -sixty -seventy -eighty -ninety -hundred -thousand -million -billion -billion -trillion -trillion -zillion -ordinal -zero -zeroth -first -second -third -fourth -fifth -sixth -seventh -eighth -ninth -tenth -eleventh -twelfth -thirteenth -fourteenth -fifteenth -sixteenth -seventeenth -eighteenth -nineteenth -umpteenth -twentieth -thirtieth -fortieth -fiftieth -sixtieth -seventieth -eightieth -ninetieth -hundredth -thousandth -millionth -billionth -trillionth -quadrillionth -quintillionth -nth -scripted -unscripted -sinkable -unsinkable -single -azygous -lone -singular -unary -uninominal -multiple -aggregate -bigeminal -binary -double -double -double -duplex -manifold -ternary -treble -triune -quadruple -quadruple -quaternate -quintuple -sextuple -septuple -octuple -nonuple -tenfold -double -single -multilane -divided -sized -eightpenny -fourpenny -ninepenny -size -sorted -threepenny -unsized -unsorted -sized -unsized -skilled -accomplished -adept -arch -consummate -delicate -hot -mean -technical -versatile -unskilled -artless -botchy -bungled -bungling -crude -hopeless -humble -lubberly -semiskilled -weak -verbal -numerical -coarse -farinaceous -granulated -plushy -loose -fine -close -dustlike -floury -nongranular -powdered -small -superfine -smoky -blackened -smoking -smokeless -slippery -lubricious -nonstick -slick -sliding -slimed -slipping -slithery -nonslippery -nonskid -nonslip -lubricated -unlubricated -smooth -creaseless -fast -glassy -seamless -streamlined -velvet -rough -abrasive -alligatored -barky -broken -bullate -bumpy -chapped -corded -costate -cragged -crushed -homespun -imbricate -lepidote -squamulose -lined -pocked -rocky -gravelly -roughish -rugose -sandpapery -scabby -shagged -textured -verrucose -smooth -rough -furrowed -canaliculate -corrugated -rutted -unfurrowed -smooth -entire -repand -sinuate -undulate -unnotched -rough -bidentate -biserrate -ciliate -crenate -crenulate -crispate -dentate -denticulate -emarginate -erose -fimbriate -fringed -lacerate -pectinate -rimose -runcinate -serrate -serrulate -spinose -rifled -unrifled -social -cultural -gregarious -interpersonal -multiethnic -unsocial -alone -antisocial -asocial -lone -recluse -accompanied -unaccompanied -alone -isolated -tod -unattended -accompanied -unaccompanied -solo -gregarious -social -ungregarious -nongregarious -gregarious -clustered -ungregarious -caespitose -seamed -seamy -sewed -seamless -broadloom -unseamed -seeded -unseeded -seedy -seeded -seeded -seedless -seeded -stoneless -shuttered -closed -unshuttered -sleeved -sleeveless -sociable -clubbable -clubbish -companionable -convivial -extroverted -social -unsociable -antisocial -ungregarious -sold -oversubscribed -unsold -soled -soleless -solid -coagulated -concrete -congealed -dry -semisolid -liquid -fluid -liquefiable -liquefied -semiliquid -watery -gaseous -aeriform -aerosolized -evaporated -gasified -gassy -vaporific -solid -massive -hollow -cavernous -fistular -tubular -soluble -dissolvable -meltable -insoluble -soluble -answerable -solvable -insoluble -insolvable -solved -unsolved -some -any -both -several -no -nary -none -zero -all -each -every -every -sophisticated -blase -intelligent -polished -naive -childlike -credulous -fleeceable -innocent -unsophisticated -sound -dependable -healthy -solid -stable -unsound -bad -long -wildcat -sound -solid -unsound -corroded -decayed -effervescent -bubbling -aerated -fizzing -carbonated -noneffervescent -flat -noncarbonated -sparkling -still -specialized -differentiated -special -specialistic -unspecialized -generalized -spinous -spineless -spirited -boisterous -dashing -ebullient -feisty -impertinent -lively -mettlesome -resilient -snappy -sprightly -vibrant -zestful -spiritless -apathetic -bloodless -dispirited -heartless -thin -spontaneous -impulsive -intuitive -natural -induced -elicited -iatrogenic -spoken -expressed -oral -verbal -written -backhand -cursive -engrossed -graphic -handwritten -holographic -inscribed -longhand -scrivened -shorthand -voiced -unvoiced -whispered -written -codified -unwritten -vocalic -vowellike -consonantal -stoppable -abatable -unstoppable -unbeatable -syllabic -nonsyllabic -syllabic -disyllabic -monosyllabic -octosyllabic -pentasyllabic -polysyllabic -decasyllabic -syllabled -nonsyllabic -unsyllabled -syllabic -accentual -quantitative -stable -firm -lasting -stabile -stabilized -unstable -coseismic -crank -explosive -rickety -rocky -seismic -tipsy -tottering -volcanic -staccato -abrupt -legato -staged -unstaged -unperformed -standard -authoritative -basic -casebook -criterial -nonstandard -standard -modular -regular -regulation -standardized -stock -nonstandard -deficient -nonnormative -standard -acceptable -classical -nonstandard -bad -unacceptable -starchy -starchlike -starchless -starry -sparkling -starlike -starlit -starless -nourished -full -overfed -malnourished -foodless -starved -unfed -unnourished -steady -dependable -even -firm -level -steadied -sure -surefooted -unsteady -arrhythmic -convulsive -faltering -flickering -fluctuating -palpitant -shaky -quavering -shifting -shuddering -tottering -uneven -wobbling -stemmed -stemless -stemmed -stimulating -challenging -exciting -piquant -rousing -thrilling -unstimulating -bland -dry -vapid -depressant -ataractic -narcotic -relaxant -soporific -stimulative -adrenocorticotropic -analeptic -excitant -irritating -stimulant -stomatous -mouthlike -astomatous -straight -aligned -unbent -untwisted -crooked -akimbo -anfractuous -aquiline -askew -contorted -deflective -geniculate -gnarled -malposed -reflexed -squiggly -tortuous -warped -windblown -wry -zigzag -straight -trabeated -uncurved -curved -arced -curvilineal -eellike -falcate -curvy -flexuous -hooklike -incurvate -recurved -semicircular -serpentine -sinuate -sinusoidal -upcurved -coiled -coiling -convolute -involute -involute -wound -uncoiled -uncurled -straight -aboveboard -guileless -straightarrow -crooked -sneaky -stressed -emphatic -masculine -unstressed -feminine -unaccented -unemphatic -tonic -atonic -strong -beardown -brawny -bullnecked -bullocky -fortified -hard -ironlike -noticeable -reinforced -robust -stiff -vehement -virile -weak -anemic -adynamic -faint -feeble -flimsy -pale -puny -vulnerable -weakened -stubborn -bolshy -bullheaded -dogged -contrarious -determined -hardheaded -docile -meek -sheeplike -yielding -subordinate -feudatory -ruled -subject -subservient -insubordinate -contumacious -disobedient -mutinous -rebellious -successful -boffo -booming -in -made -productive -victorious -unsuccessful -attempted -defeated -hitless -out -scoreless -unfulfilled -unplaced -winless -sufficient -adequate -comfortable -insufficient -depleted -inadequate -lean -light -shy -sugary -candied -honeyed -honeylike -sugared -sugarless -unsugared -unsweetened -superior -arch -eminent -leading -majestic -superordinate -upper -inferior -humble -indifferent -outclassed -superior -ace -banner -boss -brilliant -capital -choice -excellent -greatest -outstanding -premium -pukka -shining -spiffing -supreme -transcendent -inferior -bad -base -bum -cheapjack -coarse -coarsened -commercial -deplorable -less -mediocre -ropey -scrawny -utility -superior -inferior -superjacent -incumbent -overlying -superincumbent -subjacent -underlying -superscript -subscript -adscript -supervised -unsupervised -unattended -supported -based -braced -gimbaled -pendent -supernatant -suspended -underhung -underslung -unsupported -strapless -unbraced -supported -subsidized -unsupported -baseless -uncorroborated -assisted -unassisted -naked -unaided -supportive -accessory -accessary -certificatory -collateral -encouraging -unsupportive -confounding -disconfirming -surmountable -conquerable -insurmountable -insuperable -surprised -amazed -dumbfounded -gobsmacked -jiggered -startled -unsurprised -surprising -amazing -startling -stunning -unsurprising -susceptible -allergic -amenable -capable -convincible -fictile -liable -predisposed -amenable -suggestible -temptable -unvaccinated -vulnerable -unsusceptible -immune -immunized -immunogenic -incapable -unpersuadable -unresponsive -impressionable -easy -spinnable -plastic -susceptible -unimpressionable -exempt -excused -immune -privileged -nonexempt -liable -taxpaying -unexcused -scheduled -regular -unscheduled -extra -forced -sweet -dry -brut -sec -sweet -cloying -sweetish -sour -acerb -acetose -acidic -lemony -subacid -soured -off -unsoured -fresh -suspected -unsuspected -unknown -swept -sweptback -sweptwing -unswept -sworn -bound -unsworn -symmetrical -bilateral -biradial -cruciate -even -interchangeable -isosceles -radial -rhombohedral -asymmetrical -lopsided -noninterchangeable -unsymmetric -actinomorphic -actinoid -zygomorphic -sympathetic -commiserative -condolent -empathic -unsympathetic -unsympathizing -sympathetic -unsympathetic -sympatric -allopatric -synchronic -diachronic -synchronous -coetaneous -coexistent -coincident -contemporaneous -parallel -synchronic -synchronized -asynchronous -allochronic -anachronic -nonsynchronous -serial -synchronous -asynchronous -syndetic -asyndetic -synonymous -similar -substitutable -antonymous -complementary -contradictory -contrary -contrastive -converse -systematic -unsystematic -taciturn -reticent -voluble -chatty -tactful -discerning -tactless -tall -gangling -leggy -leggy -long -stately -tallish -short -chunky -compact -squab -tame -broken -cultivated -docile -domestic -tamed -wild -feral -unbroken -undomesticated -tame -subdued -wild -chaotic -delirious -frenzied -unsubdued -tangible -tactile -intangible -tangible -real -realizable -intangible -tasteful -aesthetic -understated -tasteless -barbaric -brassy -Brummagem -camp -indelicate -ostentatious -tasty -ambrosial -bitter -bitterish -bittersweet -choice -dainty -delectable -flavorful -fruity -peppery -gingery -hot -grapey -nippy -nutty -piquant -pungent -salty -smoky -sour -winy -tasteless -bland -unflavored -unsalted -taxable -assessable -dutiable -ratable -nontaxable -unratable -temperate -abstemious -moderate -intemperate -big -temperate -equable -intemperate -tense -overstrung -taut -lax -drooping -limp -floppy -loose -tensionless -tense -constricted -lax -tense -aroused -taut -antsy -edgy -electric -isotonic -nervous -strained -unrelaxed -relaxed -degage -unstrained -hypertonic -hypotonic -territorial -jurisdictional -regional -sectional -extraterritorial -territorial -nonterritorial -thermoplastic -thermosetting -thick -deep -fat -heavy -heavy -quilted -thickened -thin -bladed -capillary -compressed -depressed -diaphanous -filamentous -fine -light -hyperfine -papery -ribbonlike -sleazy -slender -tenuous -thick -clogged -coagulable -coagulate -creamy -dense -gelatinous -ropy -soupy -syrupy -thickened -thin -tenuous -rare -thinkable -cogitable -conceivable -presumable -unthinkable -impossible -thoughtful -bemused -brooding -cogitative -deliberative -excogitative -thoughtless -inconsiderate -unreflective -thrifty -economical -saving -wasteful -extravagant -uneconomical -tidy -neat -neat -ruly -shipshape -straight -uncluttered -untidy -blowsy -cluttered -disheveled -disorderly -frowsy -messy -scraggly -sloppy -slouchy -sprawling -unkempt -groomed -brushed -kempt -plastered -pomaded -sleek -ungroomed -bushy -unbrushed -combed -uncombed -uncombable -unkempt -timbered -untimbered -toned -toneless -tongued -tonguelike -tongueless -tipped -untipped -tired -aweary -bleary -bored -careworn -drooping -exhausted -footsore -jaded -knackered -ragged -unrefreshed -whacked -rested -fresh -untired -tolerable -bearable -tolerant -intolerable -bitter -impossible -unsupportable -tolerant -unbigoted -intolerant -bigoted -rigid -tonal -keyed -diatonic -polytonal -toned -tonic -atonal -toothed -cogged -toothlike -toothy -tusked -toothless -edental -edentulous -top -apical -crowning -topmost -upper -bottom -bottommost -inferior -nether -side -broadside -lateral -topped -lidded -topless -lidless -bottomed -bottomless -equatorial -pantropical -tropical -polar -circumpolar -testate -intestate -touched -brushed -grazed -untouched -tough -cartilaginous -chewy -coriaceous -fibrous -hempen -tender -chewable -crisp -flaky -tenderized -tough -calloused -enured -tender -delicate -tough -tender -protective -sentimental -toxic -cyanogenetic -deadly -hepatotoxic -nephrotoxic -ototoxic -poisonous -nontoxic -antitoxic -nonpoisonous -nonvenomous -tractable -ductile -docile -tamable -intractable -balking -refractory -uncontrollable -unmalleable -traceable -untraceable -tracked -trackless -traveled -untraveled -untraversed -trimmed -clipped -untrimmed -unclipped -troubled -annoyed -anxious -buffeted -careful -clouded -disquieted -distressed -fraught -haunted -mothy -stressed -struggling -suffering -troublous -untroubled -carefree -clear -dreamless -unconcerned -undisturbed -unmolested -true -actual -apodictic -truthful -sure -false -mendacious -specious -untrue -trustful -confiding -unsuspecting -distrustful -cynical -doubting -jealous -leery -misogynic -oversuspicious -trustworthy -authentic -creditworthy -dependable -fiducial -sure -untrustworthy -devious -slippery -tubed -tubeless -tucked -untucked -turned -inverted -overturned -reversed -rotated -unturned -typical -emblematic -representative -regular -true -atypical -unrepresentative -underhand -overhand -surface -aboveground -opencast -subsurface -belowground -submarine -submerged -subterranean -overhead -submersible -nonsubmersible -tearful -liquid -teary -sniffly -weepy -tearless -dry -union -closed -organized -nonunion -open -unorganized -uniparous -multiparous -biparous -unipolar -bipolar -united -agreed -allied -amalgamate -coalescent -cohesive -conjugate -conjunct -federate -incorporate -one -suprasegmental -tied -undivided -unpartitioned -unsegmented -divided -bicameral -bifid -bifurcate -bifurcated -bilocular -chambered -cloven -dichotomous -disconnected -disjointed -disjunct -episodic -metameric -mullioned -pentamerous -pronged -sectional -segmental -torn -trifid -adnate -connate -univalve -bivalve -lamellibranch -ascending -acclivitous -ascendant -assurgent -assurgent -scandent -highflying -up -descending -declivitous -degressive -descendant -down -drizzling -dropping -raining -rising -improving -falling -down -soft -climactic -anticlimactic -upmarket -upscale -downmarket -downscale -transitive -intransitive -translatable -untranslatable -ungulate -unguiculate -clawed -clawlike -up -ahead -aweigh -dormie -heavenward -risen -sprouted -upbound -upfield -upward -down -behind -downbound -downcast -downfield -downward -fallen -set -thrown -weak -upstage -downstage -upstairs -downstairs -upstream -downstream -uptown -downtown -used -utilized -misused -abused -exploited -useful -multipurpose -reclaimable -serviceable -useable -utilitarian -utilizable -useless -futile -inutile -unserviceable -utopian -airy -dystopian -valid -binding -legal -legitimate -reasoned -validated -invalid -bad -fallacious -false -invalidated -null -sophistic -valuable -invaluable -precious -rich -semiprecious -worth -worthless -chaffy -manky -negligible -nugatory -otiose -rubbishy -tinpot -valueless -variable -changeable -covariant -multivariate -protean -shifting -variant -versatile -invariable -changeless -invariant -varied -omnifarious -varicolored -variform -varying -versatile -unvaried -veiled -unveiled -disclosed -undraped -ventilated -aired -louvered -vented -unventilated -airless -fuggy -unaerated -unvented -vertebrate -invertebrate -violable -inviolable -unassailable -violent -convulsive -ferocious -hot -lashing -lurid -rampageous -ruffianly -nonviolent -passive -virtuous -impeccable -impeccant -wicked -evil -heavy -flagitious -iniquitous -irreclaimable -nefarious -peccable -visible -circumpolar -ocular -macroscopic -megascopic -microscopic -subgross -panoptic -telescopic -viewable -invisible -camouflaged -concealed -infrared -lightless -nonvisual -occult -ultraviolet -undetectable -unseeyn -viviparous -oviparous -broody -ovoviviparous -volatile -evaporable -nonvolatile -voluntary -willful -freewill -uncoerced -unpaid -involuntary -driven -forced -unconscious -unwilled -unwilling -voluntary -involuntary -automatic -autonomic -vegetative -vulnerable -assailable -compromising -defenseless -endangered -indefensible -insecure -penetrable -threatened -unguarded -invulnerable -airtight -bombproof -defendable -entrenched -impregnable -tight -sheltered -untouchable -wanted -craved -hot -sought -unwanted -abdicable -friendless -outcaste -unclaimed -undesired -unwelcome -warm -lukewarm -warmed -warming -cool -caller -precooled -warm -cordial -hearty -cool -unresponsive -warm -hot -cool -cold -homoiothermic -poikilothermic -warmhearted -coldhearted -brittle -washable -nonwashable -waxed -unwaxed -waxing -waning -increasing -accelerative -accretionary -accretive -augmentative -incorporative -maximizing -multiplicative -progressive -raising -decreasing -depreciating -detractive -diminishing -dwindling -falling -increasing -accelerando -crescendo -decreasing -allargando -calando -decrescendo -rallentando -inflationary -deflationary -weaned -unweaned -wearable -unwearable -weedy -weedless -welcome -unwelcome -uninvited -well -asymptomatic -cured -ill -afflicted -aguish -ailing -airsick -autistic -bedfast -bilious -bronchitic -consumptive -convalescent -delirious -diabetic -dizzy -dyspeptic -faint -feverish -funny -gouty -green -nauseated -palsied -paralytic -paraplegic -rickety -scrofulous -sneezy -spastic -tubercular -unhealed -upset -wet -bedewed -besprent -boggy -clammy -damp -sodden -drippy -humid -misty -muggy -reeking -rheumy -sloppy -showery -steaming -sticky -tacky -undried -washed -watery -dry -adust -arid -desiccated -dried -rainless -semiarid -thirsty -wet -fresh -dry -milkless -wet -dry -wet -dry -hydrous -anhydrous -wheeled -wheelless -clerical -professional -industrial -manual -wholesome -alimentary -healthy -hearty -organic -salubrious -unwholesome -insalubrious -insubstantial -morbid -nauseating -rich -wide -beamy -deep -fanlike -sweeping -narrow -constricting -narrowed -slender -strait -straplike -tapered -wide -comfortable -narrow -bare -wieldy -unwieldy -awkward -cumbersome -wigged -peruked -toupeed -wigless -willing -consenting -disposed -glad -ready -volitional -unwilling -grudging -loath -unintentional -winged -alar -alate -batwing -brachypterous -pinioned -volant -winglike -wingless -apterous -flightless -wired -bugged -connected -wireless -wise -perspicacious -owlish -sapiential -sage -foolish -absurd -asinine -cockamamie -fond -harebrained -rattlebrained -unwise -wooded -arboraceous -bosky -braky -forested -jungly -overgrown -rushy -scrabbly -sylvan -timbered -woodsy -unwooded -unforested -untimbered -woody -ashen -beechen -birch -cedarn -ligneous -oaken -suffrutescent -wooden -nonwoody -herbaceous -pulpy -worldly -economic -material -materialistic -mundane -unworldly -anchoritic -cloistered -spiritual -unmercenary -woven -braided -unwoven -felted -knitted -worn -aged -attrited -battered -creaky -eroded -frayed -mangy -ragged -raddled -scruffy -shopworn -tattered -threadbare -thumbed -vermiculate -waterworn -new -unweathered -worthy -applaudable -creditable -deserving -exemplary -meritorious -noteworthy -quotable -sacred -valued -valuable -worthwhile -unworthy -undeserving -unmerited -unmeritorious -xeric -xerophytic -hydric -hydrophytic -hygrophytic -mesic -mesophytic -zonal -azonal -azonic -acrocarpous -pleurocarpous -cursorial -fossorial -homocercal -heterocercal -webbed -palmate -unwebbed -faceted -unfaceted -ipsilateral -contralateral -salient -proactive -retroactive -categorematic -autosemantic -syncategorematic -synsemantic -idiographic -nomothetic -baptized -unbaptized -benign -malignant -cancerous -calcicolous -calcifugous -invertible -immunocompetent -immunodeficient -allogeneic -xenogeneic -shelled -unshelled -jawed -jawless -skinned -skinless -flowering -flowerless -vegetal -asphaltic -abasic -abbatial -abdominovesical -Aberdonian -Abkhaz -Abnaki -Aboriginal -abient -abiogenetic -academic -acanthotic -acapnic -acervate -acetonic -acetylenic -acetylic -Achaean -Aeolian -achenial -achlorhydric -achondritic -aciculate -acidimetric -acidotic -acinar -acinar -acneiform -adolescent -acrogenic -actinometric -actinomycetal -actinomycotic -aculeate -adactylous -adamantine -adenocarcinomatous -adenoid -adenoidal -adient -adjudicative -adnexal -Adonic -adrenal -adrenal -adrenergic -agnostic -Aleutian -ancestral -antheridial -antiadrenergic -antiapartheid -antidotal -antiferromagnetic -antipollution -antisatellite -antiviral -adrenocortical -advective -adventitial -adventuristic -aecial -Aeolian -aeriferous -aerological -aerolitic -aeromechanic -aeromedical -aeronautical -aesculapian -affine -affixal -agential -agonal -agonistic -agranulocytic -agraphic -agrobiologic -agrologic -agronomic -agrypnotic -alabaster -Alaskan -Albigensian -Albanian -albinal -albitic -albuminous -albuminuric -alchemic -alchemistic -aldehydic -aleuronic -algoid -algolagnic -algometric -Algonquian -alimentative -alkahestic -alkaloidal -alkalotic -alkylic -allantoic -allelic -allergenic -allergic -Allied -Allied -allogamous -allographic -allomerous -allometric -allomorphic -allophonic -allotropic -allylic -alopecic -alphabetic -analphabetic -alphanumeric -Altaic -altitudinal -alular -aluminous -alveolar -alveolar -amalgamative -amaranthine -amaurotic -amblyopic -Ambrosian -ambulacral -ambulatory -ameboid -amenorrheic -amethystine -Amharic -amino -amitotic -ammino -ammoniac -ammonitic -amnestic -amniotic -amoristic -amphitheatric -amphoric -ampullar -amygdaline -amylolytic -anabiotic -anabolic -anaclitic -anacoluthic -anaglyphic -anagogic -anagrammatic -anal -analytic -anamnestic -anamorphic -anamorphic -anaphasic -anaplastic -anarchistic -anasarcous -anastigmatic -Andalusian -androgenetic -androgenic -androgynous -anemographic -anemometric -anencephalic -anestrous -anginal -angiocarpic -angiomatous -angiospermous -Anglophilic -Anglophobic -anguine -anicteric -animalistic -animatistic -animist -aniseikonic -anisogamic -anisogametic -anisometropic -ankylotic -annalistic -Bayesian -Arminian -Armenian -Biedermeier -annelid -annexational -hermeneutic -annunciatory -alliaceous -anodic -cathodic -anoperineal -anopheline -anorectal -anorthitic -anosmic -anoxemic -anoxic -anserine -antecubital -antennal -anthracitic -anthropic -anthropogenetic -anthropometric -anthropophagous -antibiotic -anticancer -anticlimactic -anticoagulative -anticyclonic -antigenic -antimonic -antinomian -antiphonary -antipodal -antistrophic -antitypic -anuran -anuretic -anxiolytic -aoristic -aortal -aphaeretic -aphakic -aphanitic -aphasic -aphetic -apian -apiarian -apicultural -aplitic -apneic -apocalyptic -Apocryphal -apocynaceous -apogamic -apogean -apomictic -aponeurotic -apophatic -apophyseal -apoplectic -apoplectiform -aposiopetic -apostrophic -apothecial -apothegmatic -Appalachian -appellative -appendicular -appointive -appositional -appropriative -apsidal -aptitudinal -aqueous -aquatic -aquiferous -arachnoid -Aramaic -Aramean -araneidal -Arawakan -arbitral -arbitrative -arborical -archaeological -archaistic -archangelic -arched -archdiocesan -archducal -archegonial -archesporial -archidiaconal -archiepiscopal -archipelagic -archival -archosaurian -areal -arenicolous -areolar -argentic -argentous -armillary -aroid -aromatic -arsenical -arsenious -arterial -venous -arteriovenous -arthralgic -arthromeric -arthropodal -arthrosporic -Arthurian -articular -articulatory -artiodactyl -arundinaceous -ascensional -ascetic -ascitic -asclepiadaceous -ascocarpous -ascosporic -associational -asteriated -asterismal -stoloniferous -stomatal -stomatal -astomatal -astragalar -astrocytic -astronautic -astronomic -asynergic -ataxic -atherosclerotic -atonalistic -atonic -atrial -atrioventricular -attentional -attitudinal -attritional -audiometric -audiovisual -augitic -aural -aural -auricular -auricular -autoimmune -biauricular -auroral -auroral -aurous -auscultatory -austenitic -Australasian -australopithecine -autacoidal -autarchic -authorial -autobiographical -autobiographical -autocatalytic -autogenetic -autographic -autolytic -autoplastic -autoradiographic -autotelic -autotomic -autotrophic -heterotrophic -autotypic -auxetic -auxinic -axiomatic -axiomatic -avellan -avian -avifaunal -avionic -avitaminotic -avocational -avuncular -avuncular -axial -axile -axillary -axiological -axonal -Azerbaijani -azido -azimuthal -azo -diazo -zoic -azotemic -baboonish -Babylonian -baccate -bacchantic -bacillar -bacteremic -bacteriolytic -bacteriophagic -bacteriostatic -bacteroidal -Bahai -balletic -ballistic -balsamic -baric -barographic -barometric -barytic -basaltic -basidial -basidiomycetous -basidiosporous -basilar -basilican -basinal -batholithic -bathymetric -bauxitic -behavioristic -Belarusian -belemnitic -benedictory -beneficiary -benevolent -benthic -bentonitic -benzenoid -benzoic -benzylic -betulaceous -biaxial -bibliographic -bibliolatrous -bibliomaniacal -bibliophilic -bibliopolic -bibliothecal -bibliotic -bicapsular -bichromated -bicipital -bignoniaceous -biliary -bilious -billiard -bimetallistic -bimillenial -binary -biocatalytic -biochemical -bioclimatic -biogenetic -biogenous -biogenic -biogeographic -biological -biologistic -sociobiologic -neurobiological -bionic -biosynthetic -biosystematic -biotitic -biotypic -blastogenetic -bodily -Bohemian -bolographic -bolometric -Boolean -borated -boronic -boskopoid -botanic -botryoid -Botswanan -boustrophedonic -brachial -brachiopod -brachyurous -bracteal -bracteate -bracteolate -brahminic -branchial -branchiopod -brassy -bregmatic -brimless -brisant -broadband -broadband -Brobdingnagian -bromic -bromidic -buccal -bulimic -burrlike -bursal -buteonine -butyraceous -butyric -cachectic -cacodemonic -cacodylic -cadastral -cadaverous -caducean -caecilian -caesural -caffeinic -cairned -calcaneal -calcareous -calceolate -calcic -calciferous -calcitic -calculous -calendric -calico -calisthenic -callithumpian -caloric -noncaloric -calorimetric -calyceal -calycular -calyculate -calyptrate -calyptrate -cambial -campanulate -camphoraceous -camphoric -canalicular -cancroid -canicular -canicular -canine -canine -capacitive -Capetian -capitular -Cappadocian -caprine -capsular -capsular -carangid -carbocyclic -carbolated -carbonyl -carboxyl -carcinogenic -carcinomatous -cardiographic -cardiopulmonary -carinal -carnivorous -Caroline -Carolingian -carotid -carpellary -carpetbag -carposporic -carposporous -cartilaginous -cartographic -Carthusian -caruncular -carunculate -caryophyllaceous -catabolic -catachrestic -catalatic -cataphatic -cataplastic -catapultic -catarrhal -categorial -categorical -cathectic -cathedral -catkinate -catoptric -cecal -celebratory -celestial -celestial -cellular -extracellular -integral -integumentary -intercellular -intracellular -cellulosid -cementitious -cenobitic -eremitic -cenogenetic -Cenozoic -palingenetic -censorial -centesimal -centigrade -centralist -centroidal -centrosomic -cephalopod -cercarial -cereal -cerebellar -cerebral -cerebrospinal -cerebrovascular -cervical -ceric -cerous -ceruminous -cervine -cetacean -chaetal -chaetognathan -chaffy -Chaldean -chalybeate -chancroidal -chancrous -chaotic -charitable -chartaceous -chauvinistic -Chechen -chelate -cheliferous -chelate -cheliceral -chelicerous -chelonian -chemical -photochemical -chemical -physicochemical -chemiluminescent -chemoreceptive -chemotherapeutic -cherty -Chian -chiasmal -childbearing -chimeric -Chippendale -chirpy -chitinous -chlamydial -chlorophyllose -chlorotic -choleraic -choragic -chordal -chordate -Christological -chromatinic -Churchillian -Wilsonian -achromatinic -cinematic -civil -civil -civic -municipal -clamatorial -cleistogamous -clerical -clerical -classical -clonal -cloze -coastal -coccal -coccygeal -collagenous -collarless -collegiate -collegial -colonial -colonial -colonic -colorectal -colorimetric -commensal -communal -composite -conceptualistic -concretistic -condylar -configurational -confrontational -congregational -conjunctival -consonantal -constitutional -consubstantial -contractual -cosmic -cosmologic -cosmologic -cordless -coreferential -cormous -corneal -Cornish -correlational -corymbose -corinthian -costal -intercostal -intertidal -covalent -croupy -crural -crustal -crustaceous -crustaceous -crustose -cryogenic -cryonic -cryptanalytic -cryptogamic -cryptobiotic -ctenoid -cubital -cucurbitaceous -culinary -cuneiform -cupric -curricular -cyclic -cytoarchitectural -cytolytic -cytophotometric -cytoplasmic -cytoplastic -bicylindrical -cystic -cystic -cytogenetic -cytokinetic -cytological -cytotoxic -czarist -deductive -deliverable -Democratic -Demotic -denominational -denominational -dental -dental -despotic -diagonalizable -diamagnetic -diamantine -diametral -diaphoretic -diastolic -dicarboxylic -Dickensian -dictatorial -differentiable -differential -digital -digital -dimorphic -Dionysian -diplomatic -dipterous -directional -omnidirectional -directional -discomycetous -distributional -dithyrambic -dramatic -drupaceous -dumpy -dural -dynastic -dysgenic -dysplastic -Ephesian -Eucharistic -eugenic -Eurocentric -eutrophic -Ebionite -ebracteate -economic -economic -socioeconomic -ectopic -editorial -editorial -electoral -electrocardiographic -electrochemical -electroencephalographic -electrolytic -electrolytic -electromechanical -electromotive -electronic -electronic -electrophoretic -electrostatic -elegiac -elemental -elemental -elementary -elfin -empyrean -emulous -eonian -epenthetic -epidural -epigastric -epigastric -epilithic -episcopal -equestrian -equestrian -equine -equine -equinoctial -equinoctial -ergonomic -ergotic -ergotropic -eruptive -erythematous -erythroid -erythropoietic -eschatological -esophageal -Essene -essential -Estonian -estrogenic -estuarine -ethical -evidentiary -excrescent -excretory -exegetic -exilic -existential -existential -existentialist -extropic -facial -factorial -facultative -Fahrenheit -fanged -federal -femoral -fenestral -fenestral -fermentable -ferric -feudal -febrile -afebrile -fibrillose -fibrinous -fibrocartilaginous -fictile -fictional -nonfictional -filar -bifilar -unifilar -filarial -filariid -fisheye -fishy -fistulous -flaky -fleshy -flinty -floricultural -flowery -fluvial -foliate -foliaceous -forcipate -formalistic -formic -formic -formulary -fossil -fossiliferous -fourhanded -Frankish -fraternal -fretted -unfretted -frictional -frictionless -Frisian -Galilean -Galilean -Gallican -garlicky -gastric -gastroduodenal -gastroesophageal -pneumogastric -gemmiferous -generational -generic -genetic -genetic -genic -genial -mental -gentile -geometric -geophytic -geostrategic -geothermal -gingival -glabellar -glacial -glial -gluteal -glycogenic -granuliferous -granulomatous -grapelike -graphic -graphic -gravitational -grubby -guttural -harmonic -nonharmonic -harmonic -harmonic -Hasidic -Hawaiian -heathlike -Hebridean -heliacal -hematopoietic -hemodynamic -hemispherical -hemorrhagic -hepatic -heroic -heterodyne -heterosporous -Hollywood -homeostatic -homonymic -homosporous -homostylous -hexadecimal -hexangular -hidrotic -hieratic -hieroglyphic -hieroglyphic -hircine -home -hooflike -horary -human -human -humanist -humanistic -humanist -humic -humified -hyaloplasmic -hydrocephalic -hydrographic -hydrolyzable -hydroxy -hymenopterous -hypnotic -ideal -ideographic -ideological -idiopathic -immune -immunochemical -immunocompromised -immunological -immunosuppressed -immunosuppressive -immunotherapeutic -imperial -imperial -imperial -impetiginous -impressionist -impressionistic -Incan -incendiary -incestuous -incestuous -inductive -indusial -industrial -inertial -infantile -inferential -informational -inguinal -inhalant -inscriptive -insecticidal -institutional -interlinear -intracerebral -intracranial -intraventricular -intervertebral -insular -intuitionist -ionic -Ionic -Ionic -Ionian -nonionic -iridaceous -iritic -ischemic -isentropic -Ismaili -isthmian -Jamesian -Jamesian -Jeffersonian -jihadi -jittery -judicial -judicial -jumentous -Jurassic -juridical -jurisprudential -leaden -legal -legal -labial -labial -lactogenic -lathery -leguminous -leonine -Levitical -lexicalized -liliaceous -limacine -limnological -living -lobeliaceous -local -logogrammatic -loopy -lucifugous -lunar -sublunar -translunar -lunisolar -lupine -luteal -macaronic -macroeconomic -Mandaean -mandibulate -Manichaean -manual -Maoist -maternal -matutinal -paternal -patriarchal -mealy -mecopterous -medical -biomedical -premedical -medicolegal -medullary -medullary -medullary -medusoid -meningeal -menopausal -Merovingian -Prakritic -Procrustean -provencal -prejudicial -premenopausal -presocratic -postdiluvian -postdoctoral -postexilic -postglacial -postmenopausal -postpositive -pouched -pteridological -meiotic -mercuric -meretricious -meridional -metrological -micaceous -microeconomic -military -paramilitary -minimalist -ministerial -ministerial -minty -Mishnaic -omissive -miotic -missionary -monocarboxylic -monoclonal -Monophysite -monotypic -moraceous -morbilliform -motivational -mousy -myalgic -myelinated -unmyelinated -myopathic -narcoleptic -nasopharyngeal -natal -natal -natriuretic -naval -Nazarene -Nazarene -neonatal -neoplastic -neotenic -Nestorian -Noachian -nominal -nominal -nominalistic -nominative -nosocomial -numeral -numerological -Numidian -numinous -oleaceous -olfactory -oligarchic -oneiric -onomastic -oral -oropharyngeal -Orphic -Orwellian -pachydermatous -packable -palatoglossal -paleontological -Palladian -palmar -palpatory -palpebrate -panicled -papilliform -paradigmatic -paramedical -paranasal -parhelic -parliamentary -parous -parotid -paroxysmal -paschal -passerine -nonpasserine -Pauline -peacekeeping -peaty -perigonal -perithelial -monetary -pedal -pectineal -pemphigous -petaloid -phagocytic -phalangeal -Pharaonic -Phoenician -phonogramic -phonological -photomechanical -photometric -photosynthetic -nonphotosynthetic -phreatic -phrenological -pictographic -plagioclastic -pilar -pilosebaceous -planetal -planktonic -planographic -plantar -interplanetary -penal -penumbral -physical -planetary -extraterrestrial -Platonistic -Platonic -pleomorphic -plumbaginaceous -plumbic -plutocratic -polarographic -polemoniaceous -polydactyl -polyhedral -polymeric -pompous -popliteal -positionable -positional -positivist -pragmatic -prandial -preanal -preclinical -precancerous -precordial -predestinarian -prelapsarian -premenstrual -presentational -pressor -prodromal -professorial -prolusory -propagative -prostate -prosthetic -prosthetic -prosthodontic -proteinaceous -provincial -pubertal -pupillary -Puranic -putrid -rabid -radiological -radiotelephonic -rationalistic -ratty -realistic -recoilless -recombinant -recreational -refractive -republican -resinlike -revenant -Rhodesian -Romansh -romantic -ropy -royal -royal -ruminant -nonruminant -agricultural -aquicultural -rural -Ruritanian -Sabine -saccadic -sacculated -sadomasochistic -Sadducean -Saharan -sapiens -sarcolemmic -sartorial -sartorial -scalene -scalene -scapular -scapulohumeral -scenic -scholastic -scholastic -scientific -sclerotic -sclerotic -scurfy -Scythian -secular -secretarial -secretory -sectarian -sectorial -self -semiautobiographical -seminal -seminiferous -semiotic -semiparasitic -senatorial -sensational -sepaloid -septal -sepulchral -serial -serial -sidereal -Sikh -siliceous -Siouan -Sisyphean -social -social -solar -sociopathic -solanaceous -Solomonic -somatosensory -soteriological -squinty -specialistic -spectral -spectrographic -spermicidal -spermous -spherical -nonspherical -sphingine -splashy -splenic -splintery -sporogenous -sportive -sporting -spousal -stagflationary -stainable -Stalinist -stannic -staphylococcal -statutory -stellar -interstellar -stemmatic -stenographic -steroidal -nonsteroidal -stoichiometric -stovepiped -subarctic -subcortical -subdural -sublingual -suburban -suctorial -Sufi -sulfurous -Sumerian -superficial -suppurative -nonsuppurative -supraorbital -surficial -sustainable -sustentacular -syllabic -syllabic -symbolic -symbolic -symptomatic -syncretic -syncretic -synesthetic -synoptic -synovial -syntagmatic -tangential -Tasmanian -taurine -technical -technophilic -technophobic -technical -telemetered -tellurian -semiterrestrial -telluric -temperamental -temporal -temporal -spatiotemporal -tendinous -tensile -tensional -tentacular -tentacled -teratogenic -terminal -terminal -territorial -testaceous -testamentary -testimonial -testimonial -theatrical -Theban -Theban -thematic -unthematic -thematic -thenal -thermal -thermal -nonthermal -thermoelectric -threaded -tibial -tidal -tiered -Timorese -tinny -titular -titular -titular -titular -tonic -tonic -clonic -topical -topological -toroidal -torrential -tortious -totalitarian -totipotent -tubercular -tubercular -tubercular -tuberculate -tuberculoid -turbinate -umbelliform -umbelliferous -uncial -Uniate -unicellular -uniovular -unitary -unitary -unpigmented -urban -urceolate -urethral -urogenital -usufructuary -uveal -vacuolate -vagal -valedictory -apopemptic -valent -valetudinarian -valved -vanilla -variolar -Vedic -ventilatory -ventricular -verbal -verbal -vertical -viatical -vibrational -vicarial -vicennial -vigesimal -virginal -vitreous -vitreous -vocal -vocal -instrumental -vocalic -volcanic -atheist -electrical -electric -voltaic -photoconductive -photoemissive -photovoltaic -photoelectric -hydroelectric -hydrostatic -hydrokinetic -interlocutory -interstitial -isomeric -isometric -isomorphous -isotonic -lapidary -legislative -legislative -leprous -lingual -Linnaean -longitudinal -literary -critical -lithic -lithic -lymphatic -lymphocytic -lymphoid -lysogenic -lysogenic -magisterial -atmospheric -amphibious -insectan -mammalian -piscine -reptilian -algal -fungal -fungicidal -fungoid -infectious -plantal -vegetative -bacterial -parasitic -antibacterial -cyanobacterial -moneran -triangulate -quadrangular -tetragonal -tetrametric -pentangular -octangular -neoclassicist -expressionist -postmodernist -revolutionary -residual -relativistic -relativistic -raptorial -radical -radial -radial -radial -ulnar -radiographic -birefringent -bisectional -bismuthal -bismuthic -bisontine -bistered -bistroic -polar -bipolar -bipolar -transpolar -photographic -photic -pneumatic -pneumococcal -phallic -feminist -professional -professional -vulpine -wolflike -vulvar -clitoral -vocational -ungual -succinic -umbilical -spatial -nonspatial -sigmoid -sigmoid -sciatic -sciatic -semantic -bovine -crinoid -linguistic -nonlinguistic -intralinguistic -sociolinguistic -linguistic -bridal -bridal -cardiac -caudal -Caucasian -cephalic -cranial -craniometric -comatose -conic -corinthian -corvine -ciliary -ciliary -ciliary -counterinsurgent -counterrevolutionary -counterterror -cyprinid -dietary -diluvian -antediluvian -dominical -dominical -Donatist -Dorian -doric -floral -floral -fiscal -nonfinancial -fiducial -fiduciary -funicular -lactic -lacteal -galactic -extragalactic -intergalactic -gnomic -Gnostic -gymnastic -gyral -alvine -epistemic -hemal -hemic -hemiparasitic -haemophilic -humoral -chylaceous -chylific -chyliferous -iconic -ichorous -icosahedral -icterogenic -ictal -igneous -iridic -iridic -jugular -marital -resinated -sulphuretted -mastoid -mastoid -phocine -saurian -stearic -vinous -tegular -dyadic -algebraic -biblical -biblical -postbiblical -Koranic -polymorphic -polymorphous -polyphonic -contrapuntal -polyphonic -lyric -lyric -perianal -pericardial -perineal -peroneal -poetic -poetic -political -political -phonetic -phonetic -phonemic -philosophic -Rousseauan -personal -personal -intensive -infernal -litigious -acronymic -apostolic -phenomenal -eudemonic -eukaryotic -prokaryotic -pectoral -pastoral -particularistic -parturient -patellar -pathological -palatine -palatine -pictorial -optical -objective -possessive -nuclear -nuclear -nucleated -visceral -narcotic -mystic -mystic -carbonaceous -Melanesian -melodic -monumental -modal -modal -millenary -millennial -millenarian -metropolitan -meteoric -meteorologic -metaphysical -metastable -meridian -mercurial -Mercurial -Mercurial -Mesoamerican -mesoblastic -Mesozoic -messianic -muciferous -mucosal -murine -musical -musicological -exteroceptive -proprioceptive -interoceptive -perceptive -acoustic -auditory -gustatory -haptic -ocellated -octal -ocular -ocular -orbital -suborbital -kinesthetic -angelic -seraphic -ethereal -firmamental -elysian -diocesan -eparchial -parochial -regional -vicinal -conjugal -binocular -cultural -cultural -sociocultural -multicultural -transcultural -transactinide -transcendental -transuranic -burlesque -vascular -avascular -cardiovascular -choral -choric -chorionic -communist -Marxist -Bolshevik -cutaneous -dermal -cuticular -ectodermal -encysted -endermic -endogenous -hypodermal -hypodermic -hypoglycemic -hypovolemic -intradermal -facial -mandibular -mandibulofacial -maxillary -maxillodental -maxillofacial -maxillomandibular -interfacial -lacrimal -lacrimal -lacrimatory -menstrual -mural -extralinguistic -papal -Peloponnesian -pubic -viral -grammatical -syntactic -glossopharyngeal -glottal -glottochronological -lexicostatistic -focal -genital -genitourinary -feline -laryngeal -laryngopharyngeal -zygotic -uninucleate -multinucleate -muscular -musculoskeletal -intramuscular -neuroendocrine -neurogenic -neuroglial -neuromatous -neuromuscular -nephritic -nephritic -neurotoxic -neurotropic -parental -filial -spinal -atomic -monatomic -diatomic -polyatomic -subatomic -clinical -subclinical -postal -continental -Continental -continental -lexical -nonlexical -lexical -psychosexual -sexagesimal -sexual -coital -marine -marine -multilevel -multiphase -littoral -sublittoral -surgical -nonsurgical -ophthalmic -ophthalmic -physiotherapeutic -nautical -thalassic -oceanic -transoceanic -ursine -intravenous -montane -mechanical -mechanical -zoological -zoological -protozoological -protozoal -rental -rental -rickettsial -ritual -ritual -fetal -juvenile -herbal -doctoral -pediatric -kinetic -mammary -neural -sensorineural -sensorimotor -occupational -pelvic -frontal -bucolic -Masonic -masonic -Masoretic -masted -migrational -mnemonic -parietal -statuary -tubal -velar -documentary -iambic -structural -structural -anatomic -anatomic -architectural -tectonic -organizational -cogitative -cognitive -mental -cultural -factual -achondroplastic -ateleiotic -ecclesiastical -priestly -sacerdotal -molar -molar -molal -molar -molecular -bimolecular -intramolecular -intermolecular -macerative -macrencephalic -macrocephalic -microcephalic -microelectronic -macromolecular -isotopic -isothermic -microcosmic -micrometeoric -micropylar -macrocosmic -mucinous -mucinoid -mucocutaneous -mucopurulent -mucous -mucoid -colloidal -administrative -managerial -supervisory -nervous -latinate -latitudinal -Florentine -earthen -earthy -monometallic -brazen -geological -psychological -psychogenetic -psychogenetic -sociological -demographic -ecological -ecological -theological -anthropological -paleoanthropological -computational -athletic -astrophysical -geopolitical -thermodynamic -geophysical -seismological -peptic -duodenal -neuropsychological -neurophysiological -navigational -differential -deconstructionist -rationalist -calligraphic -lexicographic -orthographic -telegraphic -typographic -astrological -syllogistic -necromantic -lithomantic -mechanistic -chiromantic -parametric -nonparametric -statistical -nihilistic -spiritualistic -supernaturalist -operationalist -operatic -trigonometric -pharmacological -toxicological -psychiatric -oncological -psychoanalytical -psychometric -psychomotor -psychotherapeutic -therapeutic -neuroanatomic -virological -bacteriological -cardiologic -endocrine -enolic -exocrine -endodontic -endoparasitic -orthodontic -periodontic -dermatologic -exodontic -geriatric -geriatric -gynecological -gymnosophical -gymnospermous -hematologic -obstetric -neurological -spectrometric -spectroscopic -microscopic -insurrectional -conspiratorial -domestic -econometric -criminological -classicistic -historical -ahistorical -ontological -pietistic -fascist -Catholic -Roman -Roman -Roman -Roman -Jewish -Judaic -evangelical -evangelical -evangelistic -Muslim -Hindu -Hmong -Buddhist -sculptural -evaporative -Confucian -Shinto -Kokka -Shuha -Rastafarian -Jain -Taoist -Taoist -textual -Tantric -magnetic -electromagnetic -Avestan -Zoroastrian -capillary -automotive -horticultural -cervical -American -American -Indian -Indian -asymptotic -subtropical -tropical -equatorial -equatorial -rational -irrational -anionic -cationic -Satanic -angular -rabbinical -arteriosclerotic -idolatrous -sacramental -theist -deist -pantheist -nocturnal -mensural -mensural -mensal -epicarpal -epithelial -epitheliod -pancreatic -ovarian -ovine -ovular -ovular -uterine -intrauterine -testicular -rectal -rectosigmoid -monozygotic -dizygotic -synaptic -dendritic -iliac -lobar -lobate -abdominal -hormonal -hemispheric -occipital -pneumonic -pneumonic -intrapulmonary -intestinal -skeletal -skinny -adjectival -adverbial -morphemic -bimorphemic -monomorphemic -polymorphemic -morphophonemic -clausal -phrasal -infinitival -pronominal -indexical -indexless -cruciferous -mathematical -choreographic -runic -scriptural -pentatonic -anaphoric -anapestic -rhetorical -tectonic -riparian -Martian -actuarial -psycholinguistic -robotic -rotatory -epicyclic -expansionist -experimental -expiatory -familial -etiological -etiological -exuvial -behavioral -African -phenotypical -genotypical -ontogenetic -phylogenetic -environmental -environmental -methodological -sectional -trabecular -tracheal -tractive -transdermal -transitional -traumatic -trophic -tympanic -tympanic -tympanitic -perceptual -libidinal -epileptic -developmental -pedagogical -educational -prehistoric -Atlantic -Pacific -transatlantic -synergistic -monistic -dualistic -pluralistic -pleural -hilar -labyrinthine -lobular -interlobular -intralobular -anastomotic -bronchial -arteriolar -bronchiolar -rhombic -trapezoidal -physiological -morphologic -geomorphologic -morphologic -occlusive -ohmic -mortuary -mortuary -funerary -strategic -tactical -cinerary -circulatory -veinal -circulative -euphonic -metamorphic -sedimentary -Christian -Protestant -universalistic -Calvinist -fundamentalist -Orthodox -Orthodox -radio -dipolar -deformational -totemic -Anglican -Baptistic -Congregational -Episcopal -revivalistic -Lutheran -Methodist -Mormon -Unitarian -orchestral -orchestrated -communicative -autosomal -chromatic -chromosomal -chronological -Italian -Russian -German -Celtic -Britannic -Teutonic -French -Spanish -Iberian -Lusitanian -Portuguese -Sicilian -Soviet -Finnish -Swedish -Norwegian -Scandinavian -Danish -Belgian -Dutch -Luxembourgian -Swiss -Austrian -Polish -Polynesian -Hungarian -Czech -Yugoslavian -Romanian -Baltic -Baltic -Latvian -Lithuanian -Moldovan -Kyrgyzstani -Tajikistani -Turkmen -Ukrainian -Uzbekistani -Serbian -Croatian -Slovenian -Slovakian -Bosnian -Chinese -Sinitic -Japanese -exponential -paradigmatic -paradigmatic -Tibetan -Himalayan -Chilean -Peruvian -Ecuadorian -Panamanian -Venezuelan -Brazilian -Argentine -Paraguayan -Uruguayan -Bolivian -Colombian -Korean -European -Asian -Cambodian -Manchurian -Honduran -Salvadoran -Cuban -Bavarian -Byzantine -Byzantine -Ottoman -Seljuk -Neapolitan -Milanese -Tuscan -Venetian -Tyrolean -Viennese -Glaswegian -Egyptian -Hindustani -Nepalese -Indonesian -Alsatian -Athenian -Spartan -Thracian -Israeli -Genoese -tragic -comic -tragicomic -abyssal -neritic -baroque -bathyal -hadal -operculate -Palestinian -infernal -cortical -metabolic -metastatic -gonadal -agonadal -diagnostic -gastrointestinal -gastronomic -carnal -functional -neurotic -epidemiologic -qualitative -quantal -quantitative -Quebecois -Assamese -Austronesian -Algerian -Andorran -Monacan -Galwegian -Calcuttan -circadian -rhinal -perinasal -otic -retinal -orbital -suborbital -reductionist -maturational -dynamic -hydrodynamic -aerodynamic -rheologic -meteoritic -micrometeoritic -cometary -asteroidal -piezoelectric -thyroid -thyrotoxic -thyroid -antithyroid -congressional -instructional -catechismal -catechetical -catechistic -Canadian -necrotic -hypothalamic -thalamocortical -gestational -progestational -progestational -emotional -macrobiotic -biotic -gubernatorial -presidential -copular -coronary -corporate -corporatist -corpuscular -dimensional -volumed -volumetric -hypothermic -hyperthermal -yogistic -botulinal -logistic -organicistic -organismal -artifactual -mutafacient -mutagenic -mutational -mutative -mutant -incident -serologic -chromatographic -national -national -national -nativist -nativist -naturistic -congeneric -specific -conspecific -experiential -medieval -mediatorial -mediatory -curatorial -proverbial -epiphyseal -diaphyseal -theocratic -comparative -artistic -aesthetic -official -teleological -sentential -intrasentential -scopal -simian -bubaline -embolic -falconine -ferial -faucal -future -futuristic -gallinaceous -geodetic -heraldic -humanitarian -homophonous -hyperbolic -lacustrine -liturgical -locomotive -logarithmic -Markovian -marmorean -marly -mesonic -marsupial -mercantile -metric -mythic -nacreous -normative -ordinal -palatal -Paleozoic -parabolic -pharyngeal -phrenic -prosodic -appetitive -aversive -promissory -quartan -quarterly -quartzose -quintessential -roentgenographic -rotary -septic -semicentennial -centennial -bicentennial -tricentenary -sophistic -Nazi -capitalist -zymotic -zymotic -osmotic -evolutionary -oracular -peritoneal -Epicurean -holographic -holographic -canonic -canonic -canonist -symphonic -contextual -nutritional -paramagnetic -motional -hydrometric -thermohydrometric -ferromagnetic -English -English -Irish -Afghani -idiomatic -dialectal -percussive -waxen -enzymatic -nonenzymatic -iodinated -dramaturgic -autodidactic -aneuploid -aneurysmal -alluvial -doctrinal -dogmatic -providential -philanthropic -philatelic -aerophilatelic -pleochroic -sternal -congestive -hemolytic -sarcolemmal -sarcosomal -sternutatory -sympathetic -urinary -urinary -atheromatous -basophilic -intimal -coeliac -celiac -emphysematous -granulocytic -atrophic -mesenteric -glomerular -calcific -fibrocalcific -pyknotic -eosinophilic -papillary -papillate -vesicular -vestibular -vertebral -neocortical -paleocortical -limbic -fugal -parasympathetic -parasympathomimetic -hypophyseal -hyperemic -neuropsychiatric -psychopharmacological -salivary -prime -nilpotent -megakaryocytic -megaloblastic -myelic -myelinic -myeloid -myeloid -myocardial -myoid -myotonic -triumphal -Darwinian -Lamarckian -larval -operational -microbial -cochlear -lumbar -lumbosacral -flagellate -biflagellate -ceramic -epic -Hellenic -Panhellenic -Greek -Syrian -Minoan -Mycenaean -Aegean -Aegean -Attic -Boeotian -Dipylon -Argive -executive -topographical -endothelial -taxonomic -classificatory -eutherian -proteolytic -microsomal -mithraic -mitotic -mitral -mitral -follicular -philological -dystopian -utopian -Stoic -patristic -sapphirine -saprophytic -saprobic -katharobic -cubist -tomentose -hyoid -geographic -shouldered -shrubby -etymological -British -epiphytic -lithophytic -budgetary -propagandist -isolationist -ascomycetous -pianistic -pianistic -Parisian -dialectic -Turkish -Eurafrican -Eurasian -Moroccan -Scots -Corsican -Sardinian -Alpine -alpine -Andean -myrmecophytic -tuberous -saponaceous -umbellate -narial -Cartesian -Mexican -Tudor -Shavian -Shakespearian -Skinnerian -Falstaffian -Victorian -Gaussian -Aeschylean -Alexandrian -Aristotelian -Audenesque -Balzacian -Beethovenian -Bismarckian -Bogartian -Caesarian -cesarean -Coleridgian -Columbian -Cromwellian -Dantean -Demosthenic -Deweyan -Donnean -Dostoevskian -Draconian -Einsteinian -Elizabethan -Erasmian -Freudian -Frostian -Gandhian -Gauguinesque -Goethean -Handelian -Hegelian -Hemingwayesque -Hitlerian -Hittite -Hugoesque -Huxleyan -Ibsenian -Proustian -Ptolemaic -Socratic -Jungian -Kantian -Keynesian -Kiplingesque -Leibnizian -Leonardesque -Lincolnesque -Lutheran -Marian -Michelangelesque -Muhammadan -Mosaic -Mozartian -Napoleonic -Newtonian -Pasteurian -Pavlovian -Piagetian -eponymous -Pythagorean -Wagnerian -Washingtonian -Washingtonian -Washingtonian -Washingtonian -Rembrandtesque -Riemannian -Rooseveltian -Senecan -Stravinskyan -Thoreauvian -Voltarian -Wordsworthian -Wittgensteinian -Yeatsian -Zolaesque -Hebraic -Hebraic -monocarpic -puerperal -acetic -actinic -aldermanic -alexic -dyslexic -monochromatic -Moravian -dichromatic -ambassadorial -amoebic -anemic -anaesthetic -ablative -accusatorial -inquisitorial -Afrikaans -aneroid -Angolan -Anguillan -prenuptial -postnuptial -Antiguan -antiquarian -antiquarian -appellate -anecdotal -Arabian -Arabian -Arabic -arithmetical -armorial -aspectual -asphyxiated -Augustan -Australian -Bahamian -Bahraini -Bangladeshi -Bantoid -Bantu -baptismal -Barbadian -bardic -Benedictine -Benedictine -Bengali -Beninese -Bermudan -Bhutanese -bilabial -binomial -biographic -bituminous -bituminoid -bivalent -bivariate -bladdery -bladed -bladed -blastemal -blastocoelic -blastodermatic -blastomeric -blastomycotic -blastoporal -blastospheric -boric -Bruneian -bubonic -Bulgarian -bungaloid -bureaucratic -burglarious -Burmese -Burundi -Californian -Cameroonian -cannibalistic -cantonal -carboniferous -Carmelite -carpal -casuistic -casuistic -Catalan -Catalan -cataleptic -catalytic -catatonic -Chadian -citric -citrous -citrous -climatic -Cockney -cockney -commemorative -concessive -Congolese -consular -Coptic -creaseproof -creedal -Creole -Creole -Cretaceous -cretaceous -cybernetic -cyclonic -cyclonic -cyclopean -cyclothymic -Cyprian -Cyrillic -dacitic -dactylic -daisylike -Dalmatian -damascene -defervescent -departmental -interdepartmental -intradepartmental -digestive -Delphic -demagogic -diabetic -disciplinary -interdisciplinary -disciplinary -divisional -Djiboutian -dogmatic -dolomitic -domiciliary -Dominican -Dominican -ducal -ductless -Edwardian -elocutionary -empiric -endometrial -endoscopic -enteric -entomological -entozoan -epizoan -entrepreneurial -Eritrean -Ethiopian -ethnographic -ethnological -euclidian -Fabian -fatalist -faecal -feudatory -Fijian -Filipino -Flemish -Franciscan -Gabonese -Gallic -Gambian -genealogic -Georgian -Georgian -Georgian -Georgian -Germanic -Ghanaian -Gibraltarian -Gilbertian -gladiatorial -glandular -gonadotropic -Gothic -Gothic -Gothic -green -greenhouse -greenside -Gregorian -Gregorian -Grenadian -growing -Guatemalan -Guinean -Guyanese -gyroscopic -Haitian -Hanoverian -Hispaniolan -Hispanic -histological -Hertzian -hiplength -Hippocratic -homeopathic -allopathic -Homeric -homiletic -homiletic -hydraulic -hydraulic -hydropathic -Icelandic -imperialistic -tribal -intertribal -Iranian -Iraqi -Italic -italic -Jacksonian -Jacobean -Jacobinic -Jamaican -Javanese -Jesuitical -Jordanian -journalistic -Jovian -Jovian -Julian -karyokinetic -Kashmiri -Kazakhstani -Kenyan -Kurdish -Kuwaiti -Kuwaiti -Lancastrian -Lancastrian -Laotian -Lao -Laputan -Latin -Latin -Romance -Latin -Lebanese -lenten -Levantine -Liberian -Libyan -Liechtensteiner -Lilliputian -lithographic -Liverpudlian -Luxemburger -Luxemburger -Macedonian -Machiavellian -Madagascan -malarial -Malawian -Malay -Malaysian -Malian -Maltese -Malthusian -Mancunian -manorial -Manx -Mauritanian -mayoral -Mediterranean -megalithic -membranous -Mendelian -mentholated -meritocratic -metacarpal -metallurgical -metatarsal -methylated -milch -millenary -mineral -Mongol -Mongolian -mongoloid -Mongoloid -mongoloid -Montserratian -Moorish -Mozambican -Mozambican -Muscovite -Namibian -Nauruan -Neanderthal -nebular -nectariferous -eolithic -mesolithic -neolithic -paleolithic -neuralgic -neurasthenic -Nicaean -Nicaraguan -Nigerian -Nigerian -Nilotic -Nilotic -nitrogenous -azotic -nodular -nontranslational -Nordic -Nordic -Norman -Norman -Olympic -Olympian -Olympian -Omani -optative -optative -subjunctive -implicational -imperative -indicative -interrogative -ornithological -orthopedic -orthoptic -outdoor -Oxonian -Oxonian -Pakistani -palatial -Papuan -paralytic -parenteral -parenteral -Parthian -participial -partitive -partitive -patronymic -pectic -penile -scrotal -peninsular -pentavalent -pentecostal -pentecostal -pharmaceutical -pharmaceutical -philharmonic -Philistine -phonic -phonic -phosphorous -pineal -piratical -piratical -piscatorial -pituitary -polygonal -polynomial -porcine -porphyritic -postganglionic -postictal -postmillennial -postural -praetorian -prepositional -primiparous -prismatic -prefectural -probabilistic -probabilistic -procedural -processional -processional -proconsular -promotional -promotional -propulsive -Prussian -pudendal -puerile -pugilistic -Carthaginian -purgatorial -purgatorial -puritanical -pyemic -pyloric -pyogenic -pyrectic -pyrochemical -pyroelectric -pyrogallic -pyrogenic -pyrographic -pyroligneous -pyrolytic -pyrotechnic -pyrrhic -pyrrhic -pyrrhic -Qatari -quadratic -biquadratic -quadratic -quadraphonic -quincentennial -Quechuan -Rabelaisian -rayless -recessionary -recessional -redemptive -regimental -residential -residuary -resistive -respiratory -inspiratory -expiratory -responsive -retentive -reversionary -Rhenish -rhizomatous -rhizoidal -rhomboid -ritualistic -romaic -Romany -rotational -Rwandan -Sabahan -Sabbatarian -sabbatical -sabbatical -sacral -sacrificial -Samoan -Sarawakian -satyric -saxicolous -Saxon -schismatic -schizoid -scorbutic -scotomatous -Semite -Semitic -Senegalese -sericultural -serous -Seychellois -Thai -Thai -Thai -Siberian -Singaporean -Singaporean -Singhalese -Sinhala -Slav -Slavonic -Somalian -Sotho -spastic -spicate -spondaic -stereoscopic -stereoscopic -stigmatic -stingless -stipendiary -substantival -gerundial -Sudanese -sulphuric -Sumatran -Swazi -syphilitic -systolic -extrasystolic -Tahitian -Taiwanese -tabular -Tamil -tannic -Tanzanian -tarsal -tartaric -telephonic -terminological -terpsichorean -tertian -tertian -tetanic -tetanic -tetravalent -Texan -textile -theosophical -thermionic -thermometric -thermostatic -thespian -Tobagonian -Togolese -Tongan -tonsorial -translational -Triassic -Trinidadian -trihydroxy -trivalent -trochaic -Trojan -trophoblastic -trophotropic -Tunisian -Tunisian -Turkic -tutorial -Ugandan -uric -uricosuric -uvular -vaginal -valvular -vehicular -vestal -vestiary -vestmental -veterinary -vibrionic -viceregal -Vietnamese -vocative -voyeuristic -weatherly -Welsh -wheaten -Wiccan -oaten -woolen -xerographic -Yemeni -Zairean -Zambian -zenithal -Zimbabwean -Zionist -Zionist -zonal -bizonal -zodiacal -ammoniated -Briton -carroty -philhellenic -boreal -boreal -axillary -paniculate -phyllodial -rupestral -Kafkaesque -Faustian -invitational -involucrate -scalar -scalar -anthropocentric -ethnocentric -deictic -shamanist -shambolic -shaped -shelflike -Shona -striate -sulcate -hymenal -hymeneal -servomechanical -onomatopoeic -commercial -dictyopteran -isopteran -obligational -oscine -osseous -ossicular -ossiferous -osteal -abolitionary -abomasal -absolutist -accentual -accessional -accipitrine -accommodational -acculturational -centromeric -acentric -acrocentric -metacentric -metacentric -telocentric -anaphylactic -bronchoscopic -bryophytic -bulbaceous -bulbed -bulbar -racial -scalic -rosaceous -Rosicrucian -streptococcal -subclavian -thalloid -thallophytic -ulcerative -ultramicroscopic -ultramontane -undescended -undulatory -universalistic -vasomotor -vesical -viscometric -viricidal -vitiliginous -ratlike -salamandriform -salvific -shakedown -sidearm -varicelliform -wiry -WYSIWYG -yeasty -Yuman -Zapotec -zero -zoonotic -zygomatic -zymoid -nosohusial -avenged -unavenged -beaten -calibrated -cantering -collected -uncollected -contested -uncontested -corbelled -elapsed -forced -hammered -held -streaming -surmounted -filled -unfilled -fitted -hypophysectomized -malted -unmalted -mercerized -operating -oxidized -parked -pasteurized -unpasteurized -penciled -pitched -played -plugged -posed -unposed -posted -preconceived -punishing -pursued -ranging -regenerating -ridged -sanitized -shrieked -sintered -sluicing -squashed -stacked -strung -sublimed -thoriated -transpiring -sought -saponified -unsaponified diff --git a/static/text/adjectives.old b/static/text/adjectives.old deleted file mode 100644 index 7731cf6..0000000 --- a/static/text/adjectives.old +++ /dev/null @@ -1 +0,0 @@ -lulling, vile, foul, cheerful, messy, dreadful, uneven, stinky, young, sparkling, sweltering, verdant, hideous, friendly, blistering, rambunctious, carefree, fat, sloppy, gloomy, awful, anemic, minute, stiff, benevolent, ceaseless, large, quick, round, glassy, rusty, scarce, odd, shining, even, dowdy, solemn, scorching, brief, rotten, new, plush, cozy, meandering, apologetic, nimble, busy, strong, great, brilliant, piercing, creepy, miniature, narrow, whimsical, fantastic, cowardly, disgusting, marvelous, snug, stern, stingy, angry, spiky, cheeky, gorgeous, mysterious, flat, clever, charming, dismal, meek, somber, sour, thin, beautiful, stubborn, crazy, challenging, gaunt, salty, indifferent, huge, daring, awkward, picturesque, copious, glowing, truthful, rude, petite, cranky, ornery, brazen, modest, purring, filthy, rotund, short, splendid, hasty, deafening, crawling, furious, tall, mute, ghastly, still, arrogant, crabby, haughty, curly, voiceless, hot, courageous, late, microscopic, vast, stifling, good, disrespectful, bashful, moaning, towering, adventurous, idyllic, careless, shocking, erratic, heavy, square, hard, jagged, gullible, hushed, revolting, content, thrifty, sluggish, eternal, greedy, pleasant, small, demanding, greasy, enormous, hostile, terrible, chilly, speedy, massive, loud, puny, striking, clumsy, soaring, brave, fast, delicious, effortless, bland, thick, little, ancient, silent, wonderful, stuffed, grimy, bitter, muggy, shallow, ridiculous, absent-minded, fuzzy, peculiar, mangy, wide, kind, squeaky, screeching, silly, squealing, spoiled, gigantic, happy, steep, ingenious, modern, juicy, gentle, medium, brawny, curved, lumpy, afraid, amusing, thundering, cooing, oppressive, swollen, grave, sturdy, average, proud, rancid, absurd, entertaining, annoyed, fussy, precise, subtle, gilded, slow, delinquent, nervous, hopeful, rich, adequate, shrill, plump, freezing, nasty, endless, lavish, worried, courteous, bulky, fair, diminutive, groggy, miserable, horrid, crooked, monstrous, superb, contrary, lazy, fidgety, menacing, swift, stale, quarrelsome, quiet, askew, tough, simple, sweet, hardworking, frosty, whispering, famished, crispy, caring, capable, tiny, immense, startled, lovely, high-pitched, tasteless, decrepit, tense, lousy, straight, excited, ugly, stunning, parched, wild, ripe, lonely, optimistic, obnoxious, cavernous, different, harsh, creaky, grand, difficult, temporary, eccentric, muffled, alert, delicate, timid, infamous, enchanting, anxious, humble, edgy, severe, repulsive, desolate, sleepy, slimy, irritable, vigilant, generous, rapid, old-fashioned, hilly, easy, righteous, joyful, surprised, starving, big, early, compassionate, moody, perpetual, dishonest, serious, foolish, soft, old, scared, mighty, trendy, curious, hissing, savage, dense, steaming, broad, slick, creative, icy, adorable, slight, terrified, intense, noisy, cautious, sizzling, blithe, fluttering, faint, delighted, smelly, lively, frightened, gauzy, long, strict, bored, calm, melodic, spicy, relaxed, triangular, dull, wise, dangerous, smooth, cruel, creeping, dawdling, intimidating, exhausted, deep, tasty, obtuse, graceful, tranquil, raspy, selfish, sullen, malicious, ecstatic, wrinkly, opulent, polite, fetid, husky, prudent, skinny, tricky, impatient, loyal, fresh diff --git a/static/text/animals b/static/text/animals deleted file mode 100644 index 0e2e012..0000000 --- a/static/text/animals +++ /dev/null @@ -1 +0,0 @@ -fawn, peacock, fox terrier, civet, musk deer, seastar, pigeon, bull, bumblebee, crocodile, flying squirrel, elephant, leopard seal, baboon, porcupine, wolverine, spider monkey, vampire bat, sparrow, manatee, possum, swallow, wildcat, bandicoot, labradoodle, dragonfly, tarsier, snowy owl, chameleon, boykin, puffin, bison, llama, kitten, stinkbug, macaw, parrot, leopard cat, prawn, panther, dogfish, fennec, frigatebird, nurse shark, turkey, cockatoo, neanderthal, crow, gopher, reindeer, earwig , anaconda, panda, ant, silver fox, collared peccary, puppy, common buzzard, moose, binturong, wildebeest, lovebird, ferret, persian, marine toad, woolly mammoth, dalmatian, bird, umbrellabird, kingfisher, kangaroo, stallion, russian blue, ostrich, owl, tawny owl, affenpinscher, caiman, elephant seal, octopus, meerkat, whale shark, buck, donkey, red wolf, mountain lion, labrador retriever, quetzal, chamois, sponge, hamster, orangutan, sea urchin, uakari, doberman, dormouse, saint bernard, bull shark, ocelot, sparrow, spitz, stoat, snapping turtle, dragonfly, cougar, alligator, walrus, glass lizard, malayan tiger, frog, tiger, armadillo, chinchilla, crab, squid, calf, shrew, dolphin, royal penguin, dingo, turtle, yellow-eyed penguin, chimpanzee, armadillo, boa constrictor, rabbit, basking, coyote, chinook, osprey, sea lion, fly, sperm whale, patas monkey, tiffany, mountain goat, dodo, worm, cat, warthog, peccary, shark, pony, monkey, swan, whippet, beagle, cougar, anteater, quail, liger, cheetah, woodpecker, egret, eagle, moose, warthog, honey bee, snail, stag beetle, budgie, molly, magpie, rhinoceros, elephant, kudu, wombat, tree frog, goat, lamb, tropicbird, human, hog, tang, pool frog, lemur, ox, dog, lizard, echidna, great dane, wallaby, hawk, dove, jellyfish, sloth, macaque, starfish, sun bear, guppy, welsh corgi, deer, impala, porpoise, gazelle, bichon, seal, wolf, zebra shark, mole, narwhal, hedgehog, sheep, horse, bluetick, colt, spadefoot toad, wildebeest, piranha, basenji, mallard, bull mastiff, bear, siberian husky, bird, badger, red panda, hammerhead, rock hyrax, kangaroo, marsh frog, mule, weasel, dogfish, dachsbracke, forest elephant, oyster, bat, python, coati, platypus, salamander, cat, caterpillar, giraffe, snake, kid, falcon, robin, guinea fowl, tern, sea lion, dingo, bolognese, drake, goose, rat, gentoo penguin, iguana, quail, mouse, horseshoe crab, roebuck, cattle dog, fish, poodle, frog, wolverine, chinchilla, bobcat, grey seal, hermit crab, carolina, shepherd, gila monster, snail, mandrill, leopard, frilled lizard, echidna, rabbit, bison, barracuda, foal, ass, eagle, octopus, avocet, siamese, dodo, yorkie, cockroach, wallaroo, tiger, woodlouse, glow worm, fossa, buffalo, zorse, albatross, indri, seahorse, lemur, louse, ostrich, humpback whale, millipede, fin whale, joey, pinscher, dachshund, proboscis monkey, pelican, chihuahua, dogo, indian rhinoceros, wasp, siberian, raccoon dog, yak, stingray, jack russel, water vole, foxhound, sheep, stork, horse, monkey, woolly monkey, waterbuck, dunker, cuscus, ibis, giraffe, aardvark, hummingbird, grizzly bear, otter, pike, minke whale, pika, stickbug, pelican, dugong, bongo, lemming, shrimp, piglet, sabre-toothed tiger, gemsbok, tiger shark, tuatara, rottweiler, elephant shrew, ewe, coati, cichlid, akita, gharial, thorny devil, duck, macaroni penguin, steer, setter, pufferfish, donkey, mink, macaw, wolfhound, white tiger, ram, ant, rat, marten, galapagos tortoise, crab, horn shark, blue whale, koala, starfish, partridge, sea squirt, fire-bellied toad, chipmunk, ibex, maltese, clumber, butterfly, manta ray, flamingo, opossum, parrot, mastiff, water buffalo, okapi, salmon, tapir, adelie, killer whale, lynx, basilisk, indian elephant, oyster, manta ray, prairie dog, chipmunk, locust, dog, cottontop, hyena, spectacled bear, oriole, cobra, pug, monitor, mandrill, antelope, chinstrap, zebra, chicken, mule, seal, goat, little penguin, gull, tasmanian devil, caterpillar, tamarin, wrasse, woodchuck, otter, penguin, porcupine, killer whale, bear, ferret, dusky, nightingale, slow worm, bat, jaguar, humboldt, ermine, saola, emu, lobster, weasel, nightingale, hound, bombay, platypus, electric eel, asian elephant, sea otter, uguisu, scorpion, fox, jerboa, bengal tiger, zebu, lion, zonkey, ragdoll, caracal, bee, kiwi, puma, common loon, jackal, malamute, mayfly, baboon, terrier, jellyfish, vicuna, penguin, desert tortoise, muskrat, water dragon, zebra, malayan civet, burmese, orangutan, himalayan, pond skater, howler monkey, newt, border collie, cow, bearded dragon, fish, barn owl, puffin, chin, anteater, beaver, canary, hamster, sloth, collie, heron, sea dragon, gopher, magpie, king crab, flounder, opossum, pademelon, capybara, boar, leaf-tailed gecko, turkey, clown fish, musk-ox, bulldog, pronghorn, hercules beetle, reindeer, llama, pygmy, eskimo dog, kinkajou, komodo dragon, cuttlefish, cub, bloodhound, squirrel, gander, moorhen, emu, brown bear, javanese, birman, harrier, tortoise, antelope, gnu, kingfisher, wasp, olm, havanese, canaan, lizard, indochinese tiger, ocelot, mist, hare, discus, cony, orca, rooster, ground hog, silver dollar, peacock, akbash, somali, beaver, maine coon, mouse, eland, squirrel, serval, chimpanzee, snowshoe, toucan, catfish, lynx, coyote, bunny, retriever, fur seal, cow, balinese, vulture, coral, leopard, raccoon, polar bear, okapi, kakapo, whale, sand lizard, bonobo, moray, gila monster, cormorant, bracke, camel, markhor, rockhopper, neapolitan, black bear, roseate spoonbill, woodpecker, mountain lion, crested penguin, hippopotamus, puma, camel, alligator, guinea pig, heron, siberian tiger, river dolphin, axolotl, argentino, human, mongoose, drever, quokka, common frog, elk, wombat, spider monkey, civet, sting ray, panther, gar, lionfish, snake, crane, newt, raven, tortoise, fire ant, chicadee, common toad, pig, manatee, centipede, numbat, river turtle, falcon, angelfish, chamois, rhinoceros, shark, flamingo, pheasant, ladybird, grasshopper, greyhound, lemming, pig, marmoset, eel, yorkiepoo, tiger salamander, mosquito, shih tzu, quoll, chick, guanaco, walrus, badger, ainu, squid, pekingese, gerbil, duck, rattlesnake, tapir, lobster, catfish, mustang, wallaby, mongrel, butterfly, booby, bush elephant, fox, rattlesnake, cockroach, tadpole, lark, ape, pied tamarin, mare, tetra, squirrel monkey, elephant seal, dhole, cesky, raccoon, newfoundland, marmoset, stag, bullfrog, black bear, crocodile, lion, barb, wolf, vervet monkey, beetle, polar bear, pointer, grizzly bear, meerkat, owl, reptile, fousek, gibbon, king penguin, budgerigar, swan, hartebeest, cassowary, borneo elephant, oryx, alpaca, gerbil, chameleon, galapagos penguin, vulture, barracuda, insect, fishing cat, hen, giant clam, hare, polecat, fly, chow chow, yak, seahorse, spider, eel, burro, brown bear, boxer dog, crane, bandicoot, hedgehog, dromedary, goose, budgerigar, dolphin, kelpie dog, highland cattle, dormouse, duckbill, springbok, mongoose, bobcat, water buffalo, gecko, hornet, iguana, wild boar, koala, guinea pig, marmot, skink, deer, filly, barnacle, tree toad, leopard tortoise, appenzeller, doe, gecko, mole, mynah bird, mau, gilla monster, french bulldog, termite, salamander, parakeet, finch, horned frog, hippopotamus, hummingbird, cheetah, albatross, jaguar, toad, hyena, gorilla, skunk, impala, sea slug, scorpion fish, jackal, skunk, grouse, sea turtle, moth, caribou, dugong, bighorn sheep, ibizan hound, gorilla, puffer fish, chicken, komodo dragon, buffalo diff --git a/static/text/animals.all b/static/text/animals.all deleted file mode 100644 index a1dd7b0..0000000 --- a/static/text/animals.all +++ /dev/null @@ -1,4902 +0,0 @@ -aardvark -aardwolf -abalone -abomasum -abortus -Abramis -Abrocoma -abrocome -Abudefduf -Abyssinian -Acanthisitta -Acanthocephala -acanthocephalan -Acanthocybium -Acanthophis -Acanthopterygii -Acanthoscelides -Acanthuridae -Acanthurus -acarid -Acaridae -Acarina -acarine -acarus -accentor -Accipiter -Accipitridae -Accipitriformes -Acherontia -Acheta -Achoerodus -acidophil -acidophilus -Acinonyx -Acipenser -Acipenseridae -Acnidosporidia -Acrididae -Acridotheres -Acris -Acrobates -Acrocephalus -acrodont -Acropora -Actias -actinia -Actinia -Actiniaria -actinomyces -Actinomycetaceae -Actinomycetales -actinomycete -Actinomyxidia -actinomyxidian -actinopod -Actinopoda -Actitis -aculea -aculeus -Adalia -Adapid -addax -adder -Adelges -adelgid -Adelgidae -Adelie -Adenota -adenovirus -admiral -adult -Aedes -Aegina -Aegypiidae -Aegypius -Aegyptopithecus -Aepyceros -Aepyornidae -Aepyorniformes -Aerobacter -aerobe -Aetobatus -affenpinscher -Affirmed -Africander -afropavo -aftershaft -agama -agamid -Agamidae -Agapornis -Agelaius -Agkistrodon -Agnatha -Agonidae -Agonus -agouti -Agriocharis -Agrobacterium -agua -Ailuropoda -Ailuropodidae -Ailurus -Airedale -Aix -Ajaia -Akeridae -ala -Alauda -Alaudidae -albacore -albatross -Albula -Albulidae -Alca -Alcedinidae -Alcedo -Alcelaphus -Alces -Alcidae -Alcyonacea -Alcyonaria -alderfly -Alectis -Alectoris -Alectura -Alepisaurus -alewife -Aleyrodes -Aleyrodidae -alga -Algeripithecus -allantois -alligator -alligatorfish -Alligatoridae -allosaur -Alopex -Alopiidae -Alopius -Alosa -Alouatta -alpaca -alphavirus -Alsophila -alula -Alytes -amazon -Amazona -amberjack -Ambloplites -Amblyrhynchus -ambulacrum -Ambystoma -Ambystomatidae -ambystomid -ameba -Ameiuridae -Ameiurus -Amia -Amiidae -Ammodytes -Ammodytidae -Ammotragus -amnion -Amniota -amniote -Amoebida -amphibia -amphibian -Amphibolips -amphidiploid -Amphineura -Amphioxidae -amphipod -Amphipoda -Amphiprion -Amphisbaena -Amphisbaenidae -amphiuma -Amphiumidae -Anabantidae -Anabas -Anabrus -Anacanthini -anaconda -anaerobe -Anagasta -anapsid -Anapsida -Anarhichadidae -Anarhichas -Anas -Anasa -anaspid -Anaspida -Anastomus -Anatidae -anatotitan -anchovy -Ancylidae -Ancylostomatidae -Ancylus -andrena -Andrenidae -Andricus -Aneides -angelfish -anglewing -Angora -Anguidae -Anguilla -Anguillidae -Anguilliformes -Anguillula -Anguis -angwantibo -Anhima -Anhimidae -Anhingidae -ani -animalcule -Animalia -Anisoptera -Anisotremus -ankylosaur -annelid -Annelida -Anniellidae -anoa -Anobiidae -Anodonta -Anolis -Anomala -Anomalopidae -anomalops -anomalopteryx -Anomia -Anomiidae -Anopheles -anopheline -Anoplura -Anostraca -Anser -Anseres -Anseriformes -Anserinae -ant -antbird -anteater -Antedon -Antedonidae -antelope -antenna -Antennariidae -Antheraea -Anthidium -Anthonomus -Anthozoa -anthozoan -anthropoid -Anthropoidea -Anthus -Antidorcas -Antigonia -Antilocapra -Antilocapridae -Antilope -antler -Antrozous -Aotus -aoudad -apar -apatosaur -Apatura -ape -aperea -Aphasmidia -aphid -Aphididae -Aphidoidea -Aphis -Aphriza -Aphrophora -Apidae -Apis -Aplodontia -Aplodontiidae -Aplysia -Aplysiidae -apodeme -Apodemus -Apodidae -Apodiformes -Apogon -Apogonidae -Apoidea -apolemia -Appaloosa -appendicularia -Appenzeller -Aptenodytes -Apterygidae -Apterygiformes -Apus -Aquila -Ara -Arabian -arachnid -Arachnida -arame -Aramus -Aranea -Araneae -arbovirus -Arca -arcella -Arcellidae -archaebacteria -archaeopteryx -archaeornis -Archaeornithes -archenteron -archerfish -archiannelid -Archiannelida -Archidiskidon -Archilochus -architeuthis -Archosargus -archosaur -Archosauria -Arcidae -Arctictis -arctiid -Arctiidae -Arctocebus -Arctocephalus -Arctonyx -Ardea -Ardeidae -Arenaria -Arenaviridae -arenavirus -argali -Argasidae -Argentina -argentine -Argentinidae -argentinosaur -Argiope -Argiopidae -Argonauta -Argonautidae -argus -Argusianus -Argynnis -Argyrotaenia -Ariidae -Arilus -Ariomma -arista -Arius -Arizona -Armadillidiidae -Armadillidium -armadillo -armor -armyworm -arrowworm -Artamidae -Artamus -Artemia -arthropod -Arthropoda -Artiodactyla -Arvicola -Ascaphidae -Ascaphus -Ascaridae -Ascaridia -Ascaris -Ascidiaceae -ascidian -Ascophyllum -Asilidae -Asio -asp -Aspidelaps -Aspidiotus -Aspidophoroides -ass -Assault -Astacidae -Astacus -Asteroidea -Astrophyton -Astropogon -Ateles -Athene -Atherinidae -Atherinopsis -Atherurus -Athiorhodaceae -Atrichornis -Atrichornithidae -Atropidae -Atticus -auk -auklet -Aulacorhyncus -Aulostomidae -Aulostomus -Auriparus -aurochs -australopithecine -Automeris -avadavat -Avahi -Aves -avocet -axolotl -aye-aye -Ayrshire -Aythya -baa-lamb -babbler -Babesiidae -babirusa -baboon -baby -Babyrousa -Bacillaceae -Bacillariophyceae -bacillus -backswimmer -bacteria -bacteriochlorophyll -bacteriophage -bacteroid -Bacteroidaceae -Bacteroides -badger -Baiomys -Bairdiella -Balaena -Balaeniceps -Balaenicipitidae -Balaenidae -Balaenoptera -Balaenopteridae -Balanidae -Balanus -Balistes -Balistidae -balloonfish -bandicoot -Bangiaceae -Bankia -bantam -banteng -barb -barbel -barbet -barbu -bark-louse -barnacle -baronduki -barosaur -barracouta -barracuda -barramundi -barrelfish -Bartramia -basenji -Basiliscus -basilisk -bass -Bassariscidae -Bassariscus -bassarisk -basset -bat -batfish -Bathyergidae -Bathyergus -Batrachoididae -Batrachoseps -bay -baya -beagle -beak -bear -beard -beaugregory -beaver -bedbug -bee -beef -beetle -belemnite -Belemnitidae -Belemnoidea -bellbird -bellwether -belly -Belonidae -Belostomatidae -beluga -Bemisia -beroe -Berycomorphi -bettong -Bettongia -Bibos -bigeye -bighorn -billfish -billy -binturong -biped -bird -bison -bitch -Bitis -Bittacidae -bittern -bivalve -Bivalvia -Blaberus -blackbird -blackbuck -Blackburn -blackcap -blackcock -blackfish -blackfly -blackpoll -blacksnake -bladderwrack -blanquillo -Blarina -blastocoel -blastocyst -blastoderm -blastomere -blastopore -blastula -Blatta -Blattella -Blattidae -Blattodea -Blenniidae -Blennioidea -Blennius -blenny -blindworm -Blissus -bloodhound -bloodworm -blowfly -blue -bluebird -bluebottle -bluefin -bluefish -bluegill -bluehead -bluepoint -bluethroat -bluetick -bluewing -boa -boar -boarfish -boarhound -boatbill -bobcat -bobolink -bobtail -bobwhite -Boidae -bollworm -bolti -Bombina -Bombus -bombycid -Bombycidae -Bombycilla -Bombycillidae -Bombyliidae -Bombyx -Bonasa -bonefish -bongo -bonito -booby -booklouse -borrelia -borzoi -Bos -Boselaphus -bot -Botaurus -botfly -Bothidae -Bothrops -bottom-feeder -botulinus -bovid -Bovidae -Bovinae -bovine -Bovini -bowerbird -bowfin -bowhead -boxer -boxfish -Brachinus -brachiopod -Brachiopoda -Brachyura -brachyuran -Bradypodidae -Bradypus -Brahman -Brama -brambling -Bramidae -Branchiobdella -Branchiobdellidae -Branchiopoda -Branchiostegidae -Branchiura -brant -Branta -breast -Brevoortia -briard -brill -brisling -bristle -bristletail -brit -broadbill -broadtail -brocket -bronco -broodmare -Brosmius -brotula -Brotulidae -browntail -Brucella -Bruchidae -Bruchus -bruin -brush -Bryozoa -bryozoan -Bubalus -Bubo -Bubulcus -Buccinidae -Bucconidae -Bucephala -Buceros -Bucerotidae -buck -buckskin -budgerigar -Budorcas -bufflehead -bufo -Bufonidae -bug -bulbul -bull -bulldog -bullfinch -bullfrog -bullhead -bullock -bullterrier -bumblebee -Bungarus -bunny -bunting -Bunyaviridae -bunyavirus -burbot -Burhinidae -Burhinus -Burmeisteria -burrfish -burro -bushbuck -bushtit -bustard -butcherbird -Buteo -buteonine -butterfish -butterfly -buzzard -by-catch -byssus -cabbageworm -Cacajao -Cacicus -cacique -cackler -caddisworm -Cadra -caecilian -Caeciliidae -Caenolestes -Caenolestidae -caiman -Cairina -cairn -Calamus -calf -Calidris -Callicebus -Callimorpha -Callinectes -Callionymidae -Calliophis -Calliphora -Calliphoridae -Callisaurus -Callithricidae -Callithrix -Callorhinus -calosoma -calyculus -Calymmatobacterium -Cambarus -camel -Camelidae -Camelus -Campephilus -Camponotus -Campylorhynchus -Canachites -canary -Cancer -Cancridae -Canidae -canine -Canis -cankerworm -cannon -canvasback -capelin -capercaillie -Capitonidae -capon -Capra -Caprella -Capreolus -Capricornis -Caprimulgidae -Caprimulgiformes -Caprimulgus -Caproidae -Capromyidae -Capros -capsid -capuchin -capybara -carabao -Carabidae -caracal -caracara -carancha -Carangidae -Caranx -carapace -Carapidae -Carassius -carcase -Carcharhinidae -Carcharhinus -Carcharias -Carchariidae -Carcharodon -Cardigan -Cardiidae -cardinal -cardinalfish -Cardium -Carduelinae -Carduelis -Caretta -Cariama -Cariamidae -caribou -carinate -Carnivora -carnivore -carnosaur -Carnosaura -carp -Carphophis -Carpocapsa -Carpodacus -carrier -carrion -carthorse -caseworm -Casmerodius -cassowary -Castor -Castoridae -Castoroides -Casuaridae -Casuariiformes -Casuarius -cat -Catacala -catalufa -catbird -caterpillar -catfish -Catharacta -Cathartes -Cathartidae -Catoptrophorus -catostomid -Catostomidae -Catostomus -cattalo -cattle -Cavia -Caviidae -cavy -cayuse -Cebidae -Cebuella -Cebus -Cecidomyidae -cecropia -centipede -Centrarchidae -Centriscidae -Centrocercus -Centropomidae -Centropomus -Centropristis -Centropus -Cephalobidae -Cephalochordata -cephalochordate -cephalopod -Cephalopoda -Cephalopterus -Cepphus -Cerambycidae -Cerapteryx -ceras -Ceratitis -Ceratodontidae -ceratodus -Ceratopogon -Ceratopogonidae -Ceratopsia -ceratopsian -Ceratopsidae -ceratosaur -Ceratotherium -cercaria -Cercocebus -Cercopidae -Cercopithecidae -Cercopithecus -cere -cero -Certhia -Certhiidae -Cervidae -Cervus -Ceryle -Cestida -Cestidae -Cestoda -Cestum -Cetacea -cetacean -Cetonia -Cetoniidae -Cetorhinidae -Cetorhinus -chachalaca -chacma -Chaenopsis -chaeta -Chaetodipterus -chaetodon -Chaetodontidae -Chaetognatha -chaffinch -chaja -chalaza -Chalcididae -Chalcis -Chalcostigma -Chamaea -Chamaeleo -Chamaeleontidae -chameleon -chamois -Channidae -char -Chara -Characeae -Characidae -characin -Characinidae -Charadrii -Charadriidae -Charadriiformes -Charadrius -Charales -charger -Charina -Charolais -Charophyceae -Charronia -Chateura -Chauna -cheetah -chelicera -Chelicerata -Chelifer -Chelonethida -Chelonia -chelonian -Cheloniidae -Chelydra -Chelydridae -Chen -cherrystone -chestnut -Cheviot -chevrotain -chewink -chick -chickadee -chicken -chickeree -chigetai -chigoe -Chihuahua -Chilomastix -Chilomeniscus -Chilomycterus -Chilopoda -chimaera -Chimaeridae -chimpanzee -chinchilla -Chinchillidae -chine -chinook -chipmunk -Chironomidae -Chironomus -Chiroptera -chiton -Chlamydera -chlamydia -Chlamydiaceae -Chlamydomonadaceae -Chlamydomonas -Chlamydosaurus -Chlamyphorus -chlorella -Chlorococcales -Chlorococcum -Chlorophis -Chlorophoneus -Chlorophthalmidae -Chlorophyceae -chlorophyll -Chlorophyta -Chlorura -choanocyte -Choeronycteris -Choloepus -Chondrichthyes -Chondrus -chordamesoderm -Chordata -chordate -Chordeiles -chorioallantois -chorion -Choriotis -Chorizagrotis -chough -chow -Chronoperates -chrysalis -Chrysaora -Chrysemys -Chrysochloridae -Chrysochloris -Chrysolophus -Chrysomelidae -Chrysophrys -Chrysophyceae -Chrysophyta -Chrysopidae -chub -chuckwalla -chuck-will's-widow -chunga -cicada -Cicadellidae -Cicadidae -cichlid -Cichlidae -Cicindelidae -Ciconia -Ciconiidae -Ciconiiformes -Ciliata -ciliate -cilium -Cimex -Cimicidae -Cinclidae -Cinclus -cinnabar -Circaetus -Circus -Cirripedia -cirrus -cisco -Cistothorus -Citation -Citellus -Citharichthys -civet -Cladorhyncus -clam -Clamatores -clamshell -Clangula -claw -Cleridae -Clethrionomys -clingfish -clinid -Clinidae -clostridium -clumber -Clupea -Clupeidae -Clydesdale -clypeus -Cnemidophorus -Cnidaria -Cnidosporidia -coachwhip -coat -coati -cob -cobia -Cobitidae -cobra -Coccidae -Coccidia -coccidium -Coccinellidae -coccobacillus -Coccoidea -Coccothraustes -coccus -Coccyzus -cochin -Cochlearius -cock -cockateel -cockatoo -cockchafer -cockerel -cockle -cockroach -cocoon -cod -codling -coelacanth -coelenterate -coelenteron -coelophysis -Coereba -Coerebidae -coho -Colaptes -Coleonyx -Coleoptera -Colinus -coliphage -Collembola -collembolan -collie -Collocalia -colobus -colt -Coluber -Colubridae -Columba -Columbidae -Columbiformes -Comatula -Comatulidae -comb -comma -commensal -compsognathus -conch -conchfish -condor -Condylura -conenose -Conepatus -coney -conferva -conger -Congridae -Conilurus -Connochaetes -conodont -Conodonta -conspecific -constrictor -Contopus -Conuropsis -coondog -coonhound -coot -cooter -copepod -Copepoda -copper -copperhead -Coracias -Coraciidae -Coraciiformes -Coragyps -coral -corbina -Cordylidae -Cordylus -Coregonidae -Coregonus -Coreidae -corgi -Corixa -Corixidae -cormorant -corncrake -cornetfish -Cornish -coronet -Corvidae -Corvus -Corydalidae -Corydalus -Corynebacteriaceae -corynebacterium -Coryphaenidae -corythosaur -coscoroba -cosmid -Cosmocampus -costia -cotinga -Cotingidae -Cotswold -Cottidae -cottonwick -Cottus -Coturnix -coucal -cougar -courlan -courser -cow -cowbird -cowfish -cowrie -coxsackievirus -coydog -coyote -coypu -crab -Cracidae -Cracticidae -Cracticus -crake -crane -Crangon -Crangonidae -crapaud -crappie -Crassostrea -craw -Crax -crayfish -creeper -creepy-crawly -creole-fish -crest -Crex -Cricetidae -Cricetus -cricket -crinoid -Crinoidea -critter -croaker -Crocethia -crocodile -Crocodylia -Crocodylidae -Crocodylus -Crocuta -Cro-magnon -crossbill -crossopterygian -Crossopterygii -Crotalidae -Crotalus -Crotaphytus -Crotophaga -crow -crowbait -Crustacea -crustacean -Cryptacanthodes -Cryptobranchidae -Cryptobranchus -Cryptocercidae -Cryptocercus -cryptomonad -Cryptophyceae -Cryptophyta -Cryptoprocta -Cryptotermes -Cryptotis -ctene -ctenidium -Ctenizidae -Ctenocephalides -Ctenocephalus -Ctenophora -ctenophore -cub -cuckoo -cuckoo-bumblebee -Cuculidae -Cuculiformes -Cuculus -Culex -Culicidae -Cuniculus -cunner -Cuon -cupule -cur -curassow -Curculionidae -curlew -currawong -Cursorius -cuscus -cusk -cusk-eel -Cuterebra -Cuterebridae -cuticula -cutlassfish -cuttlefish -cutworm -Cyamus -cyanobacteria -Cyanocitta -Cyanophyta -Cycliophora -Cyclopes -cyclops -Cyclopteridae -Cyclopterus -Cyclosporeae -Cyclostomata -cyclostome -Cydippida -cygnet -Cygnus -Cymatiidae -Cynipidae -Cynips -Cynocephalidae -Cynocephalus -cynodont -Cynodontia -Cynoglossidae -Cynomys -Cynopterus -Cynoscion -Cypraea -Cypraeidae -cyprinid -Cyprinidae -Cypriniformes -cyprinodont -Cyprinodontidae -Cyprinus -Cystophora -cytomegalovirus -cytostome -dabchick -dace -Dacelo -dachshund -Dactylopiidae -Dactylopius -Dactylopteridae -Dactylopterus -Dactyloscopidae -dalmatian -dam -Dama -Damaliscus -damselfish -damselfly -danaid -Danaidae -Danaus -daphnia -darter -Dasyatidae -Dasyatis -Dasypodidae -Dasyprocta -Dasyproctidae -Dasypus -dasyure -Dasyuridae -Dasyurus -Daubentonia -Daubentoniidae -dealfish -decapod -Decapoda -Decapterus -deer -defoliator -deinocheirus -deinonychus -Delichon -Delphinapterus -Delphinidae -Delphinus -Dendroaspis -Dendrocolaptes -Dendrocolaptidae -Dendroctonus -Dendroica -Dendrolagus -Denisonia -denizen -denticle -Dermacentor -Dermaptera -Dermatobia -Dermestidae -Dermochelyidae -Dermochelys -Dermoptera -desmid -Desmidiaceae -Desmidium -Desmodontidae -Desmodus -Desmograthus -Devon -dhole -Diadophis -Dialeurodes -diamondback -diapheromera -diapsid -Diapsida -Diaspididae -diatom -Dibranchiata -dibranchiate -dicamptodon -Dicamptodontidae -Diceros -dickeybird -Dicrostonyx -Dictyoptera -dicynodont -Dicynodontia -Didelphidae -Didelphis -difflugia -dihybrid -dik-dik -dimetrodon -dingo -dinoceras -Dinocerata -dinocerate -Dinoflagellata -dinoflagellate -Dinornis -Dinornithidae -Dinornithiformes -dinosaur -Diodon -Diodontidae -Diomedeidae -Diphylla -diplococcus -diplodocus -diploid -Diplopoda -Dipnoi -Dipodidae -Dipodomys -Dipsosaurus -Diptera -Dipus -Discocephali -Discoglossidae -Doberman -dobson -dock -doctorfish -dodo -doe -dog -dogfish -dogie -Dolichonyx -Dolichotis -Doliolidae -doliolum -dollarfish -dolphin -dolphinfish -Dominique -doodlebug -dorbeetle -Dorking -dormouse -dory -Dorylinae -dotterel -douroucouli -dove -dowitcher -down -Draco -Dracunculidae -Dracunculus -dragon -dragonet -dragonfly -drake -Dreissena -Drepanididae -Drepanis -driftfish -drill -dromaeosaur -Dromaeosauridae -Dromaius -drone -drosophila -Drosophilidae -drum -Drymarchon -dryopithecine -Dryopithecus -duck -duckling -dug -dugong -Dugongidae -dulse -Dumetella -dun -Duplicidentata -Durham -Dusicyon -Dysdercus -Dytiscidae -Eacles -eagle -eaglet -earthworm -earwig -Echeneididae -Echeneis -echidna -Echidnophaga -echinococcus -echinoderm -Echinodermata -Echinoidea -echovirus -ectoderm -ectoparasite -Ectopistes -ectoproct -Ectoprocta -Edaphosauridae -edaphosaurus -Edentata -edentate -Edmontonia -edmontosaurus -eel -eelblenny -eelpout -eelworm -eft -egg -eggar -egret -Egretta -eider -eiderdown -Eimeriidae -Eira -Elagatis -eland -Elanoides -Elanus -Elaphe -Elaphurus -elapid -Elapidae -elasmobranch -Elasmobranchii -Elateridae -elbow -Electrophoridae -Electrophorus -Eleotridae -elephant -Elephantidae -Elephas -Eleutherodactylus -Eliomys -elk -Elopidae -Elops -elver -Emberiza -Emberizidae -Embioptera -Embiotocidae -embryo -emperor -emu -Emydidae -encolure -endameba -Endamoeba -Endamoebidae -endoderm -endoparasite -Engraulidae -Engraulis -Enhydra -Ensis -entellus -Enterobacteriaceae -Enterobius -enterovirus -EntleBucher -Entomostraca -entoproct -Entoprocta -eohippus -eoraptor -ephemerid -Ephemeridae -ephemeron -Ephemeroptera -Ephestia -Ephippidae -Ephippiorhynchus -Epilachna -Epinephelus -eptatretus -Eptesicus -Equetus -Equidae -equine -Equus -Erethizon -Erethizontidae -Eretmochelys -Erignathus -Erinaceidae -Erinaceus -Eriosoma -Erithacus -ermine -ern -Erolia -erwinia -Erythrocebus -escherichia -Eschrichtiidae -Eschrichtius -escolar -Esocidae -Esox -Estrilda -Etropus -Euarctos -eubacteria -Eubacteriales -Eucinostomus -Euderma -Eudyptes -euglena -Euglenaceae -euglenoid -Euglenophyceae -Euglenophyta -eukaryote -Eumeces -Eumenes -Eumetopias -Eumops -Eunectes -Euphagus -Euphausiacea -Euphractus -Euplectella -Euproctis -Euronithopoda -Euryale -Euryalida -Eurylaimi -Eurylaimidae -eurypterid -Eurypterida -Eutamias -Eutheria -Euthynnus -ewe -Exaeretodon -Exmoor -Exocoetidae -Exocycloida -Exopterygota -eyas -Falco -falcon -falcon-gentle -Falconidae -Falconiformes -fanaloka -fang -Fasciola -Fasciolidae -Fasciolopsis -fawn -feather -feeder -feist -Felidae -feline -Felis -female -Fenusa -fer-de-lance -ferret -fetlock -fetus -fieldfare -fig-bird -filaria -Filariidae -filefish -filly -Filoviridae -filovirus -fin -finback -finch -fingerling -finisher -firebrat -firebug -firefly -fish -fishbone -fisher -Fissipedia -Fissurella -Fissurellidae -Fistularia -Fistulariidae -flag -flagellate -flagellum -flagfish -flamingo -flank -flatfish -flathead -flatworm -Flaviviridae -flavivirus -flea -fledgling -flicker -flickertail -flipper -flounder -fluke -fly -foal -foot -foram -Foraminifera -forefoot -foreleg -forelimb -forelock -forepaw -forewing -Forficula -Forficulidae -Formica -Formicariidae -Formicarius -Formicidae -fossa -Fossa -fox -foxhound -Francisella -Frankliniella -Fratercula -freetail -Fregata -Fregatidae -Friesian -Fringilla -Fringillidae -fritillary -frog -frogfish -froghopper -frogmouth -Fucaceae -Fucales -fucoid -fucus -Fulgoridae -Fulica -fulmar -Fulmarus -Fundulus -Fungia -fur -furcula -Furnariidae -Furnarius -gadfly -Gadidae -Gadiformes -gadoid -Gadus -galago -Galbulidae -Galeocerdo -Galeorhinus -Galleria -gallfly -Galliformes -Gallinago -Gallinula -gallinule -Gallirallus -Galloway -Gallus -Gambelia -Gambusia -game -gamecock -gander -gannet -ganoid -Ganoidei -ganoin -gar -garganey -Garrulinae -Garrulus -gaskin -Gasterophilidae -Gasterophilus -Gasterosteidae -Gasterosteus -Gastrophryne -gastropod -Gastropoda -gastrula -gaur -Gavia -gavial -Gavialidae -Gavialis -Gavidae -Gaviiformes -gayal -Gazella -gazelle -gecko -gee-gee -Gekkonidae -gelding -Gelechia -gelechiid -Gelechiidae -gempylid -Gempylidae -Gempylus -gemsbok -genet -Genetta -Genyonemus -Geochelone -Geococcyx -geoduck -geometrid -Geometridae -Geomyidae -Geomys -Geophilidae -Geophilomorpha -Geophilus -Geothlypis -gerbil -Gerbillinae -Gerbillus -gerenuk -Gerreidae -Gerres -Gerrhonotus -Gerrididae -Gerris -giant -giardia -gib -gibbon -Gigartinaceae -gill -Ginglymostoma -Giraffa -giraffe -Giraffidae -gizzard -Glareola -Glareolidae -Glaucomys -Gliridae -Glis -Globicephala -globigerina -Globigerinidae -Glossinidae -Glossopsitta -glowworm -glutton -gnat -gnatcatcher -Gnathostomata -gnathostome -gnu -goat -goatfish -goatsucker -Gobiesocidae -Gobiesox -Gobiidae -Gobio -goby -godwit -goldcrest -goldeneye -goldfinch -goldfish -gomphothere -Gomphotheriidae -Gomphotherium -gonococcus -Gonorhynchidae -Gonorhynchus -goosander -goose -goosefish -gopher -Gopherus -goral -Gorgonacea -gorgonian -Gorgonocephalus -gorilla -goshawk -gosling -gracilariid -Gracilariidae -grackle -Gracula -grade -grampus -grassfinch -grasshopper -grebe -greenbottle -greeneye -greenfly -greenling -greenshank -greenwing -gregarine -Gregarinida -grenadier -grey -greyback -greyhen -greyhound -greylag -griffon -grison -grivet -grizzly -groenendael -grosbeak -groundfish -groundhog -ground-shaker -grouper -grouse -grub -grubby -Gruidae -Gruiformes -grunt -Grus -Gryllidae -guan -guanaco -gudgeon -guenon -guereza -Guernsey -guillemot -guitarfish -gulfweed -gull -Gulo -gunnel -guppy -gurnard -Gymnelis -Gymnogyps -Gymnophiona -Gymnorhina -Gymnura -Gypaetus -Gyps -gyrfalcon -Gyrinidae -hack -hackle -hackney -haddock -hadrosaur -Hadrosauridae -Haematobia -Haematopodidae -Haematopus -Haemopis -haemoproteid -Haemoproteidae -Haemoproteus -Haemosporidia -haemosporidian -Haemulidae -Haemulon -hagfish -hair -hairstreak -hake -halcyon -Halcyon -Haldea -halfbeak -Haliaeetus -halibut -Halicoeres -Halictidae -Haliotidae -Haliotis -halobacteria -halophile -halter -hamadryad -Haminoea -hammerhead -Hampshire -hamster -hand -haploid -Haplosporidia -haplosporidian -hare -Harpia -harpy -harrier -hart -hartebeest -harvestfish -harvestman -hatchling -haunch -hawfinch -hawk -hawkmoth -head -hedgehog -heifer -Helicidae -Heliobacter -Heliothis -Heliozoa -heliozoan -Helix -hellbender -hellgrammiate -helminth -Heloderma -Helodermatidae -Hemachatus -Hemerobiidae -Hemigalus -Hemigrammus -Hemiprocnidae -Hemiptera -Hemipteronatus -Hemiramphidae -Hemitripterus -hen -hepadnavirus -herbivore -Hereford -Hermissenda -heron -herpes -Herpestes -herrerasaur -herring -Hesperiphona -Heterocephalus -Heterodon -Heterokontophyta -Heteromyidae -heteroploid -Heteroptera -Heteroscelus -Heterosomata -heterostracan -Heterostraci -Heterotrichales -Hexagrammidae -Hexagrammos -Hexamita -Hexanchidae -Hexanchus -hexapod -hide -Himantopus -hind -hindfoot -hindquarters -hinny -Hippobosca -Hippoboscidae -Hippocampus -Hippodamia -Hippoglossoides -Hippoglossus -Hippopotamidae -hippopotamus -Hipposideridae -Hipposideros -Hippotragus -Hipsurus -Hirudinea -Hirudinidae -Hirudo -Hirundinidae -Hirundo -hoatzin -hobby -hock -hog -hogchoker -hogfish -Holbrookia -Holocentridae -Holocentrus -holocephalan -Holocephali -holometabola -Holothuria -Holothuridae -Holothuroidea -Homaridae -Homarus -homeotherm -hominid -Hominidae -hominoid -Hominoidea -homo -Homona -Homoptera -honeybee -honeycreeper -honker -hood -hoof -hookworm -hoopoe -horn -hornbill -hornet -horse -horseback -horsefly -horseleech -host -hound -housedog -housefly -hummingbird -humpback -Hyaenidae -Hyalophora -Hyalospongiae -hybrid -hydra -Hydrobates -Hydrobatidae -Hydrochoeridae -Hydrochoerus -Hydrodamalis -Hydromantes -Hydromyinae -Hydromys -Hydrophidae -Hydrozoa -hydrozoan -Hyemoschus -hyena -Hyla -Hylactophryne -Hylidae -Hylobates -Hylobatidae -Hylocichla -Hylophylax -Hymenoptera -Hynerpeton -Hypentelium -Hypermastigina -hypermastigote -Hyperoglyphe -Hyperoodon -Hyphantria -Hypoderma -hypodermis -Hypopachus -Hypsiglena -Hypsiprymnodon -Hyracoidea -Hyracotherium -hyrax -Hystricidae -Hystricomorpha -Ibero-mesornis -ibex -ibis -ichneumon -Ichneumonidae -ichthyosaur -Ichthyosauria -Ichthyosauridae -ichthyosaurus -Ichyostega -Ictalurus -Icteria -Icteridae -Icterus -Ictiobus -ictodosaur -Ictodosauria -Ictonyx -iguanid -Iguanidae -iguanodon -Iguanodontidae -imago -impala -Inachis -Indicatoridae -indri -Indriidae -Infusoria -infusorian -insect -Insecta -Insectivora -insectivore -Insessores -instar -invertebrate -investment -Irena -Irenidae -Iridoprocne -Ischigualastia -isopod -Isopoda -Isoptera -Isospondyli -Istiophoridae -Istiophorus -Isuridae -Isurus -ivorybill -Ixobrychus -Ixodes -Ixodidae -jabiru -jacamar -jack -jackal -jackdaw -jackknife-fish -jackrabbit -jacksmelt -jacksnipe -Jaculus -jaeger -jaguar -jaguarundi -jassid -Jassidae -Javanthropus -jawfish -jay -jellyfish -jennet -jerboa -Jersey -jewfish -jird -Jordanella -junco -Jynx -Kakatoe -kaki -Kalotermes -Kalotermitidae -kanchil -kangaroo -Katsuwonidae -Katsuwonus -katydid -kea -keeshond -kelp -kelpie -Kenyapithecus -kestrel -kiang -kid -killdeer -killifish -kingbird -kingfish -kingfisher -kinglet -kinkajou -Kinosternidae -Kinosternon -kit -kite -kitten -kittiwake -kitty -kiwi -klebsiella -knot -koala -kob -Kobus -Kogia -komondor -kookaburra -krait -krill -Krypterophaneron -kudu -kuvasz -Kyphosidae -Kyphosus -Labridae -labyrinthodont -Labyrinthodontia -Lacerta -Lacertidae -lacewing -Lachnolaimus -Lactobacillaceae -lactobacillus -Lactophrys -ladybug -ladyfish -Lagidium -Lagodon -lagomorph -Lagomorpha -Lagopus -Lagorchestes -Lagostomus -Lagothrix -Lama -lamb -Lambis -lambkin -Lamellicornia -Laminaria -Laminariaceae -Laminariales -Lamna -Lamnidae -lamprey -Lampridae -Lampris -Lampropeltis -Lampyridae -lancelet -lancetfish -langur -Laniidae -Lanius -lanternfish -Lanthanotidae -Lanthanotus -lapdog -lapin -lappet -lapwing -largemouth -Lari -Laricariidae -larid -Laridae -lark -Larus -larva -Larvacea -larvacean -Lasiocampa -lasiocampid -Lasiocampidae -Lasiurus -Lates -Latimeria -Latimeridae -Latinae -Latrodectus -layer -leafhopper -leatherjacket -Lebistes -lechwe -leech -Leiopelma -Leiopelmatidae -Leishmania -lemming -Lemmus -lemur -Lemuridae -Lemuroidea -Leonberg -Leontocebus -leopard -leopardess -Lepadidae -Lepas -Lepidochelys -Lepidocybium -Lepidoptera -Lepidosauria -Lepisma -Lepismatidae -Lepisosteidae -Lepisosteus -Lepomis -leporid -Leporidae -Leptinotarsa -leptocephalus -Leptodactylidae -Leptodactylus -Leptoglossus -Leptoptilus -leptospira -Leptotyphlopidae -Leptotyphlops -Lepus -lerot -Leuciscus -leucocytozoan -leveret -Lhasa -Lichanura -liger -Limacidae -Limanda -Limax -Limenitis -Limicolae -Limnocryptes -Limnodromus -Limosa -limpet -limpkin -Limulidae -Limulus -Lincoln -ling -lingcod -linnet -Liomys -lion -lioness -lionet -lionfish -lip -Liparididae -Liparis -Liposcelis -Lipotyphla -Lippizan -listeria -Lithodidae -Litocranius -littleneck -Littorina -Littorinidae -livestock -liza -lizard -lizardfish -llama -loach -Lobata -Lobipes -Lobotes -Lobotidae -lobster -locust -Locusta -Lofortyx -loggerhead -loin -loir -loligo -longhorn -longwool -lookdown -loon -Lophiidae -Lophius -Lophodytes -Lopholatilus -Lophophorus -lorica -Loricata -Loriinae -lorikeet -Lorisidae -lory -Lota -louse -louvar -lovebird -Loxia -Loxodonta -Loxostege -Lucanidae -Lucilia -Lucy -Lufengpithecus -lugworm -Lumpenus -lumpfish -lumpsucker -Lunda -lungfish -Luscinia -Lutjanidae -Lutjanus -Lutra -Lutrinae -Luvaridae -Luvarus -Lycaena -lycaenid -Lycaenidae -Lycaeon -Lycosa -Lycosidae -lygaeid -Lygaeidae -Lygus -Lymantria -lymantriid -Lymantriidae -lynx -lyrebird -Lyrurus -lyssavirus -Macaca -macaque -macaw -Machilidae -mackerel -Macrocephalon -Macrocheira -Macroclemys -Macrodactylus -Macronectes -Macropodidae -Macropus -Macrorhamphosidae -Macrotis -macrotus -Macrouridae -Macrozoarces -Madoqua -Madreporaria -Maeandra -maggot -Magicicada -magpie -maigre -Maja -Majidae -Makaira -mako -Malacanthidae -Malaclemys -Malaconotinae -Malacopterygii -Malacosoma -Malacostraca -malamute -male -maleo -malinois -mallard -Mallophaga -Mallotus -Malopterurus -Maltese -mamba -mammal -Mammalia -mammoth -Mammut -Mammuthus -Mammutidae -mamo -manakin -manatee -mandrill -Mandrillus -Manduca -mane -mangabey -Manidae -maniraptor -Maniraptora -Manis -manta -Manteodea -Mantidae -mantis -mantispid -Mantispidae -Mantophasmatodea -manul -Manx -mapinguari -mara -marabou -mare -margate -margay -Marginocephalia -markhor -marlin -marmoset -marmot -Marmota -marsupial -Marsupialia -marten -Martes -martin -massasauga -Masticophis -mastiff -Mastigophora -Mastigoproctus -mastodon -Mastotermes -Mastotermitidae -maverick -Maxostoma -Mayetiola -mayfly -Mazama -meadowlark -mealworm -mealybug -Mecoptera -mecopteran -medusa -meerkat -Megachile -Megachilidae -Megachiroptera -Megaderma -Megadermatidae -Megalobatrachus -Megalonychidae -Megaloptera -megalosaur -Megalosauridae -megapode -Megapodiidae -Megapodius -Megaptera -megatherian -Megatheriidae -Megatherium -Melanerpes -Melanitta -Melanogrammus -Melanoplus -Melanotis -Meleagrididae -Meleagris -Meles -Melinae -Meliphagidae -Mellivora -Melogale -Meloidae -Melolontha -Melolonthidae -Melophagus -Melopsittacus -Melospiza -Melursus -Membracidae -menhaden -Menippe -Menopon -Menotyphla -Menticirrhus -Menura -Menurae -Menuridae -Mephitinae -Mephitis -Mercenaria -merganser -Merginae -Mergus -merino -Meriones -Merlangus -Merluccius -Meropidae -Merops -Merostomata -merozoite -mesenchyme -Mesocricetus -mesoderm -mesohippus -metamere -Metatheria -metatherian -Metazoa -metazoan -methanogen -mew -microbe -Microcentrum -Microchiroptera -Micrococcaceae -Micrococcus -Microdesmidae -Microdipodops -Microhylidae -Micromyx -microorganism -Micropogonias -Micropterus -microsporidian -Microstomus -Microtus -Micruroides -Micrurus -midge -migrator -miller's-thumb -millipede -milt -Milvus -Mimidae -Mimus -mink -minnow -Miridae -Mirounga -mite -moa -Mobula -Mobulidae -mockingbird -mojarra -moke -mole -Molidae -mollie -Mollienesia -Mollusca -mollusk -moloch -Molossidae -Molothrus -molter -Molva -Momotidae -Momotus -monad -monal -monarch -Monera -moneran -mongoose -monitor -monkey -Monocanthidae -Monocanthus -Monochamus -Monodon -Monodontidae -monohybrid -Monomorium -Monotremata -monotreme -monster -moonfish -moorcock -moorhen -moray -Morgan -Morone -morula -Moschus -mosquito -mosquitofish -Motacilla -Motacillidae -moth -motmot -mouflon -mouse -mouser -mouthbreeder -mouthpart -mudder -mudskipper -Mugil -Mugilidae -Mugiloidea -muishond -mule -mullet -Mullidae -Mulloidichthys -mulloway -Mullus -mummichog -Muntiacus -muntjac -Muraenidae -Muridae -murine -Muroidea -murre -Mus -Musca -Muscardinus -Muscicapa -Muscicapidae -Muscidae -Muscivora -Muscoidea -muskellunge -muskrat -Musophaga -Musophagidae -mussel -mustang -Mustela -Mustelidae -Mustelus -mutant -Mutillidae -muzzle -Mya -Myaceae -Myacidae -Myadestes -Mycetophilidae -mycobacteria -Mycobacteriaceae -mycoplasma -Mycoplasmataceae -Mycoplasmatales -Mycrosporidia -Mycteria -Mycteroperca -Myctophidae -Myliobatidae -mylodon -mylodontid -Mylodontidae -myna -Myocastor -Myomorpha -Myopus -Myotis -myriapod -Myrmecia -Myrmecobius -Myrmecophaga -Myrmecophagidae -myrmecophile -Myrmeleon -Myrmeleontidae -Mysidacea -Mysidae -Mysis -Mysticeti -Mytilidae -Mytilus -Myxine -Myxinidae -Myxiniformes -Myxinikela -myxobacteria -Myxocephalus -Myxophyceae -Myxosporidia -myxosporidian -myxovirus -Naemorhedus -Naja -nanny -nanomia -napu -narwhal -Nasalis -Nasua -Natantia -Naticidae -Natrix -natterjack -Naucrates -Nautilidae -Necturus -needlefish -Negaprion -nekton -Nematocera -Nematoda -nematode -Nemertea -Neoceratodus -Neofiber -Neomys -Neophron -Neotoma -Nepa -Nephrops -Nephropsidae -Nepidae -nerita -neritid -Neritidae -neritina -Nerodia -Nesokia -nester -nestling -Nestor -Neuroptera -neuropteron -Neurotrichus -Newfoundland -newt -nighthawk -nightingale -nilgai -Nimravus -nit -Nitella -Nitrobacter -Nitrobacteriaceae -nitrobacterium -nitrosobacteria -Nitrosomonas -noctiluca -Noctua -Noctuidae -nomia -nonstarter -nostoc -Nostocaceae -Notechis -Notemigonus -nothosaur -Nothosauria -notochord -Notomys -Notonecta -Notonectidae -Notophthalmus -notornis -Notoryctidae -Notoryctus -Notostraca -Notropis -Nucifraga -Nuda -Nudibranchia -numbat -Numenius -Numida -Numididae -nummulite -Nummulitidae -nutcracker -nuthatch -nyala -Nyctanassa -Nyctereutes -Nycticebus -Nycticorax -Nyctimene -nymph -nymphalid -Nymphalidae -Nymphalis -Nymphicus -oarfish -Oceanites -ocelot -Ochotona -Ochotonidae -octopod -Octopoda -Octopodidae -octopus -Ocyurus -Odobenidae -Odobenus -Odocoileus -Odonata -odonate -Odontoceti -Odontophorus -Oecanthus -Oedogoniaceae -Oedogoniales -Oedogonium -Oenanthe -Oestridae -Oestrus -Ogcocephalidae -oilbird -oilfish -okapi -Okapia -Oligochaeta -oligochaete -Oligoplites -olm -Omaha -ommastrephes -omnivore -Omomyid -onager -Oncorhynchus -Ondatra -Oniscidae -Oniscus -Onychogalea -Onychomys -Onychophora -onychophoran -opah -openbill -operculum -Opheodrys -Ophidiidae -Ophiodon -Ophiodontidae -Ophiophagus -Ophisaurus -Ophiurida -Ophiuroidea -Opisthobranchia -Opisthocomidae -Opisthocomus -Opisthognathidae -opossum -orangutan -Orchestia -Orchestiidae -Orcinus -Oreamnos -Orectolobidae -Orectolobus -Oreortyx -Oriolidae -Oriolus -ormer -Ornithischia -ornithischian -ornithomimid -Ornithomimida -ornithopod -Ornithorhynchidae -Ornithorhynchus -orphan -Orpington -Ortalis -orthomyxovirus -Orthopristis -Orthoptera -Orthotomus -ortolan -ortygan -Orycteropodidae -Orycteropus -Oryctolagus -oryx -Oryzomys -Oscillatoriaceae -oscine -Oscines -Osmeridae -Osmerus -osprey -Ostariophysi -Osteichthyes -Osteoglossidae -Osteoglossiformes -osteostracan -Osteostraci -Ostraciidae -Ostracoda -ostracoderm -Ostracodermi -Ostrea -Ostreidae -ostrich -Otaria -Otariidae -Otides -Otididae -Otis -otter -otterhound -Otus -Ouranopithecus -Ovalipes -ovenbird -Ovibos -ovipositor -oviraptorid -Ovis -owl -owlet -ox -oxtail -Oxybelis -Oxylebius -Oxyura -Oxyuranus -Oxyuridae -oyster -oystercatcher -paca -pacer -Pachycephala -pachycephalosaur -pachyderm -packhorse -packrat -pad -Padda -paddlefish -pademelon -Pagellus -Pagophila -Pagophilus -Pagrus -Paguridae -Pagurus -Palaemon -Palaemonidae -Paleacrita -palfrey -Palinuridae -Palinurus -palometa -palomino -Pan -Pandion -Pandionidae -pangolin -Panonychus -Panorpidae -panther -Panthera -Pantotheria -papillon -Papio -papovavirus -Paprilus -Paracheirodon -Paradisaeidae -Paradoxurus -parakeet -Paralichthys -Paralithodes -paramecium -paramyxovirus -Paranthias -Paranthropus -parapodium -Parascalops -parasite -Parazoa -Paridae -Parophrys -parr -parrot -parrotfish -partridge -Parula -Parulidae -Parus -parvovirus -Passer -Passeridae -Passeriformes -Passerina -passerine -pastern -Pastor -patas -Patella -Patellidae -pathogen -Pauropoda -Pavo -paw -peachick -peacock -peafowl -peahen -pearlfish -peba -peccary -Pectinibranchia -Pectinidae -Pediculati -Pediculidae -Pediculus -Pedioecetes -Pedionomus -Pedipalpi -peeper -Pekinese -Pelecanidae -Pelecaniformes -Pelecanoididae -Pelecanus -pelican -pellicle -Pelobatidae -peludo -pelycosaur -Pelycosauria -Pembroke -Pempheridae -pen -Peneidae -Penelope -Peneus -penguin -Pennatula -Pennatulidae -pennon -pentail -Pentastomida -Peramelidae -Perca -perch -Percheron -Percidae -Perciformes -Percina -Percoidea -Percophidae -Perdicidae -Perdix -peregrine -peridinian -Peridiniidae -Peridinium -Periophthalmus -Peripatidae -Peripatopsidae -Peripatopsis -Periplaneta -Perisoreus -Perissodactyla -Peristediinae -Peristedion -peristome -periwinkle -permit -Pernis -Perodicticus -Perognathus -Peromyscus -pest -pet -Petaurista -Petauristidae -Petaurus -petrel -Petrogale -Petromyzon -Petromyzoniformes -Petromyzontidae -pewee -Pezophaps -Phacochoerus -Phaeophyceae -Phaeophyta -Phaethon -Phaethontidae -Phalacrocoracidae -Phalacrocorax -Phalaenoptilus -phalanger -Phalangeridae -Phalangida -Phalangiidae -Phalangium -phalarope -Phalaropidae -Phalaropus -Pharomacrus -Phascogale -Phascolarctos -phasianid -Phasianidae -Phasianus -phasmid -Phasmida -Phasmidae -Phasmidia -pheasant -phenacomys -Philaenus -Philohela -Philomachus -Philophylla -Phlebotomus -Phoca -Phocidae -Phocoena -phoebe -Phoenicopteridae -Phoeniculidae -Phoeniculus -Phoenicurus -Pholadidae -Pholas -Pholidae -Pholidota -Pholis -phoronid -Phoronida -Photoblepharon -Phoxinus -phragmocone -Phrynosoma -Phthiriidae -Phthirius -Phthorimaea -phycobilin -phycocyanin -phycoerythrin -Phyllidae -Phyllium -Phyllorhynchus -Phylloscopus -Phyllostomidae -Phyllostomus -Phylloxera -Phylloxeridae -physa -Physalia -Physeter -Physeteridae -Physidae -Phytomastigina -phytoplankton -Pica -Picariae -pichiciago -Picidae -Piciformes -pickerel -Picoides -picornavirus -piculet -Picumnus -Picus -piddock -pierid -Pieridae -Pieris -pigeon -pigfish -piglet -pika -pike -pikeblenny -pike-perch -pilchard -pilotfish -pilus -pinche -Pinctada -Pineus -pinfish -Pinguinus -Pinicola -Pinnipedia -Pinnotheres -Pinnotheridae -pinscher -pintail -pinto -pinworm -Pipa -pipefish -Pipidae -Pipile -Pipilo -pipistrelle -Pipistrellus -pipit -Pipra -Pipridae -Piranga -piranha -piroplasm -pisanosaur -Pisces -Pithecanthropus -Pithecia -pitta -Pittidae -Pituophis -Pitymys -placental -placoderm -Placodermi -Placuna -plaice -planarian -plankton -Planococcus -planula -Plasmodiidae -plasmodium -plastron -Platalea -Plataleidae -Platanistidae -Platichthys -platy -Platycephalidae -Platyctenea -platyctenean -Platyhelminthes -Platypoecilus -platypus -Platyrrhini -Plautus -Plecoptera -Plecotus -plectognath -Plectognathi -Plectophera -Plectrophenax -Plesianthropus -plesiosaur -Plesiosauria -Plethodon -Plethodontidae -Pleurobrachia -Pleurobrachiidae -pleurodont -Pleuronectes -Pleuronectidae -Plicatoperipatus -Ploceidae -Ploceus -plover -plumule -Pluvialis -Pluvianus -pneumococcus -poacher -pochard -Podargidae -Podargus -Podiceps -Podicipedidae -Podicipitiformes -Podilymbus -Poeciliidae -Poecilocapsus -Poecilogale -Poephila -pogge -Pogonophora -poikilotherm -pointer -polecat -Polioptila -poliovirus -Polistes -poll -Pollachius -pollack -pollard -pollinator -Polyangiaceae -Polyangium -Polyborus -Polychaeta -polychaete -Polycirrus -Polydactylus -Polyergus -Polygonia -Polymastigina -polymastigote -polymorph -Polynemidae -Polyodon -Polyodontidae -polyoma -polyp -Polypedates -Polypedatidae -Polyplacophora -polyploid -Polyprion -Pomacanthus -Pomacentridae -Pomacentrus -Pomatomidae -Pomatomus -Pomeranian -pomfret -Pomolobus -Pomoxis -pompano -pompon -Pongidae -Pongo -pony -pooch -poodle -Pooecetes -poorwill -Popillia -popinjay -porbeagle -Porcellio -Porcellionidae -porcupine -porcupinefish -porgy -Porifera -porker -porkfish -Poronotus -Porphyra -Porphyrio -Porphyrula -porpoise -Portunidae -Portunus -Porzana -Potamogalidae -Potamophis -Potoroinae -potoroo -Potorous -Potos -potto -poxvirus -prancer -pratincole -Praunus -prawn -praya -predator -prehensor -Presbytes -prey -Priacanthidae -Priacanthus -pricket -prickleback -primary -primate -Primates -Prinia -Priodontes -Prionace -Prionotus -Pristidae -Pristis -probiotic -Proboscidea -proboscidean -proboscis -Procavia -Procaviidae -Procellaria -Procellariidae -Procellariiformes -Prociphilus -Procnias -proconsul -Procyon -procyonid -Procyonidae -Progne -prokaryote -pronghorn -Prosauropoda -prosimian -Prosimii -Prosopium -Proteidae -Proteles -Proterochampsa -Proteus -prothorax -protist -Protista -protoavis -protoceratops -protoctist -Protoctista -protohippus -Prototheria -prototherian -Protozoa -protozoan -Protura -proturan -Prunella -Prunellidae -psalterium -Psaltriparus -Psenes -Psephurus -Psetta -Psettichthys -Pseudacris -Pseudaletia -Pseudechis -Pseudemys -Pseudococcidae -Pseudococcus -pseudomonad -Pseudomonadales -Pseudomonas -Pseudomonodaceae -Pseudopleuronectes -pseudopod -Pseudoryx -Psithyrus -Psittacidae -Psittaciformes -psittacosaur -Psittacula -Psittacus -psocid -Psocidae -Psocoptera -Psophia -Psophiidae -psychodid -Psychodidae -Psyllidae -ptarmigan -Pteriidae -Pternohyla -Pterocles -Pteroclididae -Pterocnemia -pterodactyl -Pterodactylidae -Pterodactylus -Pterois -Pteropus -pterosaur -Pterosauria -Ptilocercus -Ptilocrinus -Ptilonorhynchidae -Ptilonorhynchus -Ptloris -Ptyas -Ptychozoon -puddingwife -puffbird -puffer -puffin -Puffinus -pug -puku -Pulex -Pulicidae -pullet -Pulmonata -pumpkinseed -punkie -pup -pupa -puppy -Pycnogonida -Pygopodidae -Pygopus -Pygoscelis -Pylodictus -pyralid -Pyralidae -Pyralis -Pyrausta -Pyrocephalus -Pyrophorus -Pyrrhocoridae -Pyrrhula -pyrrhuloxia -Pyrrophyta -python -Pythonidae -Pythoninae -quack-quack -quadruped -quagga -quahog -quail -queen -quetzal -quill -Quiscalus -rabbit -rabbitfish -raccoon -racehorse -racer -racerunner -Rachycentridae -Rachycentron -Radiolaria -radiolarian -rail -Raja -Rajidae -Rajiformes -Rallidae -ram -Rambouillet -Ramphastidae -Ramphomicron -Rana -Ranatra -Rangifer -Ranidae -Raphicerus -Raphidae -Raphidiidae -Raphus -Raptores -rat -ratel -Ratitae -ratite -rattle -rattlesnake -Rattus -raven -ray -razorback -razorbill -recombinant -Recurvirostra -Recurvirostridae -redbone -redfish -redhead -redhorse -redpoll -redshank -redstart -redtail -Reduviidae -redwing -reeve -Regalecidae -Reglaecus -Regulus -Reithrodontomys -relative -Remilegia -remora -remount -Reoviridae -reovirus -Reptantia -reptile -Reptilia -Reticulitermes -reticulum -retriever -retrovirus -Reynard -Rhabdoviridae -rhabdovirus -Rhagoletis -rhea -Rheidae -Rheiformes -rhesus -Rhincodon -Rhincodontidae -Rhinobatidae -rhinoceros -Rhinocerotidae -Rhinolophidae -Rhinonicteris -Rhinoptera -Rhinotermitidae -rhinovirus -Rhizobiaceae -Rhizobium -rhizopod -Rhizopoda -Rhodophyceae -Rhodophyta -Rhodymenia -Rhodymeniaceae -Rhyacotriton -Rhynchocephalia -Rhynchoelaps -ribbonfish -Richmondena -rickettsia -Rickettsiaceae -Rickettsiales -ridgeling -ridley -riflebird -ringdove -ringhals -ringlet -ringtail -Riparia -Rissa -rivulus -roach -roadkill -roadrunner -roan -robalo -robin -Roccus -rockfish -rockweed -rod -rodent -Rodentia -Rodolia -roe -roebuck -roller -rook -rorqual -rosefish -rotavirus -rotifer -Rotifera -Rottweiler -royal -rudapithecus -rudd -rudderfish -ruff -rumen -ruminant -Ruminantia -runner -Rupicapra -Rupicola -Rutilus -Rynchopidae -Rynchops -Rypticus -sable -saddle -saddlebill -sagitta -Sagittariidae -Sagittarius -saiga -sailfish -sailor's-choice -Saimiri -saki -salamander -Salamandra -Salamandridae -Salientia -Salmo -salmon -salmonella -salmonid -Salmonidae -salp -Salpidae -Salpinctes -Saluki -Salvelinus -sambar -Samia -Samoyed -sanderling -sandfish -sandgrouse -sandpiper -sapsucker -Sarcocystis -Sarcodina -sarcodinian -Sarcophaga -Sarcophilus -Sarcoptes -Sarcoptidae -Sarcorhamphus -Sarcosporidia -sarcosporidian -Sarda -Sardina -sardine -Sardinops -sassaby -Saturnia -saturniid -Saturniidae -Satyridae -Sauria -saurian -Saurischia -saurischian -Sauromalus -sauropod -Sauropoda -Sauropodomorpha -Sauropterygia -Saurosuchus -saury -sawfish -sawfly -sawyer -Saxicola -Sayornis -scad -scale -scallop -Scandentia -Scaphiopus -scaphopod -Scaphopoda -scapular -scarab -Scarabaeidae -Scardinius -Scaridae -Scartella -scaup -scavenger -Sceliphron -Sceloglaux -Sceloporus -schipperke -Schistosoma -Schistosomatidae -schistosome -Schizomycetes -Schizophyta -Schizopoda -schnauzer -schoolmaster -Sciaena -Sciaenidae -Sciaenops -Sciaridae -Scincella -Scincidae -Scincus -scissortail -Sciuridae -Sciuromorpha -Sciurus -sclerite -Scleropages -Scleroparei -Scolopacidae -Scolopax -Scolytidae -Scolytus -Scomber -Scomberesocidae -Scomberesox -Scomberomorus -Scombridae -scombroid -Scombroidea -Scophthalmus -Scorpaena -scorpaenid -Scorpaenidae -scorpaenoid -Scorpaenoidea -scorpion -scorpionfish -Scorpionida -scoter -screamer -scrod -scrubbird -sculpin -scup -scut -scute -Scutigera -Scutigerella -Scutigeridae -Scyliorhinidae -Scyphozoa -scyphozoan -seabird -seagrass -seahorse -seal -searcher -seashell -seasnail -seaweed -Sebastodes -Secretariat -Seismosaurus -Seiurus -Selar -Selenarctos -Selene -Sennenhunde -Sepia -Sepiidae -serin -Serinus -Seriola -Seriphus -serotine -serow -Serpentes -Serranidae -Serranus -Serrasalmus -Sertularia -sertularian -serval -seta -Setophaga -setter -shad -shanny -shark -sharksucker -shearwater -sheep -sheepshead -sheep-tick -sheldrake -shelduck -shell -shigella -Shih-Tzu -shiner -shipworm -shire -shoebill -shorebird -shoveler -shovelhead -shrew -shrike -shrimp -shrimpfish -Sialia -Sialidae -Sialis -siamang -sidewinder -sierra -Sigmodon -sild -silkworm -Sillaginidae -Sillago -silurid -Siluridae -Siluriformes -Silurus -silverback -silverfish -silversides -silverspot -Silvia -simian -Simuliidae -Simulium -Sinanthropus -Sinornis -siphon -Siphonaptera -Siphonophora -siphonophore -Sipuncula -sire -siren -Sirenia -Sirenidae -siskin -Sistrurus -Sisyridae -Sitophylus -Sitotroga -Sitta -Sittidae -Sivapithecus -skate -skimmer -skink -skipjack -skua -skunk -skylark -sleeper -slider -sloth -slug -smallmouth -smelt -smew -Smiledon -smoothhound -snail -snailfish -snake -snakebird -snakeblenny -snakefly -snapper -snipe -snipefish -snook -snout -soapfish -sockeye -solan -soldier -soldierfish -sole -Solea -Soleidae -Solenichthyes -Solenidae -solenogaster -Solenogastres -Solenopsis -solitaire -Somateria -songbird -Sonora -Sorex -Soricidae -sorrel -sow -spadefish -spadefoot -Spalacidae -Spalax -spaniel -sparid -Sparidae -sparling -sparrow -spat -Spatangoida -spawn -spawner -spearfish -Sphecidae -Sphecius -Sphecoidea -Sphecotheres -Spheniscidae -Sphenisciformes -Spheniscus -Sphenodon -Sphingidae -Sphyraena -Sphyraenidae -Sphyrapicus -Sphyrna -Sphyrnidae -spider -Spilogale -spine -Spinus -Spirillaceae -spirillum -Spirochaeta -Spirochaetaceae -Spirochaetales -spirochete -spirogyra -spirula -Spirulidae -spitz -Spizella -Spodoptera -sponge -spongefly -spoonbill -Sporozoa -sporozoan -sporozoite -spouter -springbok -springer -Spyeria -squab -Squalidae -Squalus -squama -Squamata -squaretail -Squatina -Squatinidae -squid -squilla -Squillidae -squirrel -squirrelfish -stablemate -stag -staghound -stalking-horse -stallion -Staphylinidae -staphylococcus -starfish -stargazer -starling -staurikosaur -stayer -Steatornis -Steatornithidae -steed -steenbok -steeplechaser -Steganopus -Stegocephalia -stegosaur -Stenopelmatidae -Stenopelmatus -stenopterygius -Stenotomus -stentor -stepper -Stercorariidae -Stercorarius -Stereospondyli -Sterna -Sterninae -Sternotherus -Stichaeidae -stickleback -sticktight -Stictomys -Stictopelia -stifle -stilt -stinger -stingray -stirk -Stizidae -Stizostedion -stoat -stocker -stomatopod -Stomatopoda -stonechat -stonefish -stonefly -stonewort -Storeria -stork -strawworm -stray -Strepera -Strepsirhini -streptobacillus -streptococcus -streptomyces -Streptomycetaceae -Streptopelia -Strigidae -Strigiformes -Strix -Stromateidae -Strombidae -Strombus -Struthio -struthiomimus -Struthionidae -Struthioniformes -Strymon -stud -stunt -sturgeon -Sturnella -Sturnidae -Sturnus -style -stylet -styracosaur -sucker -suckling -Suidae -Sula -Sulidae -sunfish -superbug -surfbird -surfperch -surgeonfish -Suricata -suricate -Surnia -survivor -Sus -suslik -swallow -swan -sweeper -swift -swiftlet -swimmeret -swine -swordfish -swordtail -Sylviidae -Sylviinae -Sylvilagus -Symphalangus -Symphyla -Synagrops -Synanceja -synapsid -Synapsida -Synaptomys -Synentognathi -Synercus -Syngnathidae -Syngnathus -Synodontidae -syrinx -Syrrhaptes -Tabanidae -tabby -Tachinidae -Tachyglossidae -Tachyglossus -Tachypleus -Tadarida -Tadorna -tadpole -taenia -Taeniidae -taguan -tail -tailorbird -taipan -takin -talapoin -talon -Talpidae -tamandua -tamarau -tamarin -Tamias -Tamiasciurus -tanager -tang -Tantilla -tapeworm -tapir -Tapiridae -Tapirus -tarantula -Tardigrada -tardigrade -Taricha -tarpan -tarpon -tarsier -Tarsiidae -Tarsioidea -Tarsius -tatouay -tattler -Taurotragus -tautog -Tautoga -Tautogolabrus -Taxidea -Tayassu -Tayassuidae -tayra -teal -teg -Teiidae -teju -Teleostei -Telosporidia -Temnospondyli -tench -Tenebrionidae -tenrec -Tenrecidae -tentacle -Tentaculata -Tenthredinidae -Terebella -Terebellidae -Teredinidae -teredo -Termes -termite -Termitidae -tern -Terrapene -terrapin -terrier -test -Testacea -testacean -Testudinidae -Testudo -tetra -Tetragonurus -tetrahymena -Tetranychidae -Tetrao -Tetraodontidae -Tetraonidae -tetrapod -Tetrapturus -Tettigoniidae -Thalarctos -Thalassoma -Thaliacea -Thamnophilus -Thamnophis -theca -thecodont -Thecodontia -Theraphosidae -therapsid -Therapsida -Theridiidae -thermoacidophile -Thermobia -theropod -Theropoda -thickhead -thiobacillus -thiobacteria -Thiobacteriaceae -Thomomys -thorax -thornbill -thoroughbred -thrasher -Thraupidae -threadfin -threadfish -thresher -Threskiornis -Threskiornithidae -Thripidae -thrips -throat -thrush -Thryothorus -Thunnus -thylacine -Thylacinus -Thylogale -Thyreophora -thysanopter -Thysanoptera -Thysanura -Tibicen -Tichodroma -tick -tiercel -tiger -tiglon -tigress -Tilapia -tilefish -Timalia -Timaliidae -timucu -Tinamidae -Tinamiformes -tinamou -Tinca -Tinea -tineid -Tineidae -tineoid -Tineoidea -Tineola -Tingidae -Tipulidae -titanosaur -Titanosauridae -Titanosaurus -titi -titmouse -toadfish -Todidae -Todus -tody -Togaviridae -Tolypeutes -tom -Tomistoma -tomtate -tonguefish -tooth -topknot -topminnow -Torpedinidae -Torpediniformes -tortoise -tortoiseshell -tortricid -Tortricidae -toucan -toucanet -touraco -towhee -toxicognath -Toxostoma -Toxotes -Toxotidae -Trachinotus -Trachipteridae -Trachipterus -trachodon -Trachurus -Tragelaphus -tragopan -Tragulidae -Tragulus -treehopper -Trematoda -trepang -treponema -Treponemataceae -Triaenodon -Triakidae -Trialeurodes -Triatoma -Tribolium -Tribonema -Tribonemaceae -triceratops -Trichechidae -Trichechus -trichina -Trichiuridae -trichodesmium -Trichodontidae -Trichoglossus -trichomonad -Trichophaga -Trichoptera -Trichosurus -Trichys -Tridacna -Tridacnidae -Triga -triggerfish -Triglidae -Triglinae -trilobite -Trimorphodon -Trinectes -Tringa -Trionychidae -Trionyx -Triopidae -Triops -tripletail -triton -Triturus -Trochilidae -Trogium -Troglodytes -Troglodytidae -trogon -Trogonidae -Trogoniformes -Trombicula -trombiculid -Trombiculidae -trombidiid -Trombidiidae -trophoblast -trophozoite -Tropidoclonion -trotter -trout -trumpeter -trumpetfish -Trypetidae -tuatara -Tubulidentata -tuft -tumblebug -tuna -Tunga -tunicate -Tupaia -Tupaiidae -Tupinambis -Turbellaria -turbot -Turdidae -Turdinae -Turdus -turkey -Turnicidae -Turnix -turnstone -Tursiops -turtle -turtledove -tusk -tusker -tussah -twitterer -Tylenchidae -Tylenchus -Tympanuchus -Typhlopidae -Tyranni -tyrannid -Tyrannidae -tyrannosaur -Tyrannus -Tyto -Tytonidae -uakari -Uca -udder -Uintatheriidae -Uintatherium -Ulva -Ulvaceae -Ulvales -Ulvophyceae -Uma -Umbrina -undercoat -underpart -underwing -Unguiculata -unguiculate -Ungulata -ungulate -Unio -Unionidae -Upupa -Upupidae -Uranoscopidae -Uria -urial -urochord -Urochordata -Urocyon -urodele -Urodella -Urophycis -Uropsilus -uropygium -Urosaurus -Ursidae -Ursus -Uta -utahraptor -valve -vane -Vanellus -Vanessa -vaquita -Varanidae -Varanus -varmint -vector -vedalia -veery -vein -velociraptor -Veneridae -vent -Venus -verdin -vermin -Vertebrata -vertebrate -vervet -vesiculovirus -Vespa -Vespertilio -Vespertilionidae -vespid -Vespidae -Vespula -vibrio -viceroy -Vicugna -vicuna -Vidua -villus -vinegarroon -viper -Vipera -Viperidae -vireo -Vireonidae -virion -viroid -virus -viscacha -Viverra -Viverricula -Viverridae -viverrine -vixen -vizsla -vole -Volvocaceae -Volvocales -Volvox -Vombatidae -vorticella -Vulpes -Vultur -vulture -wagtail -wahoo -wallaby -walleye -walrus -wapiti -warble -warbler -warhorse -warrigal -warthog -wasp -watchdog -waterbuck -waterdog -waterfowl -waxwing -weakfish -weasel -weaver -web -webfoot -webworm -weevil -Weimaraner -weka -Welsh -wether -whale -wheatear -wheatworm -whelk -whiff -whinchat -whippet -whippoorwill -whip-scorpion -whip-snake -whiptail -Whirlaway -whisker -whitebait -whitefish -whitefly -whiting -whooper -whydah -widgeon -wiggler -wildcat -willet -windowpane -wing -wirehair -wireworm -wisent -wishbone -withers -wolf -wolffish -wolfhound -wolverine -wombat -woodborer -woodcock -wood-frog -woodhewer -woodlouse -woodpecker -woodworm -wool -worker -workhorse -world -worm -wrack -wrasse -wren -wren-tit -wrymouth -wryneck -xanthomonad -Xanthomonas -Xanthophyceae -Xantusiidae -Xenarthra -Xenicidae -Xenicus -Xenopodidae -Xenopus -Xenorhyncus -Xenosauridae -Xenosaurus -Xerobates -Xiphias -Xiphiidae -Xiphosura -Xylocopa -Xyphophorus -yak -yearling -yellowfin -yellowhammer -yellowlegs -yellowtail -yellowthroat -yolk -young -Zaglossus -Zalophus -Zapodidae -Zapus -zebra -zebu -Zeidae -Zenaidura -Zeomorphi -Zeus -Zinjanthropus -Ziphiidae -Zoarces -Zoarcidae -Zonotrichia -zooid -Zoomastigina -zoomastigote -zoophyte -zooplankton -zoril -Zygnema -Zygnemataceae -Zygnematales -Zygoptera diff --git a/static/text/howmany.py b/static/text/howmany.py deleted file mode 100755 index 713774e..0000000 --- a/static/text/howmany.py +++ /dev/null @@ -1,25 +0,0 @@ -adjectives = {} -with open('adjectives','r') as f: - for line in f: - word = line.strip().lower() - if word[0] not in adjectives: - adjectives[word[0]] = [] - adjectives[word[0]].append(word) - -print(len(adjectives.keys())) - -animals = {} -for aword in open('animals','r').read().split(','): - word = aword.strip().lower() - if word[0] not in animals: - animals[word[0]] = [] - animals[word[0]].append(word) - -print(len(animals)) - -i = 0 -for key in adjectives.keys(): - if key in animals and key in adjectives: - i = i + len(adjectives[key])*len(animals[key]) - -print(i) diff --git a/static/text/robots.txt b/static/text/robots.txt deleted file mode 100644 index e0c6441..0000000 --- a/static/text/robots.txt +++ /dev/null @@ -1,4 +0,0 @@ -User-agent: * -Disallow: / -Allow: /Help/view -Allow: /sitemap.xml diff --git a/static/text/sitemap.xml b/static/text/sitemap.xml deleted file mode 100755 index 726c9c7..0000000 --- a/static/text/sitemap.xml +++ /dev/null @@ -1,9 +0,0 @@ - -
- -**Listifying**. If you are writing a list and you want to tick off things really easily, just add `/list`. For example, after editing [`/grocery`](/grocery), goto [`/grocery/list`](/grocery/list). In this page, whatever you click on will be struck through and moved to the end. This is helpful if you write a grocery list and then want to easily delete things from it. - - - -
- -**Page locking**. Pages can be locked by providing a password to prevent further editing. The whole version tree will still be available. _Note_: This is not available for list mode. - - - - - -
- -**Automatic versioning**. All previous versions of all notes are stored and can be accessed by adding `?version=X` onto `/view` or `/edit`. If you are on the `/view` or `/edit` pages the menu below will show the most substantial changes in the history. Note, only the _current_ version can be edited (no branching allowed, yet). - - - -
- -**Self-destructing messages**. You can write a message that will delete itself when a user loads it (in any view). Useful for transmitting sensitive information. To use, simply add a line somewhere that says only "`self-destruct`". - - - -
- -**Security**. HTTPS support is provided and everything is sanitized to prevent XSS attacks. Though all URLs are publicly accessible, you are free to obfuscate your website by using an obscure/random address (read: the site is still publicly accessible, just hard to find!). In addition to TLS support, you can PGP-encrypt your messages using a passphrase (_Note: This will delete the version tree_). - - - -
- -**Syntax highlighting**. If you use a coding extension (e.g. .py, .md, .txt, .js, ...) then you'll automatically see syntax highlighting and line numbers. - - - -
- -**CLI tools**. Want to upload/download from the command line? Its super easy. Upload/download files using `curl` with a simple command: -```bash -$ echo "Hello, world!" > hi.txt -$ curl -L --upload-file hi.txt cowyo.com - File uploaded to http://cowyo.com/hi.txt -$ curl -L cowyo.com/test.txt - Hello, world! -``` -or just skip the file-creation step and let `cowyo` figure out a name for you: -```bash -$ echo "Wow, so easy" | curl -L --upload-file "-" cowyo.com - File uploaded to http://cowyo.com/CautiousCommonLoon -$ curl -L cowyo.com/CautiousCommonLoon - Wow, so easy -``` -
- - -**Keyboard Shortcuts**. Quickly transition between Edit/View/List by using `Ctl+Shift+E` to Edit, `Ctl+Shift+Z` to View, and `Ctl+Shift+L` to Listify. - -**Admin controls**. The Admin can view/delete all the documents by setting the `-a YourAdminKey` when starting the program. Then the admin has access to the `/ls/YourAdminKey` to view and delete any of the pages. - -**Math support**. Math is supported with [Katex](https://github.com/Khan/KaTeX) using `$\frac{1}{2}$` for inline equations and `$$\frac{1}{2}$$` for regular equations. - - -# Contact -Any other comments, questions or anything at all, just tweet me @zack_118 - -Have fun. - -**Powered by Raspberry Pi, Go, and NGINX** - -   diff --git a/templates/base.tmpl b/templates/base.tmpl deleted file mode 100644 index 76d3920..0000000 --- a/templates/base.tmpl +++ /dev/null @@ -1,89 +0,0 @@ - -{{define "header"}} - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{end}} diff --git a/templates/index.tmpl b/templates/index.tmpl deleted file mode 100644 index ec40555..0000000 --- a/templates/index.tmpl +++ /dev/null @@ -1,369 +0,0 @@ - - - - -
-
-
-
-
-
-
-
diff --git a/templates/privacypolicy.md b/templates/privacypolicy.md
deleted file mode 100644
index d26ab6d..0000000
--- a/templates/privacypolicy.md
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-# Privacy Policy
-
-This Privacy Policy governs the manner in which Cowyo collects, uses, maintains and discloses information collected from users (each, a "User") of the https://cowyo.com website ("Site"). This privacy policy applies to the Site and all products and services offered by Cowyo.
-
-### Personal identification information
-
-We may collect personal identification information from Users in a variety of ways, including, but not limited to, when Users visit our site, fill out a form, and in connection with other activities, services, features or resources we make available on our Site.. Users may visit our Site anonymously. We will collect personal identification information from Users ONLY if they voluntarily submit such information to us. Users can always refuse to supply personally identification information, except that it may prevent them from engaging in certain Site related activities.
-
-### Non-personal identification information
-
-We may collect non-personal identification information about Users whenever they interact with our Site. Non-personal identification information may include the browser name, the type of computer and technical information about Users means of connection to our Site, such as the operating system and the Internet service providers utilized and other similar information.
-
-### Web browser cookies
-
-Our Site may use "cookies" to enhance User experience. User's web browser places cookies on their hard drive for record-keeping purposes and sometimes to track information about them. User may choose to set their web browser to refuse cookies, or to alert you when cookies are being sent. If they do so, note that some parts of the Site may not function properly.
-
-### How we use collected information
-
-Cowyo may collect and use Users personal information for the following purposes:
-
-- To personalize user experience. We may use information in the aggregate to understand how our Users as a group use the services and resources provided on our Site.
-- To improve our Site. We may use feedback you provide to improve our products and services.
-
-### How we protect your information
-
-We adopt appropriate data collection, storage and processing practices and security measures to protect against unauthorized access, alteration, disclosure or destruction of your personal information, password, transaction information and data stored on our Site.
-
-### Sharing your personal information
-
-We DO NOT sell, trade, or rent Users personal identification information, or the generic aggregated demographic information, to others.
-
-### Changes to this privacy policy
-
-Cowyo has the discretion to update this privacy policy at any time. We encourage Users to frequently check this page for any changes to stay informed about how we are helping to protect the personal information we collect. You acknowledge and agree that it is your responsibility to review this privacy policy periodically and become aware of modifications.
-
-### Your acceptance of these terms
-
-By using this Site, you signify your acceptance of this policy. If you do not agree to this policy, please do not use our Site. Your continued use of the Site following the posting of changes to this policy will be deemed your acceptance of those changes.
diff --git a/templates/view.tmpl b/templates/view.tmpl
deleted file mode 100644
index 22df699..0000000
--- a/templates/view.tmpl
+++ /dev/null
@@ -1,337 +0,0 @@
-
-
-
-
- -
- {{ range $index, $element := .ListItems }}
- {{ $element }}
- {{ end }}
-
-
-
-
-{{ else }}
-
-{{ if .Encrypted }}
-
-{{ end }}
-
-
-
-
- {{ if .Coding }}
-
- {{ end }}
-
-
-
diff --git a/utils.go b/utils.go
deleted file mode 100644
index 0a795d2..0000000
--- a/utils.go
+++ /dev/null
@@ -1,253 +0,0 @@
-package main
-
-import (
- "encoding/binary"
- "io/ioutil"
- "log"
- "math/rand"
- "net"
- "path"
- "sort"
- "strings"
- "time"
-
- "golang.org/x/crypto/bcrypt"
-
- "github.com/jcelliott/lumber"
- "github.com/sergi/go-diff/diffmatchpatch"
-)
-
-var animals []string
-var adjectives []string
-var aboutPageText string
-
-type versionsInfo struct {
- VersionDate string
- VersionNum int
-}
-
-var logger *lumber.ConsoleLogger
-
-func init() {
- rand.Seed(time.Now().Unix())
- animalsText, _ := ioutil.ReadFile(path.Join(RuntimeArgs.SourcePath, "static/text/animals"))
- animals = strings.Split(string(animalsText), ",")
- adjectivesText, _ := ioutil.ReadFile(path.Join(RuntimeArgs.SourcePath, "static/text/adjectives"))
- adjectives = strings.Split(string(adjectivesText), "\n")
- logger = lumber.NewConsoleLogger(lumber.INFO)
-}
-
-func randomAnimal() string {
- return strings.Replace(strings.Title(animals[rand.Intn(len(animals)-1)]), " ", "", -1)
-}
-
-func randomAdjective() string {
- return strings.Replace(strings.Title(adjectives[rand.Intn(len(adjectives)-1)]), " ", "", -1)
-}
-
-func randomAlliterateCombo() (combo string) {
- combo = ""
- // // first determine which names are taken from program data
- // takenNames := []string{}
- // err := db.View(func(tx *bolt.Tx) error {
- // // Assume bucket exists and has keys
- // b := tx.Bucket([]byte("programdata"))
- // c := b.Cursor()
- // for k, v := c.First(); k != nil; k, v = c.Next() {
- // takenNames = append(takenNames, strings.ToLower(string(v)))
- // }
- // return nil
- // })
- // if err != nil {
- // panic(err)
- // }
- // fmt.Println(takenNames)
- // generate random alliteration thats not been used
- for {
- animal := randomAnimal()
- adjective := randomAdjective()
- if animal[0] == adjective[0] { //&& stringInSlice(strings.ToLower(adjective+animal), takenNames) == false {
- combo = adjective + animal
- break
- }
- }
- return
-}
-
-// is there a string in a slice?
-func stringInSlice(s string, strings []string) bool {
- for _, k := range strings {
- if s == k {
- return true
- }
- }
- return false
-}
-
-// itob returns an 8-byte big endian representation of v.
-func itob(v int) []byte {
- b := make([]byte, 8)
- binary.BigEndian.PutUint64(b, uint64(v))
- return b
-}
-
-func contentType(filename string) string {
- switch {
- case strings.Contains(filename, ".css"):
- return "text/css"
- case strings.Contains(filename, ".jpg"):
- return "image/jpeg"
- case strings.Contains(filename, ".png"):
- return "image/png"
- case strings.Contains(filename, ".js"):
- return "application/javascript"
- }
- return "text/html"
-}
-
-func diffRebuildtexts(diffs []diffmatchpatch.Diff) []string {
- text := []string{"", ""}
- for _, myDiff := range diffs {
- if myDiff.Type != diffmatchpatch.DiffInsert {
- text[0] += myDiff.Text
- }
- if myDiff.Type != diffmatchpatch.DiffDelete {
- text[1] += myDiff.Text
- }
- }
- return text
-}
-
-func timeTrack(start time.Time, name string) {
- elapsed := time.Since(start)
- log.Printf("%s took %s", name, elapsed)
-}
-
-func getImportantVersions(p WikiData) ([]versionsInfo, time.Duration) {
- // defer timeTrack(time.Now(), "getImportantVersions")
- m := map[int]int{}
- lastTime := time.Now().AddDate(0, -1, 0)
- totalTime := time.Now().Sub(time.Now())
- for i := range p.Diffs {
- parsedTime, _ := time.Parse(time.ANSIC, p.Timestamps[i])
- duration := parsedTime.Sub(lastTime)
- if duration.Minutes() < 3 {
- totalTime += duration
- }
- m[i] = int(duration.Seconds())
- if i > 0 {
- m[i-1] = m[i]
- }
- // On to the next one
- lastTime = parsedTime
- }
-
- // Sort in order of decreasing diff times
- n := map[int][]int{}
- var a []int
- for k, v := range m {
- n[v] = append(n[v], k)
- }
- for k := range n {
- a = append(a, k)
- }
- sort.Sort(sort.Reverse(sort.IntSlice(a)))
-
- // Get the top 4 biggest diff times
- var importantVersions []int
- var r []versionsInfo
- for _, k := range a {
- for _, s := range n[k] {
- if s != 0 && s != len(n) {
- // fmt.Printf("%d, %d\n", s, k)
- importantVersions = append(importantVersions, s)
- if len(importantVersions) > 10 {
- sort.Ints(importantVersions)
- for _, nn := range importantVersions {
- r = append(r, versionsInfo{p.Timestamps[nn], nn})
- }
- return r, totalTime
- }
- }
- }
- }
- sort.Ints(importantVersions)
- for _, nn := range importantVersions {
- r = append(r, versionsInfo{p.Timestamps[nn], nn})
- }
- return r, totalTime
-}
-
-func rebuildTextsToDiffN(p WikiData, n int) string {
- dmp := diffmatchpatch.New()
- lastText := ""
- for i, diff := range p.Diffs {
- seq1, _ := dmp.DiffFromDelta(lastText, diff)
- textsLinemode := diffRebuildtexts(seq1)
- rebuilt := textsLinemode[len(textsLinemode)-1]
- if i == n {
- return rebuilt
- }
- lastText = rebuilt
- }
- return "ERROR"
-}
-
-var src = rand.NewSource(time.Now().UnixNano())
-
-const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-const (
- letterIdxBits = 6 // 6 bits to represent a letter index
- letterIdxMask = 1<
- {{ .Body }}
-
-{{ else }}
- {{ .Body }}
-{{ end }}
-
-[](https://travis-ci.org/gin-gonic/gin)
-[](https://codecov.io/gh/gin-gonic/gin)
-[](https://goreportcard.com/report/github.com/gin-gonic/gin)
-[](https://godoc.org/github.com/gin-gonic/gin)
-[](https://gitter.im/gin-gonic/gin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-Gin is a web framework written in Go (Golang). It features a martini-like API with much better performance, up to 40 times faster thanks to [httprouter](https://github.com/julienschmidt/httprouter). If you need performance and good productivity, you will love Gin.
-
-
-
-```sh
-$ cat test.go
-```
-```go
-package main
-
-import "gopkg.in/gin-gonic/gin.v1"
-
-func main() {
- r := gin.Default()
- r.GET("/ping", func(c *gin.Context) {
- c.JSON(200, gin.H{
- "message": "pong",
- })
- })
- r.Run() // listen and serve on 0.0.0.0:8080
-}
-```
-
-## Benchmarks
-
-Gin uses a custom version of [HttpRouter](https://github.com/julienschmidt/httprouter)
-
-[See all benchmarks](/BENCHMARKS.md)
-
-
-Benchmark name | (1) | (2) | (3) | (4)
---------------------------------|----------:|----------:|----------:|------:
-BenchmarkAce_GithubAll | 10000 | 109482 | 13792 | 167
-BenchmarkBear_GithubAll | 10000 | 287490 | 79952 | 943
-BenchmarkBeego_GithubAll | 3000 | 562184 | 146272 | 2092
-BenchmarkBone_GithubAll | 500 | 2578716 | 648016 | 8119
-BenchmarkDenco_GithubAll | 20000 | 94955 | 20224 | 167
-BenchmarkEcho_GithubAll | 30000 | 58705 | 0 | 0
-**BenchmarkGin_GithubAll** | **30000** | **50991** | **0** | **0**
-BenchmarkGocraftWeb_GithubAll | 5000 | 449648 | 133280 | 1889
-BenchmarkGoji_GithubAll | 2000 | 689748 | 56113 | 334
-BenchmarkGoJsonRest_GithubAll | 5000 | 537769 | 135995 | 2940
-BenchmarkGoRestful_GithubAll | 100 | 18410628 | 797236 | 7725
-BenchmarkGorillaMux_GithubAll | 200 | 8036360 | 153137 | 1791
-BenchmarkHttpRouter_GithubAll | 20000 | 63506 | 13792 | 167
-BenchmarkHttpTreeMux_GithubAll | 10000 | 165927 | 56112 | 334
-BenchmarkKocha_GithubAll | 10000 | 171362 | 23304 | 843
-BenchmarkMacaron_GithubAll | 2000 | 817008 | 224960 | 2315
-BenchmarkMartini_GithubAll | 100 | 12609209 | 237952 | 2686
-BenchmarkPat_GithubAll | 300 | 4830398 | 1504101 | 32222
-BenchmarkPossum_GithubAll | 10000 | 301716 | 97440 | 812
-BenchmarkR2router_GithubAll | 10000 | 270691 | 77328 | 1182
-BenchmarkRevel_GithubAll | 1000 | 1491919 | 345553 | 5918
-BenchmarkRivet_GithubAll | 10000 | 283860 | 84272 | 1079
-BenchmarkTango_GithubAll | 5000 | 473821 | 87078 | 2470
-BenchmarkTigerTonic_GithubAll | 2000 | 1120131 | 241088 | 6052
-BenchmarkTraffic_GithubAll | 200 | 8708979 | 2664762 | 22390
-BenchmarkVulcan_GithubAll | 5000 | 353392 | 19894 | 609
-BenchmarkZeus_GithubAll | 2000 | 944234 | 300688 | 2648
-
-(1): Total Repetitions
-(2): Single Repetition Duration (ns/op)
-(3): Heap Memory (B/op)
-(4): Average Allocations per Repetition (allocs/op)
-
-## Gin v1. stable
-
-- [x] Zero allocation router.
-- [x] Still the fastest http router and framework. From routing to writing.
-- [x] Complete suite of unit tests
-- [x] Battle tested
-- [x] API frozen, new releases will not break your code.
-
-
-## Start using it
-
-1. Download and install it:
-
- ```sh
- $ go get gopkg.in/gin-gonic/gin.v1
- ```
-
-2. Import it in your code:
-
- ```go
- import "gopkg.in/gin-gonic/gin.v1"
- ```
-
-3. (Optional) Import `net/http`. This is required for example if using constants such as `http.StatusOK`.
-
- ```go
- import "net/http"
- ```
-
-4. (Optional) Use latest changes (note: they may be broken and/or unstable):
- ```sh
- $ GIN_PATH=$GOPATH/src/gopkg.in/gin-gonic/gin.v1
- $ git -C $GIN_PATH checkout develop
- $ git -C $GIN_PATH pull origin develop
- ```
-
-## API Examples
-
-### Using GET, POST, PUT, PATCH, DELETE and OPTIONS
-
-```go
-func main() {
- // Disable Console Color
- // gin.DisableConsoleColor()
-
- // Creates a gin router with default middleware:
- // logger and recovery (crash-free) middleware
- router := gin.Default()
-
- router.GET("/someGet", getting)
- router.POST("/somePost", posting)
- router.PUT("/somePut", putting)
- router.DELETE("/someDelete", deleting)
- router.PATCH("/somePatch", patching)
- router.HEAD("/someHead", head)
- router.OPTIONS("/someOptions", options)
-
- // By default it serves on :8080 unless a
- // PORT environment variable was defined.
- router.Run()
- // router.Run(":3000") for a hard coded port
-}
-```
-
-### Parameters in path
-
-```go
-func main() {
- router := gin.Default()
-
- // This handler will match /user/john but will not match neither /user/ or /user
- router.GET("/user/:name", func(c *gin.Context) {
- name := c.Param("name")
- c.String(http.StatusOK, "Hello %s", name)
- })
-
- // However, this one will match /user/john/ and also /user/john/send
- // If no other routers match /user/john, it will redirect to /user/john/
- router.GET("/user/:name/*action", func(c *gin.Context) {
- name := c.Param("name")
- action := c.Param("action")
- message := name + " is " + action
- c.String(http.StatusOK, message)
- })
-
- router.Run(":8080")
-}
-```
-
-### Querystring parameters
-```go
-func main() {
- router := gin.Default()
-
- // Query string parameters are parsed using the existing underlying request object.
- // The request responds to a url matching: /welcome?firstname=Jane&lastname=Doe
- router.GET("/welcome", func(c *gin.Context) {
- firstname := c.DefaultQuery("firstname", "Guest")
- lastname := c.Query("lastname") // shortcut for c.Request.URL.Query().Get("lastname")
-
- c.String(http.StatusOK, "Hello %s %s", firstname, lastname)
- })
- router.Run(":8080")
-}
-```
-
-### Multipart/Urlencoded Form
-
-```go
-func main() {
- router := gin.Default()
-
- router.POST("/form_post", func(c *gin.Context) {
- message := c.PostForm("message")
- nick := c.DefaultPostForm("nick", "anonymous")
-
- c.JSON(200, gin.H{
- "status": "posted",
- "message": message,
- "nick": nick,
- })
- })
- router.Run(":8080")
-}
-```
-
-### Another example: query + post form
-
-```
-POST /post?id=1234&page=1 HTTP/1.1
-Content-Type: application/x-www-form-urlencoded
-
-name=manu&message=this_is_great
-```
-
-```go
-func main() {
- router := gin.Default()
-
- router.POST("/post", func(c *gin.Context) {
-
- id := c.Query("id")
- page := c.DefaultQuery("page", "0")
- name := c.PostForm("name")
- message := c.PostForm("message")
-
- fmt.Printf("id: %s; page: %s; name: %s; message: %s", id, page, name, message)
- })
- router.Run(":8080")
-}
-```
-
-```
-id: 1234; page: 1; name: manu; message: this_is_great
-```
-
-### Upload files
-
-#### Single file
-
-References issue [#774](https://github.com/gin-gonic/gin/issues/774) and detail [example code](examples/upload-file/single).
-
-```go
-func main() {
- router := gin.Default()
- router.POST("/upload", func(c *gin.Context) {
- // single file
- file, _ := c.FormFile("file")
- log.Println(file.Filename)
-
- c.String(http.StatusOK, fmt.Printf("'%s' uploaded!", file.Filename))
- })
- router.Run(":8080")
-}
-```
-
-How to `curl`:
-
-```bash
-curl -X POST http://localhost:8080/upload \
- -F "file=@/Users/appleboy/test.zip" \
- -H "Content-Type: multipart/form-data"
-```
-
-#### Multiple files
-
-See the detail [example code](examples/upload-file/multiple).
-
-```go
-func main() {
- router := gin.Default()
- router.POST("/upload", func(c *gin.Context) {
- // Multipart form
- form, _ := c.MultipartForm()
- files := form.File["upload[]"]
-
- for _, file := range files {
- log.Println(file.Filename)
- }
- c.String(http.StatusOK, fmt.Printf("%d files uploaded!", len(files)))
- })
- router.Run(":8080")
-}
-```
-
-How to `curl`:
-
-```bash
-curl -X POST http://localhost:8080/upload \
- -F "upload[]=@/Users/appleboy/test1.zip" \
- -F "upload[]=@/Users/appleboy/test2.zip" \
- -H "Content-Type: multipart/form-data"
-```
-
-### Grouping routes
-
-```go
-func main() {
- router := gin.Default()
-
- // Simple group: v1
- v1 := router.Group("/v1")
- {
- v1.POST("/login", loginEndpoint)
- v1.POST("/submit", submitEndpoint)
- v1.POST("/read", readEndpoint)
- }
-
- // Simple group: v2
- v2 := router.Group("/v2")
- {
- v2.POST("/login", loginEndpoint)
- v2.POST("/submit", submitEndpoint)
- v2.POST("/read", readEndpoint)
- }
-
- router.Run(":8080")
-}
-```
-
-
-### Blank Gin without middleware by default
-
-Use
-
-```go
-r := gin.New()
-```
-instead of
-
-```go
-r := gin.Default()
-```
-
-
-### Using middleware
-```go
-func main() {
- // Creates a router without any middleware by default
- r := gin.New()
-
- // Global middleware
- r.Use(gin.Logger())
- r.Use(gin.Recovery())
-
- // Per route middleware, you can add as many as you desire.
- r.GET("/benchmark", MyBenchLogger(), benchEndpoint)
-
- // Authorization group
- // authorized := r.Group("/", AuthRequired())
- // exactly the same as:
- authorized := r.Group("/")
- // per group middleware! in this case we use the custom created
- // AuthRequired() middleware just in the "authorized" group.
- authorized.Use(AuthRequired())
- {
- authorized.POST("/login", loginEndpoint)
- authorized.POST("/submit", submitEndpoint)
- authorized.POST("/read", readEndpoint)
-
- // nested group
- testing := authorized.Group("testing")
- testing.GET("/analytics", analyticsEndpoint)
- }
-
- // Listen and serve on 0.0.0.0:8080
- r.Run(":8080")
-}
-```
-
-### Model binding and validation
-
-To bind a request body into a type, use model binding. We currently support binding of JSON, XML and standard form values (foo=bar&boo=baz).
-
-Note that you need to set the corresponding binding tag on all fields you want to bind. For example, when binding from JSON, set `json:"fieldname"`.
-
-When using the Bind-method, Gin tries to infer the binder depending on the Content-Type header. If you are sure what you are binding, you can use BindWith.
-
-You can also specify that specific fields are required. If a field is decorated with `binding:"required"` and has a empty value when binding, the current request will fail with an error.
-
-```go
-// Binding from JSON
-type Login struct {
- User string `form:"user" json:"user" binding:"required"`
- Password string `form:"password" json:"password" binding:"required"`
-}
-
-func main() {
- router := gin.Default()
-
- // Example for binding JSON ({"user": "manu", "password": "123"})
- router.POST("/loginJSON", func(c *gin.Context) {
- var json Login
- if c.BindJSON(&json) == nil {
- if json.User == "manu" && json.Password == "123" {
- c.JSON(http.StatusOK, gin.H{"status": "you are logged in"})
- } else {
- c.JSON(http.StatusUnauthorized, gin.H{"status": "unauthorized"})
- }
- }
- })
-
- // Example for binding a HTML form (user=manu&password=123)
- router.POST("/loginForm", func(c *gin.Context) {
- var form Login
- // This will infer what binder to use depending on the content-type header.
- if c.Bind(&form) == nil {
- if form.User == "manu" && form.Password == "123" {
- c.JSON(http.StatusOK, gin.H{"status": "you are logged in"})
- } else {
- c.JSON(http.StatusUnauthorized, gin.H{"status": "unauthorized"})
- }
- }
- })
-
- // Listen and serve on 0.0.0.0:8080
- router.Run(":8080")
-}
-```
-
-### Bind Query String
-
-See the [detail information](https://github.com/gin-gonic/gin/issues/742#issuecomment-264681292).
-
-```go
-package main
-
-import "log"
-import "github.com/gin-gonic/gin"
-
-type Person struct {
- Name string `form:"name"`
- Address string `form:"address"`
-}
-
-func main() {
- route := gin.Default()
- route.GET("/testing", startPage)
- route.Run(":8085")
-}
-
-func startPage(c *gin.Context) {
- var person Person
- // If `GET`, only `Form` binding engine (`query`) used.
- // If `POST`, first checks the `content-type` for `JSON` or `XML`, then uses `Form` (`form-data`).
- // See more at https://github.com/gin-gonic/gin/blob/develop/binding/binding.go#L45
- if c.Bind(&person) == nil {
- log.Println(person.Name)
- log.Println(person.Address)
- }
-
- c.String(200, "Success")
-}
-```
-
-
-### Multipart/Urlencoded binding
-
-```go
-package main
-
-import (
- "gopkg.in/gin-gonic/gin.v1"
-)
-
-type LoginForm struct {
- User string `form:"user" binding:"required"`
- Password string `form:"password" binding:"required"`
-}
-
-func main() {
- router := gin.Default()
- router.POST("/login", func(c *gin.Context) {
- // you can bind multipart form with explicit binding declaration:
- // c.BindWith(&form, binding.Form)
- // or you can simply use autobinding with Bind method:
- var form LoginForm
- // in this case proper binding will be automatically selected
- if c.Bind(&form) == nil {
- if form.User == "user" && form.Password == "password" {
- c.JSON(200, gin.H{"status": "you are logged in"})
- } else {
- c.JSON(401, gin.H{"status": "unauthorized"})
- }
- }
- })
- router.Run(":8080")
-}
-```
-
-Test it with:
-```sh
-$ curl -v --form user=user --form password=password http://localhost:8080/login
-```
-
-
-### XML, JSON and YAML rendering
-
-```go
-func main() {
- r := gin.Default()
-
- // gin.H is a shortcut for map[string]interface{}
- r.GET("/someJSON", func(c *gin.Context) {
- c.JSON(http.StatusOK, gin.H{"message": "hey", "status": http.StatusOK})
- })
-
- r.GET("/moreJSON", func(c *gin.Context) {
- // You also can use a struct
- var msg struct {
- Name string `json:"user"`
- Message string
- Number int
- }
- msg.Name = "Lena"
- msg.Message = "hey"
- msg.Number = 123
- // Note that msg.Name becomes "user" in the JSON
- // Will output : {"user": "Lena", "Message": "hey", "Number": 123}
- c.JSON(http.StatusOK, msg)
- })
-
- r.GET("/someXML", func(c *gin.Context) {
- c.XML(http.StatusOK, gin.H{"message": "hey", "status": http.StatusOK})
- })
-
- r.GET("/someYAML", func(c *gin.Context) {
- c.YAML(http.StatusOK, gin.H{"message": "hey", "status": http.StatusOK})
- })
-
- // Listen and serve on 0.0.0.0:8080
- r.Run(":8080")
-}
-```
-
-### Serving static files
-
-```go
-func main() {
- router := gin.Default()
- router.Static("/assets", "./assets")
- router.StaticFS("/more_static", http.Dir("my_file_system"))
- router.StaticFile("/favicon.ico", "./resources/favicon.ico")
-
- // Listen and serve on 0.0.0.0:8080
- router.Run(":8080")
-}
-```
-
-### HTML rendering
-
-Using LoadHTMLGlob() or LoadHTMLFiles()
-
-```go
-func main() {
- router := gin.Default()
- router.LoadHTMLGlob("templates/*")
- //router.LoadHTMLFiles("templates/template1.html", "templates/template2.html")
- router.GET("/index", func(c *gin.Context) {
- c.HTML(http.StatusOK, "index.tmpl", gin.H{
- "title": "Main website",
- })
- })
- router.Run(":8080")
-}
-```
-templates/index.tmpl
-```html
-
- - {{ .title }} -
- -``` - -Using templates with same name in different directories - -```go -func main() { - router := gin.Default() - router.LoadHTMLGlob("templates/**/*") - router.GET("/posts/index", func(c *gin.Context) { - c.HTML(http.StatusOK, "posts/index.tmpl", gin.H{ - "title": "Posts", - }) - }) - router.GET("/users/index", func(c *gin.Context) { - c.HTML(http.StatusOK, "users/index.tmpl", gin.H{ - "title": "Users", - }) - }) - router.Run(":8080") -} -``` -templates/posts/index.tmpl -```html -{{ define "posts/index.tmpl" }} -- {{ .title }} -
-Using posts/index.tmpl
- -{{ end }} -``` -templates/users/index.tmpl -```html -{{ define "users/index.tmpl" }} -- {{ .title }} -
-Using users/index.tmpl
- -{{ end }} -``` - -You can also use your own html template render - -```go -import "html/template" - -func main() { - router := gin.Default() - html := template.Must(template.ParseFiles("file1", "file2")) - router.SetHTMLTemplate(html) - router.Run(":8080") -} -``` - -### Multitemplate - -Gin allow by default use only one html.Template. Check [a multitemplate render](https://github.com/gin-contrib/multitemplate) for using features like go 1.6 `block template`. - -### Redirects - -Issuing a HTTP redirect is easy: - -```go -r.GET("/test", func(c *gin.Context) { - c.Redirect(http.StatusMovedPermanently, "http://www.google.com/") -}) -``` -Both internal and external locations are supported. - - -### Custom Middleware - -```go -func Logger() gin.HandlerFunc { - return func(c *gin.Context) { - t := time.Now() - - // Set example variable - c.Set("example", "12345") - - // before request - - c.Next() - - // after request - latency := time.Since(t) - log.Print(latency) - - // access the status we are sending - status := c.Writer.Status() - log.Println(status) - } -} - -func main() { - r := gin.New() - r.Use(Logger()) - - r.GET("/test", func(c *gin.Context) { - example := c.MustGet("example").(string) - - // it would print: "12345" - log.Println(example) - }) - - // Listen and serve on 0.0.0.0:8080 - r.Run(":8080") -} -``` - -### Using BasicAuth() middleware -```go -// simulate some private data -var secrets = gin.H{ - "foo": gin.H{"email": "foo@bar.com", "phone": "123433"}, - "austin": gin.H{"email": "austin@example.com", "phone": "666"}, - "lena": gin.H{"email": "lena@guapa.com", "phone": "523443"}, -} - -func main() { - r := gin.Default() - - // Group using gin.BasicAuth() middleware - // gin.Accounts is a shortcut for map[string]string - authorized := r.Group("/admin", gin.BasicAuth(gin.Accounts{ - "foo": "bar", - "austin": "1234", - "lena": "hello2", - "manu": "4321", - })) - - // /admin/secrets endpoint - // hit "localhost:8080/admin/secrets - authorized.GET("/secrets", func(c *gin.Context) { - // get user, it was set by the BasicAuth middleware - user := c.MustGet(gin.AuthUserKey).(string) - if secret, ok := secrets[user]; ok { - c.JSON(http.StatusOK, gin.H{"user": user, "secret": secret}) - } else { - c.JSON(http.StatusOK, gin.H{"user": user, "secret": "NO SECRET :("}) - } - }) - - // Listen and serve on 0.0.0.0:8080 - r.Run(":8080") -} -``` - - -### Goroutines inside a middleware -When starting inside a middleware or handler, you **SHOULD NOT** use the original context inside it, you have to use a read-only copy. - -```go -func main() { - r := gin.Default() - - r.GET("/long_async", func(c *gin.Context) { - // create copy to be used inside the goroutine - cCp := c.Copy() - go func() { - // simulate a long task with time.Sleep(). 5 seconds - time.Sleep(5 * time.Second) - - // note that you are using the copied context "cCp", IMPORTANT - log.Println("Done! in path " + cCp.Request.URL.Path) - }() - }) - - r.GET("/long_sync", func(c *gin.Context) { - // simulate a long task with time.Sleep(). 5 seconds - time.Sleep(5 * time.Second) - - // since we are NOT using a goroutine, we do not have to copy the context - log.Println("Done! in path " + c.Request.URL.Path) - }) - - // Listen and serve on 0.0.0.0:8080 - r.Run(":8080") -} -``` - -### Custom HTTP configuration - -Use `http.ListenAndServe()` directly, like this: - -```go -func main() { - router := gin.Default() - http.ListenAndServe(":8080", router) -} -``` -or - -```go -func main() { - router := gin.Default() - - s := &http.Server{ - Addr: ":8080", - Handler: router, - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - MaxHeaderBytes: 1 << 20, - } - s.ListenAndServe() -} -``` - -### Graceful restart or stop - -Do you want to graceful restart or stop your web server? -There are some ways this can be done. - -We can use [fvbock/endless](https://github.com/fvbock/endless) to replace the default `ListenAndServe`. Refer issue [#296](https://github.com/gin-gonic/gin/issues/296) for more details. - -```go -router := gin.Default() -router.GET("/", handler) -// [...] -endless.ListenAndServe(":4242", router) -``` - -An alternative to endless: - -* [manners](https://github.com/braintree/manners): A polite Go HTTP server that shuts down gracefully. - -## Contributing - -- With issues: - - Use the search tool before opening a new issue. - - Please provide source code and commit sha if you found a bug. - - Review existing issues and provide feedback or react to them. -- With pull requests: - - Open your pull request against develop - - Your pull request should have no more than two commits, if not you should squash them. - - It should pass all tests in the available continuous integrations systems such as TravisCI. - - You should add/modify tests to cover your proposed code changes. - - If your pull request contains a new feature, please document it on the README. - -## Users - -Awesome project lists using [Gin](https://github.com/gin-gonic/gin) web framework. - -* [drone](https://github.com/drone/drone): Drone is a Continuous Delivery platform built on Docker, written in Go -* [gorush](https://github.com/appleboy/gorush): A push notification server written in Go. diff --git a/vendor/github.com/gin-gonic/gin/auth.go b/vendor/github.com/gin-gonic/gin/auth.go deleted file mode 100644 index 125e659..0000000 --- a/vendor/github.com/gin-gonic/gin/auth.go +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "crypto/subtle" - "encoding/base64" - "strconv" -) - -const AuthUserKey = "user" - -type ( - Accounts map[string]string - authPair struct { - Value string - User string - } - authPairs []authPair -) - -func (a authPairs) searchCredential(authValue string) (string, bool) { - if len(authValue) == 0 { - return "", false - } - for _, pair := range a { - if pair.Value == authValue { - return pair.User, true - } - } - return "", false -} - -// BasicAuthForRealm returns a Basic HTTP Authorization middleware. It takes as arguments a map[string]string where -// the key is the user name and the value is the password, as well as the name of the Realm. -// If the realm is empty, "Authorization Required" will be used by default. -// (see http://tools.ietf.org/html/rfc2617#section-1.2) -func BasicAuthForRealm(accounts Accounts, realm string) HandlerFunc { - if realm == "" { - realm = "Authorization Required" - } - realm = "Basic realm=" + strconv.Quote(realm) - pairs := processAccounts(accounts) - return func(c *Context) { - // Search user in the slice of allowed credentials - user, found := pairs.searchCredential(c.Request.Header.Get("Authorization")) - if !found { - // Credentials doesn't match, we return 401 and abort handlers chain. - c.Header("WWW-Authenticate", realm) - c.AbortWithStatus(401) - } else { - // The user credentials was found, set user's id to key AuthUserKey in this context, the userId can be read later using - // c.MustGet(gin.AuthUserKey) - c.Set(AuthUserKey, user) - } - } -} - -// BasicAuth returns a Basic HTTP Authorization middleware. It takes as argument a map[string]string where -// the key is the user name and the value is the password. -func BasicAuth(accounts Accounts) HandlerFunc { - return BasicAuthForRealm(accounts, "") -} - -func processAccounts(accounts Accounts) authPairs { - assert1(len(accounts) > 0, "Empty list of authorized credentials") - pairs := make(authPairs, 0, len(accounts)) - for user, password := range accounts { - assert1(len(user) > 0, "User can not be empty") - value := authorizationHeader(user, password) - pairs = append(pairs, authPair{ - Value: value, - User: user, - }) - } - return pairs -} - -func authorizationHeader(user, password string) string { - base := user + ":" + password - return "Basic " + base64.StdEncoding.EncodeToString([]byte(base)) -} - -func secureCompare(given, actual string) bool { - if subtle.ConstantTimeEq(int32(len(given)), int32(len(actual))) == 1 { - return subtle.ConstantTimeCompare([]byte(given), []byte(actual)) == 1 - } - /* Securely compare actual to itself to keep constant time, but always return false */ - return subtle.ConstantTimeCompare([]byte(actual), []byte(actual)) == 1 && false -} diff --git a/vendor/github.com/gin-gonic/gin/binding/binding.go b/vendor/github.com/gin-gonic/gin/binding/binding.go deleted file mode 100644 index dc7397f..0000000 --- a/vendor/github.com/gin-gonic/gin/binding/binding.go +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package binding - -import "net/http" - -const ( - MIMEJSON = "application/json" - MIMEHTML = "text/html" - MIMEXML = "application/xml" - MIMEXML2 = "text/xml" - MIMEPlain = "text/plain" - MIMEPOSTForm = "application/x-www-form-urlencoded" - MIMEMultipartPOSTForm = "multipart/form-data" - MIMEPROTOBUF = "application/x-protobuf" -) - -type Binding interface { - Name() string - Bind(*http.Request, interface{}) error -} - -type StructValidator interface { - // ValidateStruct can receive any kind of type and it should never panic, even if the configuration is not right. - // If the received type is not a struct, any validation should be skipped and nil must be returned. - // If the received type is a struct or pointer to a struct, the validation should be performed. - // If the struct is not valid or the validation itself fails, a descriptive error should be returned. - // Otherwise nil must be returned. - ValidateStruct(interface{}) error -} - -var Validator StructValidator = &defaultValidator{} - -var ( - JSON = jsonBinding{} - XML = xmlBinding{} - Form = formBinding{} - FormPost = formPostBinding{} - FormMultipart = formMultipartBinding{} - ProtoBuf = protobufBinding{} -) - -func Default(method, contentType string) Binding { - if method == "GET" { - return Form - } else { - switch contentType { - case MIMEJSON: - return JSON - case MIMEXML, MIMEXML2: - return XML - case MIMEPROTOBUF: - return ProtoBuf - default: //case MIMEPOSTForm, MIMEMultipartPOSTForm: - return Form - } - } -} - -func validate(obj interface{}) error { - if Validator == nil { - return nil - } - return Validator.ValidateStruct(obj) -} diff --git a/vendor/github.com/gin-gonic/gin/binding/default_validator.go b/vendor/github.com/gin-gonic/gin/binding/default_validator.go deleted file mode 100644 index 760728b..0000000 --- a/vendor/github.com/gin-gonic/gin/binding/default_validator.go +++ /dev/null @@ -1,41 +0,0 @@ -package binding - -import ( - "reflect" - "sync" - - "gopkg.in/go-playground/validator.v8" -) - -type defaultValidator struct { - once sync.Once - validate *validator.Validate -} - -var _ StructValidator = &defaultValidator{} - -func (v *defaultValidator) ValidateStruct(obj interface{}) error { - if kindOfData(obj) == reflect.Struct { - v.lazyinit() - if err := v.validate.Struct(obj); err != nil { - return error(err) - } - } - return nil -} - -func (v *defaultValidator) lazyinit() { - v.once.Do(func() { - config := &validator.Config{TagName: "binding"} - v.validate = validator.New(config) - }) -} - -func kindOfData(data interface{}) reflect.Kind { - value := reflect.ValueOf(data) - valueType := value.Kind() - if valueType == reflect.Ptr { - valueType = value.Elem().Kind() - } - return valueType -} diff --git a/vendor/github.com/gin-gonic/gin/binding/form.go b/vendor/github.com/gin-gonic/gin/binding/form.go deleted file mode 100644 index 557333e..0000000 --- a/vendor/github.com/gin-gonic/gin/binding/form.go +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package binding - -import "net/http" - -type formBinding struct{} -type formPostBinding struct{} -type formMultipartBinding struct{} - -func (formBinding) Name() string { - return "form" -} - -func (formBinding) Bind(req *http.Request, obj interface{}) error { - if err := req.ParseForm(); err != nil { - return err - } - req.ParseMultipartForm(32 << 10) // 32 MB - if err := mapForm(obj, req.Form); err != nil { - return err - } - return validate(obj) -} - -func (formPostBinding) Name() string { - return "form-urlencoded" -} - -func (formPostBinding) Bind(req *http.Request, obj interface{}) error { - if err := req.ParseForm(); err != nil { - return err - } - if err := mapForm(obj, req.PostForm); err != nil { - return err - } - return validate(obj) -} - -func (formMultipartBinding) Name() string { - return "multipart/form-data" -} - -func (formMultipartBinding) Bind(req *http.Request, obj interface{}) error { - if err := req.ParseMultipartForm(32 << 10); err != nil { - return err - } - if err := mapForm(obj, req.MultipartForm.Value); err != nil { - return err - } - return validate(obj) -} diff --git a/vendor/github.com/gin-gonic/gin/binding/form_mapping.go b/vendor/github.com/gin-gonic/gin/binding/form_mapping.go deleted file mode 100644 index 07c8375..0000000 --- a/vendor/github.com/gin-gonic/gin/binding/form_mapping.go +++ /dev/null @@ -1,150 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package binding - -import ( - "errors" - "reflect" - "strconv" -) - -func mapForm(ptr interface{}, form map[string][]string) error { - typ := reflect.TypeOf(ptr).Elem() - val := reflect.ValueOf(ptr).Elem() - for i := 0; i < typ.NumField(); i++ { - typeField := typ.Field(i) - structField := val.Field(i) - if !structField.CanSet() { - continue - } - - structFieldKind := structField.Kind() - inputFieldName := typeField.Tag.Get("form") - if inputFieldName == "" { - inputFieldName = typeField.Name - - // if "form" tag is nil, we inspect if the field is a struct. - // this would not make sense for JSON parsing but it does for a form - // since data is flatten - if structFieldKind == reflect.Struct { - err := mapForm(structField.Addr().Interface(), form) - if err != nil { - return err - } - continue - } - } - inputValue, exists := form[inputFieldName] - if !exists { - continue - } - - numElems := len(inputValue) - if structFieldKind == reflect.Slice && numElems > 0 { - sliceOf := structField.Type().Elem().Kind() - slice := reflect.MakeSlice(structField.Type(), numElems, numElems) - for i := 0; i < numElems; i++ { - if err := setWithProperType(sliceOf, inputValue[i], slice.Index(i)); err != nil { - return err - } - } - val.Field(i).Set(slice) - } else { - if err := setWithProperType(typeField.Type.Kind(), inputValue[0], structField); err != nil { - return err - } - } - } - return nil -} - -func setWithProperType(valueKind reflect.Kind, val string, structField reflect.Value) error { - switch valueKind { - case reflect.Int: - return setIntField(val, 0, structField) - case reflect.Int8: - return setIntField(val, 8, structField) - case reflect.Int16: - return setIntField(val, 16, structField) - case reflect.Int32: - return setIntField(val, 32, structField) - case reflect.Int64: - return setIntField(val, 64, structField) - case reflect.Uint: - return setUintField(val, 0, structField) - case reflect.Uint8: - return setUintField(val, 8, structField) - case reflect.Uint16: - return setUintField(val, 16, structField) - case reflect.Uint32: - return setUintField(val, 32, structField) - case reflect.Uint64: - return setUintField(val, 64, structField) - case reflect.Bool: - return setBoolField(val, structField) - case reflect.Float32: - return setFloatField(val, 32, structField) - case reflect.Float64: - return setFloatField(val, 64, structField) - case reflect.String: - structField.SetString(val) - default: - return errors.New("Unknown type") - } - return nil -} - -func setIntField(val string, bitSize int, field reflect.Value) error { - if val == "" { - val = "0" - } - intVal, err := strconv.ParseInt(val, 10, bitSize) - if err == nil { - field.SetInt(intVal) - } - return err -} - -func setUintField(val string, bitSize int, field reflect.Value) error { - if val == "" { - val = "0" - } - uintVal, err := strconv.ParseUint(val, 10, bitSize) - if err == nil { - field.SetUint(uintVal) - } - return err -} - -func setBoolField(val string, field reflect.Value) error { - if val == "" { - val = "false" - } - boolVal, err := strconv.ParseBool(val) - if err == nil { - field.SetBool(boolVal) - } - return nil -} - -func setFloatField(val string, bitSize int, field reflect.Value) error { - if val == "" { - val = "0.0" - } - floatVal, err := strconv.ParseFloat(val, bitSize) - if err == nil { - field.SetFloat(floatVal) - } - return err -} - -// Don't pass in pointers to bind to. Can lead to bugs. See: -// https://github.com/codegangsta/martini-contrib/issues/40 -// https://github.com/codegangsta/martini-contrib/pull/34#issuecomment-29683659 -func ensureNotPointer(obj interface{}) { - if reflect.TypeOf(obj).Kind() == reflect.Ptr { - panic("Pointers are not accepted as binding models") - } -} diff --git a/vendor/github.com/gin-gonic/gin/binding/json.go b/vendor/github.com/gin-gonic/gin/binding/json.go deleted file mode 100644 index 6e53244..0000000 --- a/vendor/github.com/gin-gonic/gin/binding/json.go +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package binding - -import ( - "encoding/json" - - "net/http" -) - -type jsonBinding struct{} - -func (jsonBinding) Name() string { - return "json" -} - -func (jsonBinding) Bind(req *http.Request, obj interface{}) error { - decoder := json.NewDecoder(req.Body) - if err := decoder.Decode(obj); err != nil { - return err - } - return validate(obj) -} diff --git a/vendor/github.com/gin-gonic/gin/binding/protobuf.go b/vendor/github.com/gin-gonic/gin/binding/protobuf.go deleted file mode 100644 index 9f95622..0000000 --- a/vendor/github.com/gin-gonic/gin/binding/protobuf.go +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package binding - -import ( - "github.com/golang/protobuf/proto" - - "io/ioutil" - "net/http" -) - -type protobufBinding struct{} - -func (protobufBinding) Name() string { - return "protobuf" -} - -func (protobufBinding) Bind(req *http.Request, obj interface{}) error { - - buf, err := ioutil.ReadAll(req.Body) - if err != nil { - return err - } - - if err = proto.Unmarshal(buf, obj.(proto.Message)); err != nil { - return err - } - - //Here it's same to return validate(obj), but util now we cann't add `binding:""` to the struct - //which automatically generate by gen-proto - return nil - //return validate(obj) -} diff --git a/vendor/github.com/gin-gonic/gin/binding/xml.go b/vendor/github.com/gin-gonic/gin/binding/xml.go deleted file mode 100644 index f84a6b7..0000000 --- a/vendor/github.com/gin-gonic/gin/binding/xml.go +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package binding - -import ( - "encoding/xml" - "net/http" -) - -type xmlBinding struct{} - -func (xmlBinding) Name() string { - return "xml" -} - -func (xmlBinding) Bind(req *http.Request, obj interface{}) error { - decoder := xml.NewDecoder(req.Body) - if err := decoder.Decode(obj); err != nil { - return err - } - return validate(obj) -} diff --git a/vendor/github.com/gin-gonic/gin/codecov.yml b/vendor/github.com/gin-gonic/gin/codecov.yml deleted file mode 100644 index c9c9a52..0000000 --- a/vendor/github.com/gin-gonic/gin/codecov.yml +++ /dev/null @@ -1,5 +0,0 @@ -coverage: - notify: - gitter: - default: - url: https://webhooks.gitter.im/e/d90dcdeeab2f1e357165 diff --git a/vendor/github.com/gin-gonic/gin/context.go b/vendor/github.com/gin-gonic/gin/context.go deleted file mode 100644 index 601754f..0000000 --- a/vendor/github.com/gin-gonic/gin/context.go +++ /dev/null @@ -1,647 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "errors" - "io" - "math" - "mime/multipart" - "net" - "net/http" - "net/url" - "strings" - "time" - - "github.com/gin-gonic/gin/binding" - "github.com/gin-gonic/gin/render" - "gopkg.in/gin-contrib/sse.v0" -) - -// Content-Type MIME of the most common data formats -const ( - MIMEJSON = binding.MIMEJSON - MIMEHTML = binding.MIMEHTML - MIMEXML = binding.MIMEXML - MIMEXML2 = binding.MIMEXML2 - MIMEPlain = binding.MIMEPlain - MIMEPOSTForm = binding.MIMEPOSTForm - MIMEMultipartPOSTForm = binding.MIMEMultipartPOSTForm -) - -const ( - defaultMemory = 32 << 20 // 32 MB - abortIndex int8 = math.MaxInt8 / 2 -) - -// Context is the most important part of gin. It allows us to pass variables between middleware, -// manage the flow, validate the JSON of a request and render a JSON response for example. -type Context struct { - writermem responseWriter - Request *http.Request - Writer ResponseWriter - - Params Params - handlers HandlersChain - index int8 - - engine *Engine - Keys map[string]interface{} - Errors errorMsgs - Accepted []string -} - -/************************************/ -/********** CONTEXT CREATION ********/ -/************************************/ - -func (c *Context) reset() { - c.Writer = &c.writermem - c.Params = c.Params[0:0] - c.handlers = nil - c.index = -1 - c.Keys = nil - c.Errors = c.Errors[0:0] - c.Accepted = nil -} - -// Copy returns a copy of the current context that can be safely used outside the request's scope. -// This has to be used when the context has to be passed to a goroutine. -func (c *Context) Copy() *Context { - var cp = *c - cp.writermem.ResponseWriter = nil - cp.Writer = &cp.writermem - cp.index = abortIndex - cp.handlers = nil - return &cp -} - -// HandlerName returns the main handler's name. For example if the handler is "handleGetUsers()", this -// function will return "main.handleGetUsers" -func (c *Context) HandlerName() string { - return nameOfFunction(c.handlers.Last()) -} - -/************************************/ -/*********** FLOW CONTROL ***********/ -/************************************/ - -// Next should be used only inside middleware. -// It executes the pending handlers in the chain inside the calling handler. -// See example in github. -func (c *Context) Next() { - c.index++ - s := int8(len(c.handlers)) - for ; c.index < s; c.index++ { - c.handlers[c.index](c) - } -} - -// IsAborted returns true if the current context was aborted. -func (c *Context) IsAborted() bool { - return c.index >= abortIndex -} - -// Abort prevents pending handlers from being called. Note that this will not stop the current handler. -// Let's say you have an authorization middleware that validates that the current request is authorized. If the -// authorization fails (ex: the password does not match), call Abort to ensure the remaining handlers -// for this request are not called. -func (c *Context) Abort() { - c.index = abortIndex -} - -// AbortWithStatus calls `Abort()` and writes the headers with the specified status code. -// For example, a failed attempt to authentificate a request could use: context.AbortWithStatus(401). -func (c *Context) AbortWithStatus(code int) { - c.Status(code) - c.Writer.WriteHeaderNow() - c.Abort() -} - -// AbortWithError calls `AbortWithStatus()` and `Error()` internally. This method stops the chain, writes the status code and -// pushes the specified error to `c.Errors`. -// See Context.Error() for more details. -func (c *Context) AbortWithError(code int, err error) *Error { - c.AbortWithStatus(code) - return c.Error(err) -} - -/************************************/ -/********* ERROR MANAGEMENT *********/ -/************************************/ - -// Attaches an error to the current context. The error is pushed to a list of errors. -// It's a good idea to call Error for each error that occurred during the resolution of a request. -// A middleware can be used to collect all the errors -// and push them to a database together, print a log, or append it in the HTTP response. -func (c *Context) Error(err error) *Error { - var parsedError *Error - switch err.(type) { - case *Error: - parsedError = err.(*Error) - default: - parsedError = &Error{ - Err: err, - Type: ErrorTypePrivate, - } - } - c.Errors = append(c.Errors, parsedError) - return parsedError -} - -/************************************/ -/******** METADATA MANAGEMENT********/ -/************************************/ - -// Set is used to store a new key/value pair exclusivelly for this context. -// It also lazy initializes c.Keys if it was not used previously. -func (c *Context) Set(key string, value interface{}) { - if c.Keys == nil { - c.Keys = make(map[string]interface{}) - } - c.Keys[key] = value -} - -// Get returns the value for the given key, ie: (value, true). -// If the value does not exists it returns (nil, false) -func (c *Context) Get(key string) (value interface{}, exists bool) { - value, exists = c.Keys[key] - return -} - -// MustGet returns the value for the given key if it exists, otherwise it panics. -func (c *Context) MustGet(key string) interface{} { - if value, exists := c.Get(key); exists { - return value - } - panic("Key \"" + key + "\" does not exist") -} - -/************************************/ -/************ INPUT DATA ************/ -/************************************/ - -// Param returns the value of the URL param. -// It is a shortcut for c.Params.ByName(key) -// router.GET("/user/:id", func(c *gin.Context) { -// // a GET request to /user/john -// id := c.Param("id") // id == "john" -// }) -func (c *Context) Param(key string) string { - return c.Params.ByName(key) -} - -// Query returns the keyed url query value if it exists, -// othewise it returns an empty string `("")`. -// It is shortcut for `c.Request.URL.Query().Get(key)` -// GET /path?id=1234&name=Manu&value= -// c.Query("id") == "1234" -// c.Query("name") == "Manu" -// c.Query("value") == "" -// c.Query("wtf") == "" -func (c *Context) Query(key string) string { - value, _ := c.GetQuery(key) - return value -} - -// DefaultQuery returns the keyed url query value if it exists, -// othewise it returns the specified defaultValue string. -// See: Query() and GetQuery() for further information. -// GET /?name=Manu&lastname= -// c.DefaultQuery("name", "unknown") == "Manu" -// c.DefaultQuery("id", "none") == "none" -// c.DefaultQuery("lastname", "none") == "" -func (c *Context) DefaultQuery(key, defaultValue string) string { - if value, ok := c.GetQuery(key); ok { - return value - } - return defaultValue -} - -// GetQuery is like Query(), it returns the keyed url query value -// if it exists `(value, true)` (even when the value is an empty string), -// othewise it returns `("", false)`. -// It is shortcut for `c.Request.URL.Query().Get(key)` -// GET /?name=Manu&lastname= -// ("Manu", true) == c.GetQuery("name") -// ("", false) == c.GetQuery("id") -// ("", true) == c.GetQuery("lastname") -func (c *Context) GetQuery(key string) (string, bool) { - if values, ok := c.GetQueryArray(key); ok { - return values[0], ok - } - return "", false -} - -// QueryArray returns a slice of strings for a given query key. -// The length of the slice depends on the number of params with the given key. -func (c *Context) QueryArray(key string) []string { - values, _ := c.GetQueryArray(key) - return values -} - -// GetQueryArray returns a slice of strings for a given query key, plus -// a boolean value whether at least one value exists for the given key. -func (c *Context) GetQueryArray(key string) ([]string, bool) { - req := c.Request - if values, ok := req.URL.Query()[key]; ok && len(values) > 0 { - return values, true - } - return []string{}, false -} - -// PostForm returns the specified key from a POST urlencoded form or multipart form -// when it exists, otherwise it returns an empty string `("")`. -func (c *Context) PostForm(key string) string { - value, _ := c.GetPostForm(key) - return value -} - -// DefaultPostForm returns the specified key from a POST urlencoded form or multipart form -// when it exists, otherwise it returns the specified defaultValue string. -// See: PostForm() and GetPostForm() for further information. -func (c *Context) DefaultPostForm(key, defaultValue string) string { - if value, ok := c.GetPostForm(key); ok { - return value - } - return defaultValue -} - -// GetPostForm is like PostForm(key). It returns the specified key from a POST urlencoded -// form or multipart form when it exists `(value, true)` (even when the value is an empty string), -// otherwise it returns ("", false). -// For example, during a PATCH request to update the user's email: -// email=mail@example.com --> ("mail@example.com", true) := GetPostForm("email") // set email to "mail@example.com" -// email= --> ("", true) := GetPostForm("email") // set email to "" -// --> ("", false) := GetPostForm("email") // do nothing with email -func (c *Context) GetPostForm(key string) (string, bool) { - if values, ok := c.GetPostFormArray(key); ok { - return values[0], ok - } - return "", false -} - -// PostFormArray returns a slice of strings for a given form key. -// The length of the slice depends on the number of params with the given key. -func (c *Context) PostFormArray(key string) []string { - values, _ := c.GetPostFormArray(key) - return values -} - -// GetPostFormArray returns a slice of strings for a given form key, plus -// a boolean value whether at least one value exists for the given key. -func (c *Context) GetPostFormArray(key string) ([]string, bool) { - req := c.Request - req.ParseForm() - req.ParseMultipartForm(defaultMemory) - if values := req.PostForm[key]; len(values) > 0 { - return values, true - } - if req.MultipartForm != nil && req.MultipartForm.File != nil { - if values := req.MultipartForm.Value[key]; len(values) > 0 { - return values, true - } - } - return []string{}, false -} - -// FormFile returns the first file for the provided form key. -func (c *Context) FormFile(name string) (*multipart.FileHeader, error) { - _, fh, err := c.Request.FormFile(name) - return fh, err -} - -// MultipartForm is the parsed multipart form, including file uploads. -func (c *Context) MultipartForm() (*multipart.Form, error) { - err := c.Request.ParseMultipartForm(defaultMemory) - return c.Request.MultipartForm, err -} - -// Bind checks the Content-Type to select a binding engine automatically, -// Depending the "Content-Type" header different bindings are used: -// "application/json" --> JSON binding -// "application/xml" --> XML binding -// otherwise --> returns an error -// It parses the request's body as JSON if Content-Type == "application/json" using JSON or XML as a JSON input. -// It decodes the json payload into the struct specified as a pointer. -// Like ParseBody() but this method also writes a 400 error if the json is not valid. -func (c *Context) Bind(obj interface{}) error { - b := binding.Default(c.Request.Method, c.ContentType()) - return c.BindWith(obj, b) -} - -// BindJSON is a shortcut for c.BindWith(obj, binding.JSON) -func (c *Context) BindJSON(obj interface{}) error { - return c.BindWith(obj, binding.JSON) -} - -// BindWith binds the passed struct pointer using the specified binding engine. -// See the binding package. -func (c *Context) BindWith(obj interface{}, b binding.Binding) error { - if err := b.Bind(c.Request, obj); err != nil { - c.AbortWithError(400, err).SetType(ErrorTypeBind) - return err - } - return nil -} - -// ClientIP implements a best effort algorithm to return the real client IP, it parses -// X-Real-IP and X-Forwarded-For in order to work properly with reverse-proxies such us: nginx or haproxy. -// Use X-Forwarded-For before X-Real-Ip as nginx uses X-Real-Ip with the proxy's IP. -func (c *Context) ClientIP() string { - if c.engine.ForwardedByClientIP { - clientIP := c.requestHeader("X-Forwarded-For") - if index := strings.IndexByte(clientIP, ','); index >= 0 { - clientIP = clientIP[0:index] - } - clientIP = strings.TrimSpace(clientIP) - if len(clientIP) > 0 { - return clientIP - } - clientIP = strings.TrimSpace(c.requestHeader("X-Real-Ip")) - if len(clientIP) > 0 { - return clientIP - } - } - - if c.engine.AppEngine { - if addr := c.Request.Header.Get("X-Appengine-Remote-Addr"); addr != "" { - return addr - } - } - - if ip, _, err := net.SplitHostPort(strings.TrimSpace(c.Request.RemoteAddr)); err == nil { - return ip - } - - return "" -} - -// ContentType returns the Content-Type header of the request. -func (c *Context) ContentType() string { - return filterFlags(c.requestHeader("Content-Type")) -} - -// IsWebsocket returns true if the request headers indicate that a websocket -// handshake is being initiated by the client. -func (c *Context) IsWebsocket() bool { - if strings.Contains(strings.ToLower(c.requestHeader("Connection")), "upgrade") && - strings.ToLower(c.requestHeader("Upgrade")) == "websocket" { - return true - } - return false -} - -func (c *Context) requestHeader(key string) string { - if values, _ := c.Request.Header[key]; len(values) > 0 { - return values[0] - } - return "" -} - -/************************************/ -/******** RESPONSE RENDERING ********/ -/************************************/ - -// bodyAllowedForStatus is a copy of http.bodyAllowedForStatus non-exported function -func bodyAllowedForStatus(status int) bool { - switch { - case status >= 100 && status <= 199: - return false - case status == 204: - return false - case status == 304: - return false - } - return true -} - -func (c *Context) Status(code int) { - c.writermem.WriteHeader(code) -} - -// Header is a intelligent shortcut for c.Writer.Header().Set(key, value) -// It writes a header in the response. -// If value == "", this method removes the header `c.Writer.Header().Del(key)` -func (c *Context) Header(key, value string) { - if len(value) == 0 { - c.Writer.Header().Del(key) - } else { - c.Writer.Header().Set(key, value) - } -} - -func (c *Context) SetCookie( - name string, - value string, - maxAge int, - path string, - domain string, - secure bool, - httpOnly bool, -) { - if path == "" { - path = "/" - } - http.SetCookie(c.Writer, &http.Cookie{ - Name: name, - Value: url.QueryEscape(value), - MaxAge: maxAge, - Path: path, - Domain: domain, - Secure: secure, - HttpOnly: httpOnly, - }) -} - -func (c *Context) Cookie(name string) (string, error) { - cookie, err := c.Request.Cookie(name) - if err != nil { - return "", err - } - val, _ := url.QueryUnescape(cookie.Value) - return val, nil -} - -func (c *Context) Render(code int, r render.Render) { - c.Status(code) - - if !bodyAllowedForStatus(code) { - r.WriteContentType(c.Writer) - c.Writer.WriteHeaderNow() - return - } - - if err := r.Render(c.Writer); err != nil { - panic(err) - } -} - -// HTML renders the HTTP template specified by its file name. -// It also updates the HTTP code and sets the Content-Type as "text/html". -// See http://golang.org/doc/articles/wiki/ -func (c *Context) HTML(code int, name string, obj interface{}) { - instance := c.engine.HTMLRender.Instance(name, obj) - c.Render(code, instance) -} - -// IndentedJSON serializes the given struct as pretty JSON (indented + endlines) into the response body. -// It also sets the Content-Type as "application/json". -// WARNING: we recommend to use this only for development propuses since printing pretty JSON is -// more CPU and bandwidth consuming. Use Context.JSON() instead. -func (c *Context) IndentedJSON(code int, obj interface{}) { - c.Render(code, render.IndentedJSON{Data: obj}) -} - -// JSON serializes the given struct as JSON into the response body. -// It also sets the Content-Type as "application/json". -func (c *Context) JSON(code int, obj interface{}) { - c.Render(code, render.JSON{Data: obj}) -} - -// XML serializes the given struct as XML into the response body. -// It also sets the Content-Type as "application/xml". -func (c *Context) XML(code int, obj interface{}) { - c.Render(code, render.XML{Data: obj}) -} - -// YAML serializes the given struct as YAML into the response body. -func (c *Context) YAML(code int, obj interface{}) { - c.Render(code, render.YAML{Data: obj}) -} - -// String writes the given string into the response body. -func (c *Context) String(code int, format string, values ...interface{}) { - c.Render(code, render.String{Format: format, Data: values}) -} - -// Redirect returns a HTTP redirect to the specific location. -func (c *Context) Redirect(code int, location string) { - c.Render(-1, render.Redirect{ - Code: code, - Location: location, - Request: c.Request, - }) -} - -// Data writes some data into the body stream and updates the HTTP code. -func (c *Context) Data(code int, contentType string, data []byte) { - c.Render(code, render.Data{ - ContentType: contentType, - Data: data, - }) -} - -// File writes the specified file into the body stream in a efficient way. -func (c *Context) File(filepath string) { - http.ServeFile(c.Writer, c.Request, filepath) -} - -// SSEvent writes a Server-Sent Event into the body stream. -func (c *Context) SSEvent(name string, message interface{}) { - c.Render(-1, sse.Event{ - Event: name, - Data: message, - }) -} - -func (c *Context) Stream(step func(w io.Writer) bool) { - w := c.Writer - clientGone := w.CloseNotify() - for { - select { - case <-clientGone: - return - default: - keepOpen := step(w) - w.Flush() - if !keepOpen { - return - } - } - } -} - -/************************************/ -/******** CONTENT NEGOTIATION *******/ -/************************************/ - -type Negotiate struct { - Offered []string - HTMLName string - HTMLData interface{} - JSONData interface{} - XMLData interface{} - Data interface{} -} - -func (c *Context) Negotiate(code int, config Negotiate) { - switch c.NegotiateFormat(config.Offered...) { - case binding.MIMEJSON: - data := chooseData(config.JSONData, config.Data) - c.JSON(code, data) - - case binding.MIMEHTML: - data := chooseData(config.HTMLData, config.Data) - c.HTML(code, config.HTMLName, data) - - case binding.MIMEXML: - data := chooseData(config.XMLData, config.Data) - c.XML(code, data) - - default: - c.AbortWithError(http.StatusNotAcceptable, errors.New("the accepted formats are not offered by the server")) - } -} - -func (c *Context) NegotiateFormat(offered ...string) string { - assert1(len(offered) > 0, "you must provide at least one offer") - - if c.Accepted == nil { - c.Accepted = parseAccept(c.requestHeader("Accept")) - } - if len(c.Accepted) == 0 { - return offered[0] - } - for _, accepted := range c.Accepted { - for _, offert := range offered { - if accepted == offert { - return offert - } - } - } - return "" -} - -func (c *Context) SetAccepted(formats ...string) { - c.Accepted = formats -} - -/************************************/ -/***** GOLANG.ORG/X/NET/CONTEXT *****/ -/************************************/ - -func (c *Context) Deadline() (deadline time.Time, ok bool) { - return -} - -func (c *Context) Done() <-chan struct{} { - return nil -} - -func (c *Context) Err() error { - return nil -} - -func (c *Context) Value(key interface{}) interface{} { - if key == 0 { - return c.Request - } - if keyAsString, ok := key.(string); ok { - val, _ := c.Get(keyAsString) - return val - } - return nil -} diff --git a/vendor/github.com/gin-gonic/gin/debug.go b/vendor/github.com/gin-gonic/gin/debug.go deleted file mode 100644 index a121591..0000000 --- a/vendor/github.com/gin-gonic/gin/debug.go +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "bytes" - "html/template" - "log" -) - -func init() { - log.SetFlags(0) -} - -// IsDebugging returns true if the framework is running in debug mode. -// Use SetMode(gin.Release) to switch to disable the debug mode. -func IsDebugging() bool { - return ginMode == debugCode -} - -func debugPrintRoute(httpMethod, absolutePath string, handlers HandlersChain) { - if IsDebugging() { - nuHandlers := len(handlers) - handlerName := nameOfFunction(handlers.Last()) - debugPrint("%-6s %-25s --> %s (%d handlers)\n", httpMethod, absolutePath, handlerName, nuHandlers) - } -} - -func debugPrintLoadTemplate(tmpl *template.Template) { - if IsDebugging() { - var buf bytes.Buffer - for _, tmpl := range tmpl.Templates() { - buf.WriteString("\t- ") - buf.WriteString(tmpl.Name()) - buf.WriteString("\n") - } - debugPrint("Loaded HTML Templates (%d): \n%s\n", len(tmpl.Templates()), buf.String()) - } -} - -func debugPrint(format string, values ...interface{}) { - if IsDebugging() { - log.Printf("[GIN-debug] "+format, values...) - } -} - -func debugPrintWARNINGNew() { - debugPrint(`[WARNING] Running in "debug" mode. Switch to "release" mode in production. - - using env: export GIN_MODE=release - - using code: gin.SetMode(gin.ReleaseMode) - -`) -} - -func debugPrintWARNINGSetHTMLTemplate() { - debugPrint(`[WARNING] Since SetHTMLTemplate() is NOT thread-safe. It should only be called -at initialization. ie. before any route is registered or the router is listening in a socket: - - router := gin.Default() - router.SetHTMLTemplate(template) // << good place - -`) -} - -func debugPrintError(err error) { - if err != nil { - debugPrint("[ERROR] %v\n", err) - } -} diff --git a/vendor/github.com/gin-gonic/gin/deprecated.go b/vendor/github.com/gin-gonic/gin/deprecated.go deleted file mode 100644 index 0488a9b..0000000 --- a/vendor/github.com/gin-gonic/gin/deprecated.go +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import "log" - -func (c *Context) GetCookie(name string) (string, error) { - log.Println("GetCookie() method is deprecated. Use Cookie() instead.") - return c.Cookie(name) -} diff --git a/vendor/github.com/gin-gonic/gin/errors.go b/vendor/github.com/gin-gonic/gin/errors.go deleted file mode 100644 index 694b428..0000000 --- a/vendor/github.com/gin-gonic/gin/errors.go +++ /dev/null @@ -1,159 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "bytes" - "encoding/json" - "fmt" - "reflect" -) - -type ErrorType uint64 - -const ( - ErrorTypeBind ErrorType = 1 << 63 // used when c.Bind() fails - ErrorTypeRender ErrorType = 1 << 62 // used when c.Render() fails - ErrorTypePrivate ErrorType = 1 << 0 - ErrorTypePublic ErrorType = 1 << 1 - - ErrorTypeAny ErrorType = 1<<64 - 1 - ErrorTypeNu = 2 -) - -type ( - Error struct { - Err error - Type ErrorType - Meta interface{} - } - - errorMsgs []*Error -) - -var _ error = &Error{} - -func (msg *Error) SetType(flags ErrorType) *Error { - msg.Type = flags - return msg -} - -func (msg *Error) SetMeta(data interface{}) *Error { - msg.Meta = data - return msg -} - -func (msg *Error) JSON() interface{} { - json := H{} - if msg.Meta != nil { - value := reflect.ValueOf(msg.Meta) - switch value.Kind() { - case reflect.Struct: - return msg.Meta - case reflect.Map: - for _, key := range value.MapKeys() { - json[key.String()] = value.MapIndex(key).Interface() - } - default: - json["meta"] = msg.Meta - } - } - if _, ok := json["error"]; !ok { - json["error"] = msg.Error() - } - return json -} - -// MarshalJSON implements the json.Marshaller interface -func (msg *Error) MarshalJSON() ([]byte, error) { - return json.Marshal(msg.JSON()) -} - -// Implements the error interface -func (msg Error) Error() string { - return msg.Err.Error() -} - -func (msg *Error) IsType(flags ErrorType) bool { - return (msg.Type & flags) > 0 -} - -// Returns a readonly copy filterd the byte. -// ie ByType(gin.ErrorTypePublic) returns a slice of errors with type=ErrorTypePublic -func (a errorMsgs) ByType(typ ErrorType) errorMsgs { - if len(a) == 0 { - return nil - } - if typ == ErrorTypeAny { - return a - } - var result errorMsgs - for _, msg := range a { - if msg.IsType(typ) { - result = append(result, msg) - } - } - return result -} - -// Returns the last error in the slice. It returns nil if the array is empty. -// Shortcut for errors[len(errors)-1] -func (a errorMsgs) Last() *Error { - length := len(a) - if length > 0 { - return a[length-1] - } - return nil -} - -// Returns an array will all the error messages. -// Example: -// c.Error(errors.New("first")) -// c.Error(errors.New("second")) -// c.Error(errors.New("third")) -// c.Errors.Errors() // == []string{"first", "second", "third"} -func (a errorMsgs) Errors() []string { - if len(a) == 0 { - return nil - } - errorStrings := make([]string, len(a)) - for i, err := range a { - errorStrings[i] = err.Error() - } - return errorStrings -} - -func (a errorMsgs) JSON() interface{} { - switch len(a) { - case 0: - return nil - case 1: - return a.Last().JSON() - default: - json := make([]interface{}, len(a)) - for i, err := range a { - json[i] = err.JSON() - } - return json - } -} - -func (a errorMsgs) MarshalJSON() ([]byte, error) { - return json.Marshal(a.JSON()) -} - -func (a errorMsgs) String() string { - if len(a) == 0 { - return "" - } - var buffer bytes.Buffer - for i, msg := range a { - fmt.Fprintf(&buffer, "Error #%02d: %s\n", (i + 1), msg.Err) - if msg.Meta != nil { - fmt.Fprintf(&buffer, " Meta: %v\n", msg.Meta) - } - } - return buffer.String() -} diff --git a/vendor/github.com/gin-gonic/gin/fs.go b/vendor/github.com/gin-gonic/gin/fs.go deleted file mode 100644 index 6af3ded..0000000 --- a/vendor/github.com/gin-gonic/gin/fs.go +++ /dev/null @@ -1,42 +0,0 @@ -package gin - -import ( - "net/http" - "os" -) - -type ( - onlyfilesFS struct { - fs http.FileSystem - } - neuteredReaddirFile struct { - http.File - } -) - -// Dir returns a http.Filesystem that can be used by http.FileServer(). It is used interally -// in router.Static(). -// if listDirectory == true, then it works the same as http.Dir() otherwise it returns -// a filesystem that prevents http.FileServer() to list the directory files. -func Dir(root string, listDirectory bool) http.FileSystem { - fs := http.Dir(root) - if listDirectory { - return fs - } - return &onlyfilesFS{fs} -} - -// Conforms to http.Filesystem -func (fs onlyfilesFS) Open(name string) (http.File, error) { - f, err := fs.fs.Open(name) - if err != nil { - return nil, err - } - return neuteredReaddirFile{f}, nil -} - -// Overrides the http.File default implementation -func (f neuteredReaddirFile) Readdir(count int) ([]os.FileInfo, error) { - // this disables directory listing - return nil, nil -} diff --git a/vendor/github.com/gin-gonic/gin/gin.go b/vendor/github.com/gin-gonic/gin/gin.go deleted file mode 100644 index d084f2a..0000000 --- a/vendor/github.com/gin-gonic/gin/gin.go +++ /dev/null @@ -1,376 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "html/template" - "net" - "net/http" - "os" - "sync" - - "github.com/gin-gonic/gin/render" -) - -// Version is Framework's version -const Version = "v1.1.4" - -var default404Body = []byte("404 page not found") -var default405Body = []byte("405 method not allowed") -var defaultAppEngine bool - -type HandlerFunc func(*Context) -type HandlersChain []HandlerFunc - -// Last returns the last handler in the chain. ie. the last handler is the main own. -func (c HandlersChain) Last() HandlerFunc { - length := len(c) - if length > 0 { - return c[length-1] - } - return nil -} - -type ( - RoutesInfo []RouteInfo - RouteInfo struct { - Method string - Path string - Handler string - } - - // Engine is the framework's instance, it contains the muxer, middleware and configuration settings. - // Create an instance of Engine, by using New() or Default() - Engine struct { - RouterGroup - HTMLRender render.HTMLRender - allNoRoute HandlersChain - allNoMethod HandlersChain - noRoute HandlersChain - noMethod HandlersChain - pool sync.Pool - trees methodTrees - - // Enables automatic redirection if the current route can't be matched but a - // handler for the path with (without) the trailing slash exists. - // For example if /foo/ is requested but a route only exists for /foo, the - // client is redirected to /foo with http status code 301 for GET requests - // and 307 for all other request methods. - RedirectTrailingSlash bool - - // If enabled, the router tries to fix the current request path, if no - // handle is registered for it. - // First superfluous path elements like ../ or // are removed. - // Afterwards the router does a case-insensitive lookup of the cleaned path. - // If a handle can be found for this route, the router makes a redirection - // to the corrected path with status code 301 for GET requests and 307 for - // all other request methods. - // For example /FOO and /..//Foo could be redirected to /foo. - // RedirectTrailingSlash is independent of this option. - RedirectFixedPath bool - - // If enabled, the router checks if another method is allowed for the - // current route, if the current request can not be routed. - // If this is the case, the request is answered with 'Method Not Allowed' - // and HTTP status code 405. - // If no other Method is allowed, the request is delegated to the NotFound - // handler. - HandleMethodNotAllowed bool - ForwardedByClientIP bool - - // #726 #755 If enabled, it will thrust some headers starting with - // 'X-AppEngine...' for better integration with that PaaS. - AppEngine bool - } -) - -var _ IRouter = &Engine{} - -// New returns a new blank Engine instance without any middleware attached. -// By default the configuration is: -// - RedirectTrailingSlash: true -// - RedirectFixedPath: false -// - HandleMethodNotAllowed: false -// - ForwardedByClientIP: true -func New() *Engine { - debugPrintWARNINGNew() - engine := &Engine{ - RouterGroup: RouterGroup{ - Handlers: nil, - basePath: "/", - root: true, - }, - RedirectTrailingSlash: true, - RedirectFixedPath: false, - HandleMethodNotAllowed: false, - ForwardedByClientIP: true, - AppEngine: defaultAppEngine, - trees: make(methodTrees, 0, 9), - } - engine.RouterGroup.engine = engine - engine.pool.New = func() interface{} { - return engine.allocateContext() - } - return engine -} - -// Default returns an Engine instance with the Logger and Recovery middleware already attached. -func Default() *Engine { - engine := New() - engine.Use(Logger(), Recovery()) - return engine -} - -func (engine *Engine) allocateContext() *Context { - return &Context{engine: engine} -} - -func (engine *Engine) LoadHTMLGlob(pattern string) { - if IsDebugging() { - debugPrintLoadTemplate(template.Must(template.ParseGlob(pattern))) - engine.HTMLRender = render.HTMLDebug{Glob: pattern} - } else { - templ := template.Must(template.ParseGlob(pattern)) - engine.SetHTMLTemplate(templ) - } -} - -func (engine *Engine) LoadHTMLFiles(files ...string) { - if IsDebugging() { - engine.HTMLRender = render.HTMLDebug{Files: files} - } else { - templ := template.Must(template.ParseFiles(files...)) - engine.SetHTMLTemplate(templ) - } -} - -func (engine *Engine) SetHTMLTemplate(templ *template.Template) { - if len(engine.trees) > 0 { - debugPrintWARNINGSetHTMLTemplate() - } - engine.HTMLRender = render.HTMLProduction{Template: templ} -} - -// NoRoute adds handlers for NoRoute. It return a 404 code by default. -func (engine *Engine) NoRoute(handlers ...HandlerFunc) { - engine.noRoute = handlers - engine.rebuild404Handlers() -} - -// NoMethod sets the handlers called when... TODO -func (engine *Engine) NoMethod(handlers ...HandlerFunc) { - engine.noMethod = handlers - engine.rebuild405Handlers() -} - -// Use attachs a global middleware to the router. ie. the middleware attached though Use() will be -// included in the handlers chain for every single request. Even 404, 405, static files... -// For example, this is the right place for a logger or error management middleware. -func (engine *Engine) Use(middleware ...HandlerFunc) IRoutes { - engine.RouterGroup.Use(middleware...) - engine.rebuild404Handlers() - engine.rebuild405Handlers() - return engine -} - -func (engine *Engine) rebuild404Handlers() { - engine.allNoRoute = engine.combineHandlers(engine.noRoute) -} - -func (engine *Engine) rebuild405Handlers() { - engine.allNoMethod = engine.combineHandlers(engine.noMethod) -} - -func (engine *Engine) addRoute(method, path string, handlers HandlersChain) { - assert1(path[0] == '/', "path must begin with '/'") - assert1(len(method) > 0, "HTTP method can not be empty") - assert1(len(handlers) > 0, "there must be at least one handler") - - debugPrintRoute(method, path, handlers) - root := engine.trees.get(method) - if root == nil { - root = new(node) - engine.trees = append(engine.trees, methodTree{method: method, root: root}) - } - root.addRoute(path, handlers) -} - -// Routes returns a slice of registered routes, including some useful information, such as: -// the http method, path and the handler name. -func (engine *Engine) Routes() (routes RoutesInfo) { - for _, tree := range engine.trees { - routes = iterate("", tree.method, routes, tree.root) - } - return routes -} - -func iterate(path, method string, routes RoutesInfo, root *node) RoutesInfo { - path += root.path - if len(root.handlers) > 0 { - routes = append(routes, RouteInfo{ - Method: method, - Path: path, - Handler: nameOfFunction(root.handlers.Last()), - }) - } - for _, child := range root.children { - routes = iterate(path, method, routes, child) - } - return routes -} - -// Run attaches the router to a http.Server and starts listening and serving HTTP requests. -// It is a shortcut for http.ListenAndServe(addr, router) -// Note: this method will block the calling goroutine indefinitely unless an error happens. -func (engine *Engine) Run(addr ...string) (err error) { - defer func() { debugPrintError(err) }() - - address := resolveAddress(addr) - debugPrint("Listening and serving HTTP on %s\n", address) - err = http.ListenAndServe(address, engine) - return -} - -// RunTLS attaches the router to a http.Server and starts listening and serving HTTPS (secure) requests. -// It is a shortcut for http.ListenAndServeTLS(addr, certFile, keyFile, router) -// Note: this method will block the calling goroutine indefinitely unless an error happens. -func (engine *Engine) RunTLS(addr string, certFile string, keyFile string) (err error) { - debugPrint("Listening and serving HTTPS on %s\n", addr) - defer func() { debugPrintError(err) }() - - err = http.ListenAndServeTLS(addr, certFile, keyFile, engine) - return -} - -// RunUnix attaches the router to a http.Server and starts listening and serving HTTP requests -// through the specified unix socket (ie. a file). -// Note: this method will block the calling goroutine indefinitely unless an error happens. -func (engine *Engine) RunUnix(file string) (err error) { - debugPrint("Listening and serving HTTP on unix:/%s", file) - defer func() { debugPrintError(err) }() - - os.Remove(file) - listener, err := net.Listen("unix", file) - if err != nil { - return - } - defer listener.Close() - err = http.Serve(listener, engine) - return -} - -// Conforms to the http.Handler interface. -func (engine *Engine) ServeHTTP(w http.ResponseWriter, req *http.Request) { - c := engine.pool.Get().(*Context) - c.writermem.reset(w) - c.Request = req - c.reset() - - engine.handleHTTPRequest(c) - - engine.pool.Put(c) -} - -func (engine *Engine) handleHTTPRequest(context *Context) { - httpMethod := context.Request.Method - path := context.Request.URL.Path - - // Find root of the tree for the given HTTP method - t := engine.trees - for i, tl := 0, len(t); i < tl; i++ { - if t[i].method == httpMethod { - root := t[i].root - // Find route in tree - handlers, params, tsr := root.getValue(path, context.Params) - if handlers != nil { - context.handlers = handlers - context.Params = params - context.Next() - context.writermem.WriteHeaderNow() - return - - } else if httpMethod != "CONNECT" && path != "/" { - if tsr && engine.RedirectTrailingSlash { - redirectTrailingSlash(context) - return - } - if engine.RedirectFixedPath && redirectFixedPath(context, root, engine.RedirectFixedPath) { - return - } - } - break - } - } - - // TODO: unit test - if engine.HandleMethodNotAllowed { - for _, tree := range engine.trees { - if tree.method != httpMethod { - if handlers, _, _ := tree.root.getValue(path, nil); handlers != nil { - context.handlers = engine.allNoMethod - serveError(context, 405, default405Body) - return - } - } - } - } - context.handlers = engine.allNoRoute - serveError(context, 404, default404Body) -} - -var mimePlain = []string{MIMEPlain} - -func serveError(c *Context, code int, defaultMessage []byte) { - c.writermem.status = code - c.Next() - if !c.writermem.Written() { - if c.writermem.Status() == code { - c.writermem.Header()["Content-Type"] = mimePlain - c.Writer.Write(defaultMessage) - } else { - c.writermem.WriteHeaderNow() - } - } -} - -func redirectTrailingSlash(c *Context) { - req := c.Request - path := req.URL.Path - code := 301 // Permanent redirect, request with GET method - if req.Method != "GET" { - code = 307 - } - - if len(path) > 1 && path[len(path)-1] == '/' { - req.URL.Path = path[:len(path)-1] - } else { - req.URL.Path = path + "/" - } - debugPrint("redirecting request %d: %s --> %s", code, path, req.URL.String()) - http.Redirect(c.Writer, req, req.URL.String(), code) - c.writermem.WriteHeaderNow() -} - -func redirectFixedPath(c *Context, root *node, trailingSlash bool) bool { - req := c.Request - path := req.URL.Path - - fixedPath, found := root.findCaseInsensitivePath( - cleanPath(path), - trailingSlash, - ) - if found { - code := 301 // Permanent redirect, request with GET method - if req.Method != "GET" { - code = 307 - } - req.URL.Path = string(fixedPath) - debugPrint("redirecting request %d: %s --> %s", code, path, req.URL.String()) - http.Redirect(c.Writer, req, req.URL.String(), code) - c.writermem.WriteHeaderNow() - return true - } - return false -} diff --git a/vendor/github.com/gin-gonic/gin/logger.go b/vendor/github.com/gin-gonic/gin/logger.go deleted file mode 100644 index c7cbfe1..0000000 --- a/vendor/github.com/gin-gonic/gin/logger.go +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "fmt" - "io" - "os" - "time" - - "github.com/mattn/go-isatty" -) - -var ( - green = string([]byte{27, 91, 57, 55, 59, 52, 50, 109}) - white = string([]byte{27, 91, 57, 48, 59, 52, 55, 109}) - yellow = string([]byte{27, 91, 57, 55, 59, 52, 51, 109}) - red = string([]byte{27, 91, 57, 55, 59, 52, 49, 109}) - blue = string([]byte{27, 91, 57, 55, 59, 52, 52, 109}) - magenta = string([]byte{27, 91, 57, 55, 59, 52, 53, 109}) - cyan = string([]byte{27, 91, 57, 55, 59, 52, 54, 109}) - reset = string([]byte{27, 91, 48, 109}) - disableColor = false -) - -func DisableConsoleColor() { - disableColor = true -} - -func ErrorLogger() HandlerFunc { - return ErrorLoggerT(ErrorTypeAny) -} - -func ErrorLoggerT(typ ErrorType) HandlerFunc { - return func(c *Context) { - c.Next() - errors := c.Errors.ByType(typ) - if len(errors) > 0 { - c.JSON(-1, errors) - } - } -} - -// Logger instances a Logger middleware that will write the logs to gin.DefaultWriter -// By default gin.DefaultWriter = os.Stdout -func Logger() HandlerFunc { - return LoggerWithWriter(DefaultWriter) -} - -// LoggerWithWriter instance a Logger middleware with the specified writter buffer. -// Example: os.Stdout, a file opened in write mode, a socket... -func LoggerWithWriter(out io.Writer, notlogged ...string) HandlerFunc { - isTerm := true - - if w, ok := out.(*os.File); !ok || !isatty.IsTerminal(w.Fd()) || disableColor { - isTerm = false - } - - var skip map[string]struct{} - - if length := len(notlogged); length > 0 { - skip = make(map[string]struct{}, length) - - for _, path := range notlogged { - skip[path] = struct{}{} - } - } - - return func(c *Context) { - // Start timer - start := time.Now() - path := c.Request.URL.Path - - // Process request - c.Next() - - // Log only when path is not being skipped - if _, ok := skip[path]; !ok { - // Stop timer - end := time.Now() - latency := end.Sub(start) - - clientIP := c.ClientIP() - method := c.Request.Method - statusCode := c.Writer.Status() - var statusColor, methodColor string - if isTerm { - statusColor = colorForStatus(statusCode) - methodColor = colorForMethod(method) - } - comment := c.Errors.ByType(ErrorTypePrivate).String() - - fmt.Fprintf(out, "[GIN] %v |%s %3d %s| %13v | %15s |%s %s %-7s %s\n%s", - end.Format("2006/01/02 - 15:04:05"), - statusColor, statusCode, reset, - latency, - clientIP, - methodColor, method, reset, - path, - comment, - ) - } - } -} - -func colorForStatus(code int) string { - switch { - case code >= 200 && code < 300: - return green - case code >= 300 && code < 400: - return white - case code >= 400 && code < 500: - return yellow - default: - return red - } -} - -func colorForMethod(method string) string { - switch method { - case "GET": - return blue - case "POST": - return cyan - case "PUT": - return yellow - case "DELETE": - return red - case "PATCH": - return green - case "HEAD": - return magenta - case "OPTIONS": - return white - default: - return reset - } -} diff --git a/vendor/github.com/gin-gonic/gin/logo.jpg b/vendor/github.com/gin-gonic/gin/logo.jpg deleted file mode 100644 index bb51852..0000000 Binary files a/vendor/github.com/gin-gonic/gin/logo.jpg and /dev/null differ diff --git a/vendor/github.com/gin-gonic/gin/mode.go b/vendor/github.com/gin-gonic/gin/mode.go deleted file mode 100644 index c600b7b..0000000 --- a/vendor/github.com/gin-gonic/gin/mode.go +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "io" - "os" - - "github.com/gin-gonic/gin/binding" -) - -const ENV_GIN_MODE = "GIN_MODE" - -const ( - DebugMode string = "debug" - ReleaseMode string = "release" - TestMode string = "test" -) -const ( - debugCode = iota - releaseCode - testCode -) - -// DefaultWriter is the default io.Writer used the Gin for debug output and -// middleware output like Logger() or Recovery(). -// Note that both Logger and Recovery provides custom ways to configure their -// output io.Writer. -// To support coloring in Windows use: -// import "github.com/mattn/go-colorable" -// gin.DefaultWriter = colorable.NewColorableStdout() -var DefaultWriter io.Writer = os.Stdout -var DefaultErrorWriter io.Writer = os.Stderr - -var ginMode = debugCode -var modeName = DebugMode - -func init() { - mode := os.Getenv(ENV_GIN_MODE) - if len(mode) == 0 { - SetMode(DebugMode) - } else { - SetMode(mode) - } -} - -func SetMode(value string) { - switch value { - case DebugMode: - ginMode = debugCode - case ReleaseMode: - ginMode = releaseCode - case TestMode: - ginMode = testCode - default: - panic("gin mode unknown: " + value) - } - modeName = value -} - -func DisableBindValidation() { - binding.Validator = nil -} - -func Mode() string { - return modeName -} diff --git a/vendor/github.com/gin-gonic/gin/path.go b/vendor/github.com/gin-gonic/gin/path.go deleted file mode 100644 index 43cdd04..0000000 --- a/vendor/github.com/gin-gonic/gin/path.go +++ /dev/null @@ -1,123 +0,0 @@ -// Copyright 2013 Julien Schmidt. All rights reserved. -// Based on the path package, Copyright 2009 The Go Authors. -// Use of this source code is governed by a BSD-style license that can be found -// in the LICENSE file. - -package gin - -// CleanPath is the URL version of path.Clean, it returns a canonical URL path -// for p, eliminating . and .. elements. -// -// The following rules are applied iteratively until no further processing can -// be done: -// 1. Replace multiple slashes with a single slash. -// 2. Eliminate each . path name element (the current directory). -// 3. Eliminate each inner .. path name element (the parent directory) -// along with the non-.. element that precedes it. -// 4. Eliminate .. elements that begin a rooted path: -// that is, replace "/.." by "/" at the beginning of a path. -// -// If the result of this process is an empty string, "/" is returned -func cleanPath(p string) string { - // Turn empty string into "/" - if p == "" { - return "/" - } - - n := len(p) - var buf []byte - - // Invariants: - // reading from path; r is index of next byte to process. - // writing to buf; w is index of next byte to write. - - // path must start with '/' - r := 1 - w := 1 - - if p[0] != '/' { - r = 0 - buf = make([]byte, n+1) - buf[0] = '/' - } - - trailing := n > 2 && p[n-1] == '/' - - // A bit more clunky without a 'lazybuf' like the path package, but the loop - // gets completely inlined (bufApp). So in contrast to the path package this - // loop has no expensive function calls (except 1x make) - - for r < n { - switch { - case p[r] == '/': - // empty path element, trailing slash is added after the end - r++ - - case p[r] == '.' && r+1 == n: - trailing = true - r++ - - case p[r] == '.' && p[r+1] == '/': - // . element - r++ - - case p[r] == '.' && p[r+1] == '.' && (r+2 == n || p[r+2] == '/'): - // .. element: remove to last / - r += 2 - - if w > 1 { - // can backtrack - w-- - - if buf == nil { - for w > 1 && p[w] != '/' { - w-- - } - } else { - for w > 1 && buf[w] != '/' { - w-- - } - } - } - - default: - // real path element. - // add slash if needed - if w > 1 { - bufApp(&buf, p, w, '/') - w++ - } - - // copy element - for r < n && p[r] != '/' { - bufApp(&buf, p, w, p[r]) - w++ - r++ - } - } - } - - // re-append trailing slash - if trailing && w > 1 { - bufApp(&buf, p, w, '/') - w++ - } - - if buf == nil { - return p[:w] - } - return string(buf[:w]) -} - -// internal helper to lazily create a buffer if necessary -func bufApp(buf *[]byte, s string, w int, c byte) { - if *buf == nil { - if s[w] == c { - return - } - - *buf = make([]byte, len(s)) - copy(*buf, s[:w]) - } - (*buf)[w] = c -} diff --git a/vendor/github.com/gin-gonic/gin/recovery.go b/vendor/github.com/gin-gonic/gin/recovery.go deleted file mode 100644 index c502f35..0000000 --- a/vendor/github.com/gin-gonic/gin/recovery.go +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "bytes" - "fmt" - "io" - "io/ioutil" - "log" - "net/http/httputil" - "runtime" -) - -var ( - dunno = []byte("???") - centerDot = []byte("·") - dot = []byte(".") - slash = []byte("/") -) - -// Recovery returns a middleware that recovers from any panics and writes a 500 if there was one. -func Recovery() HandlerFunc { - return RecoveryWithWriter(DefaultErrorWriter) -} - -func RecoveryWithWriter(out io.Writer) HandlerFunc { - var logger *log.Logger - if out != nil { - logger = log.New(out, "\n\n\x1b[31m", log.LstdFlags) - } - return func(c *Context) { - defer func() { - if err := recover(); err != nil { - if logger != nil { - stack := stack(3) - httprequest, _ := httputil.DumpRequest(c.Request, false) - logger.Printf("[Recovery] panic recovered:\n%s\n%s\n%s%s", string(httprequest), err, stack, reset) - } - c.AbortWithStatus(500) - } - }() - c.Next() - } -} - -// stack returns a nicely formated stack frame, skipping skip frames -func stack(skip int) []byte { - buf := new(bytes.Buffer) // the returned data - // As we loop, we open files and read them. These variables record the currently - // loaded file. - var lines [][]byte - var lastFile string - for i := skip; ; i++ { // Skip the expected number of frames - pc, file, line, ok := runtime.Caller(i) - if !ok { - break - } - // Print this much at least. If we can't find the source, it won't show. - fmt.Fprintf(buf, "%s:%d (0x%x)\n", file, line, pc) - if file != lastFile { - data, err := ioutil.ReadFile(file) - if err != nil { - continue - } - lines = bytes.Split(data, []byte{'\n'}) - lastFile = file - } - fmt.Fprintf(buf, "\t%s: %s\n", function(pc), source(lines, line)) - } - return buf.Bytes() -} - -// source returns a space-trimmed slice of the n'th line. -func source(lines [][]byte, n int) []byte { - n-- // in stack trace, lines are 1-indexed but our array is 0-indexed - if n < 0 || n >= len(lines) { - return dunno - } - return bytes.TrimSpace(lines[n]) -} - -// function returns, if possible, the name of the function containing the PC. -func function(pc uintptr) []byte { - fn := runtime.FuncForPC(pc) - if fn == nil { - return dunno - } - name := []byte(fn.Name()) - // The name includes the path name to the package, which is unnecessary - // since the file name is already included. Plus, it has center dots. - // That is, we see - // runtime/debug.*T·ptrmethod - // and want - // *T.ptrmethod - // Also the package path might contains dot (e.g. code.google.com/...), - // so first eliminate the path prefix - if lastslash := bytes.LastIndex(name, slash); lastslash >= 0 { - name = name[lastslash+1:] - } - if period := bytes.Index(name, dot); period >= 0 { - name = name[period+1:] - } - name = bytes.Replace(name, centerDot, dot, -1) - return name -} diff --git a/vendor/github.com/gin-gonic/gin/render/data.go b/vendor/github.com/gin-gonic/gin/render/data.go deleted file mode 100644 index c296042..0000000 --- a/vendor/github.com/gin-gonic/gin/render/data.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package render - -import "net/http" - -type Data struct { - ContentType string - Data []byte -} - -// Render (Data) writes data with custom ContentType -func (r Data) Render(w http.ResponseWriter) (err error) { - r.WriteContentType(w) - _, err = w.Write(r.Data) - return -} - -func (r Data) WriteContentType(w http.ResponseWriter) { - writeContentType(w, []string{r.ContentType}) -} diff --git a/vendor/github.com/gin-gonic/gin/render/html.go b/vendor/github.com/gin-gonic/gin/render/html.go deleted file mode 100644 index a3cbda6..0000000 --- a/vendor/github.com/gin-gonic/gin/render/html.go +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package render - -import ( - "html/template" - "net/http" -) - -type ( - HTMLRender interface { - Instance(string, interface{}) Render - } - - HTMLProduction struct { - Template *template.Template - } - - HTMLDebug struct { - Files []string - Glob string - } - - HTML struct { - Template *template.Template - Name string - Data interface{} - } -) - -var htmlContentType = []string{"text/html; charset=utf-8"} - -func (r HTMLProduction) Instance(name string, data interface{}) Render { - return HTML{ - Template: r.Template, - Name: name, - Data: data, - } -} - -func (r HTMLDebug) Instance(name string, data interface{}) Render { - return HTML{ - Template: r.loadTemplate(), - Name: name, - Data: data, - } -} -func (r HTMLDebug) loadTemplate() *template.Template { - if len(r.Files) > 0 { - return template.Must(template.ParseFiles(r.Files...)) - } - if len(r.Glob) > 0 { - return template.Must(template.ParseGlob(r.Glob)) - } - panic("the HTML debug render was created without files or glob pattern") -} - -func (r HTML) Render(w http.ResponseWriter) error { - r.WriteContentType(w) - - if len(r.Name) == 0 { - return r.Template.Execute(w, r.Data) - } - return r.Template.ExecuteTemplate(w, r.Name, r.Data) -} - -func (r HTML) WriteContentType(w http.ResponseWriter) { - writeContentType(w, htmlContentType) -} diff --git a/vendor/github.com/gin-gonic/gin/render/json.go b/vendor/github.com/gin-gonic/gin/render/json.go deleted file mode 100644 index 3ee8b13..0000000 --- a/vendor/github.com/gin-gonic/gin/render/json.go +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package render - -import ( - "encoding/json" - "net/http" -) - -type ( - JSON struct { - Data interface{} - } - - IndentedJSON struct { - Data interface{} - } -) - -var jsonContentType = []string{"application/json; charset=utf-8"} - -func (r JSON) Render(w http.ResponseWriter) (err error) { - if err = WriteJSON(w, r.Data); err != nil { - panic(err) - } - return -} - -func (r JSON) WriteContentType(w http.ResponseWriter) { - writeContentType(w, jsonContentType) -} - -func WriteJSON(w http.ResponseWriter, obj interface{}) error { - writeContentType(w, jsonContentType) - jsonBytes, err := json.Marshal(obj) - if err != nil { - return err - } - w.Write(jsonBytes) - return nil -} - -func (r IndentedJSON) Render(w http.ResponseWriter) error { - r.WriteContentType(w) - jsonBytes, err := json.MarshalIndent(r.Data, "", " ") - if err != nil { - return err - } - w.Write(jsonBytes) - return nil -} - -func (r IndentedJSON) WriteContentType(w http.ResponseWriter) { - writeContentType(w, jsonContentType) -} diff --git a/vendor/github.com/gin-gonic/gin/render/redirect.go b/vendor/github.com/gin-gonic/gin/render/redirect.go deleted file mode 100644 index f874a35..0000000 --- a/vendor/github.com/gin-gonic/gin/render/redirect.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package render - -import ( - "fmt" - "net/http" -) - -type Redirect struct { - Code int - Request *http.Request - Location string -} - -func (r Redirect) Render(w http.ResponseWriter) error { - if (r.Code < 300 || r.Code > 308) && r.Code != 201 { - panic(fmt.Sprintf("Cannot redirect with status code %d", r.Code)) - } - http.Redirect(w, r.Request, r.Location, r.Code) - return nil -} - -func (r Redirect) WriteContentType(http.ResponseWriter) {} diff --git a/vendor/github.com/gin-gonic/gin/render/render.go b/vendor/github.com/gin-gonic/gin/render/render.go deleted file mode 100644 index 7e99737..0000000 --- a/vendor/github.com/gin-gonic/gin/render/render.go +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package render - -import "net/http" - -type Render interface { - Render(http.ResponseWriter) error - WriteContentType(w http.ResponseWriter) -} - -var ( - _ Render = JSON{} - _ Render = IndentedJSON{} - _ Render = XML{} - _ Render = String{} - _ Render = Redirect{} - _ Render = Data{} - _ Render = HTML{} - _ HTMLRender = HTMLDebug{} - _ HTMLRender = HTMLProduction{} - _ Render = YAML{} -) - -func writeContentType(w http.ResponseWriter, value []string) { - header := w.Header() - if val := header["Content-Type"]; len(val) == 0 { - header["Content-Type"] = value - } -} diff --git a/vendor/github.com/gin-gonic/gin/render/text.go b/vendor/github.com/gin-gonic/gin/render/text.go deleted file mode 100644 index 74cd26b..0000000 --- a/vendor/github.com/gin-gonic/gin/render/text.go +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package render - -import ( - "fmt" - "io" - "net/http" -) - -type String struct { - Format string - Data []interface{} -} - -var plainContentType = []string{"text/plain; charset=utf-8"} - -func (r String) Render(w http.ResponseWriter) error { - WriteString(w, r.Format, r.Data) - return nil -} - -func (r String) WriteContentType(w http.ResponseWriter) { - writeContentType(w, plainContentType) -} - -func WriteString(w http.ResponseWriter, format string, data []interface{}) { - writeContentType(w, plainContentType) - if len(data) > 0 { - fmt.Fprintf(w, format, data...) - } else { - io.WriteString(w, format) - } -} diff --git a/vendor/github.com/gin-gonic/gin/render/xml.go b/vendor/github.com/gin-gonic/gin/render/xml.go deleted file mode 100644 index cff1ac3..0000000 --- a/vendor/github.com/gin-gonic/gin/render/xml.go +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package render - -import ( - "encoding/xml" - "net/http" -) - -type XML struct { - Data interface{} -} - -var xmlContentType = []string{"application/xml; charset=utf-8"} - -func (r XML) Render(w http.ResponseWriter) error { - r.WriteContentType(w) - return xml.NewEncoder(w).Encode(r.Data) -} - -func (r XML) WriteContentType(w http.ResponseWriter) { - writeContentType(w, xmlContentType) -} diff --git a/vendor/github.com/gin-gonic/gin/render/yaml.go b/vendor/github.com/gin-gonic/gin/render/yaml.go deleted file mode 100644 index 25d0ebd..0000000 --- a/vendor/github.com/gin-gonic/gin/render/yaml.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package render - -import ( - "net/http" - - "gopkg.in/yaml.v2" -) - -type YAML struct { - Data interface{} -} - -var yamlContentType = []string{"application/x-yaml; charset=utf-8"} - -func (r YAML) Render(w http.ResponseWriter) error { - r.WriteContentType(w) - - bytes, err := yaml.Marshal(r.Data) - if err != nil { - return err - } - - w.Write(bytes) - return nil -} - -func (r YAML) WriteContentType(w http.ResponseWriter) { - writeContentType(w, yamlContentType) -} diff --git a/vendor/github.com/gin-gonic/gin/response_writer.go b/vendor/github.com/gin-gonic/gin/response_writer.go deleted file mode 100644 index fcbe230..0000000 --- a/vendor/github.com/gin-gonic/gin/response_writer.go +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "bufio" - "io" - "net" - "net/http" -) - -const ( - noWritten = -1 - defaultStatus = 200 -) - -type ( - ResponseWriter interface { - http.ResponseWriter - http.Hijacker - http.Flusher - http.CloseNotifier - - // Returns the HTTP response status code of the current request. - Status() int - - // Returns the number of bytes already written into the response http body. - // See Written() - Size() int - - // Writes the string into the response body. - WriteString(string) (int, error) - - // Returns true if the response body was already written. - Written() bool - - // Forces to write the http header (status code + headers). - WriteHeaderNow() - } - - responseWriter struct { - http.ResponseWriter - size int - status int - } -) - -var _ ResponseWriter = &responseWriter{} - -func (w *responseWriter) reset(writer http.ResponseWriter) { - w.ResponseWriter = writer - w.size = noWritten - w.status = defaultStatus -} - -func (w *responseWriter) WriteHeader(code int) { - if code > 0 && w.status != code { - if w.Written() { - debugPrint("[WARNING] Headers were already written. Wanted to override status code %d with %d", w.status, code) - } - w.status = code - } -} - -func (w *responseWriter) WriteHeaderNow() { - if !w.Written() { - w.size = 0 - w.ResponseWriter.WriteHeader(w.status) - } -} - -func (w *responseWriter) Write(data []byte) (n int, err error) { - w.WriteHeaderNow() - n, err = w.ResponseWriter.Write(data) - w.size += n - return -} - -func (w *responseWriter) WriteString(s string) (n int, err error) { - w.WriteHeaderNow() - n, err = io.WriteString(w.ResponseWriter, s) - w.size += n - return -} - -func (w *responseWriter) Status() int { - return w.status -} - -func (w *responseWriter) Size() int { - return w.size -} - -func (w *responseWriter) Written() bool { - return w.size != noWritten -} - -// Implements the http.Hijacker interface -func (w *responseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) { - if w.size < 0 { - w.size = 0 - } - return w.ResponseWriter.(http.Hijacker).Hijack() -} - -// Implements the http.CloseNotify interface -func (w *responseWriter) CloseNotify() <-chan bool { - return w.ResponseWriter.(http.CloseNotifier).CloseNotify() -} - -// Implements the http.Flush interface -func (w *responseWriter) Flush() { - w.ResponseWriter.(http.Flusher).Flush() -} diff --git a/vendor/github.com/gin-gonic/gin/routergroup.go b/vendor/github.com/gin-gonic/gin/routergroup.go deleted file mode 100644 index f22729b..0000000 --- a/vendor/github.com/gin-gonic/gin/routergroup.go +++ /dev/null @@ -1,215 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "net/http" - "path" - "regexp" - "strings" -) - -type ( - IRouter interface { - IRoutes - Group(string, ...HandlerFunc) *RouterGroup - } - - IRoutes interface { - Use(...HandlerFunc) IRoutes - - Handle(string, string, ...HandlerFunc) IRoutes - Any(string, ...HandlerFunc) IRoutes - GET(string, ...HandlerFunc) IRoutes - POST(string, ...HandlerFunc) IRoutes - DELETE(string, ...HandlerFunc) IRoutes - PATCH(string, ...HandlerFunc) IRoutes - PUT(string, ...HandlerFunc) IRoutes - OPTIONS(string, ...HandlerFunc) IRoutes - HEAD(string, ...HandlerFunc) IRoutes - - StaticFile(string, string) IRoutes - Static(string, string) IRoutes - StaticFS(string, http.FileSystem) IRoutes - } - - // RouterGroup is used internally to configure router, a RouterGroup is associated with a prefix - // and an array of handlers (middleware) - RouterGroup struct { - Handlers HandlersChain - basePath string - engine *Engine - root bool - } -) - -var _ IRouter = &RouterGroup{} - -// Use adds middleware to the group, see example code in github. -func (group *RouterGroup) Use(middleware ...HandlerFunc) IRoutes { - group.Handlers = append(group.Handlers, middleware...) - return group.returnObj() -} - -// Group creates a new router group. You should add all the routes that have common middlwares or the same path prefix. -// For example, all the routes that use a common middlware for authorization could be grouped. -func (group *RouterGroup) Group(relativePath string, handlers ...HandlerFunc) *RouterGroup { - return &RouterGroup{ - Handlers: group.combineHandlers(handlers), - basePath: group.calculateAbsolutePath(relativePath), - engine: group.engine, - } -} - -func (group *RouterGroup) BasePath() string { - return group.basePath -} - -func (group *RouterGroup) handle(httpMethod, relativePath string, handlers HandlersChain) IRoutes { - absolutePath := group.calculateAbsolutePath(relativePath) - handlers = group.combineHandlers(handlers) - group.engine.addRoute(httpMethod, absolutePath, handlers) - return group.returnObj() -} - -// Handle registers a new request handle and middleware with the given path and method. -// The last handler should be the real handler, the other ones should be middleware that can and should be shared among different routes. -// See the example code in github. -// -// For GET, POST, PUT, PATCH and DELETE requests the respective shortcut -// functions can be used. -// -// This function is intended for bulk loading and to allow the usage of less -// frequently used, non-standardized or custom methods (e.g. for internal -// communication with a proxy). -func (group *RouterGroup) Handle(httpMethod, relativePath string, handlers ...HandlerFunc) IRoutes { - if matches, err := regexp.MatchString("^[A-Z]+$", httpMethod); !matches || err != nil { - panic("http method " + httpMethod + " is not valid") - } - return group.handle(httpMethod, relativePath, handlers) -} - -// POST is a shortcut for router.Handle("POST", path, handle) -func (group *RouterGroup) POST(relativePath string, handlers ...HandlerFunc) IRoutes { - return group.handle("POST", relativePath, handlers) -} - -// GET is a shortcut for router.Handle("GET", path, handle) -func (group *RouterGroup) GET(relativePath string, handlers ...HandlerFunc) IRoutes { - return group.handle("GET", relativePath, handlers) -} - -// DELETE is a shortcut for router.Handle("DELETE", path, handle) -func (group *RouterGroup) DELETE(relativePath string, handlers ...HandlerFunc) IRoutes { - return group.handle("DELETE", relativePath, handlers) -} - -// PATCH is a shortcut for router.Handle("PATCH", path, handle) -func (group *RouterGroup) PATCH(relativePath string, handlers ...HandlerFunc) IRoutes { - return group.handle("PATCH", relativePath, handlers) -} - -// PUT is a shortcut for router.Handle("PUT", path, handle) -func (group *RouterGroup) PUT(relativePath string, handlers ...HandlerFunc) IRoutes { - return group.handle("PUT", relativePath, handlers) -} - -// OPTIONS is a shortcut for router.Handle("OPTIONS", path, handle) -func (group *RouterGroup) OPTIONS(relativePath string, handlers ...HandlerFunc) IRoutes { - return group.handle("OPTIONS", relativePath, handlers) -} - -// HEAD is a shortcut for router.Handle("HEAD", path, handle) -func (group *RouterGroup) HEAD(relativePath string, handlers ...HandlerFunc) IRoutes { - return group.handle("HEAD", relativePath, handlers) -} - -// Any registers a route that matches all the HTTP methods. -// GET, POST, PUT, PATCH, HEAD, OPTIONS, DELETE, CONNECT, TRACE -func (group *RouterGroup) Any(relativePath string, handlers ...HandlerFunc) IRoutes { - group.handle("GET", relativePath, handlers) - group.handle("POST", relativePath, handlers) - group.handle("PUT", relativePath, handlers) - group.handle("PATCH", relativePath, handlers) - group.handle("HEAD", relativePath, handlers) - group.handle("OPTIONS", relativePath, handlers) - group.handle("DELETE", relativePath, handlers) - group.handle("CONNECT", relativePath, handlers) - group.handle("TRACE", relativePath, handlers) - return group.returnObj() -} - -// StaticFile registers a single route in order to server a single file of the local filesystem. -// router.StaticFile("favicon.ico", "./resources/favicon.ico") -func (group *RouterGroup) StaticFile(relativePath, filepath string) IRoutes { - if strings.Contains(relativePath, ":") || strings.Contains(relativePath, "*") { - panic("URL parameters can not be used when serving a static file") - } - handler := func(c *Context) { - c.File(filepath) - } - group.GET(relativePath, handler) - group.HEAD(relativePath, handler) - return group.returnObj() -} - -// Static serves files from the given file system root. -// Internally a http.FileServer is used, therefore http.NotFound is used instead -// of the Router's NotFound handler. -// To use the operating system's file system implementation, -// use : -// router.Static("/static", "/var/www") -func (group *RouterGroup) Static(relativePath, root string) IRoutes { - return group.StaticFS(relativePath, Dir(root, false)) -} - -// StaticFS works just like `Static()` but a custom `http.FileSystem` can be used instead. -// Gin by default user: gin.Dir() -func (group *RouterGroup) StaticFS(relativePath string, fs http.FileSystem) IRoutes { - if strings.Contains(relativePath, ":") || strings.Contains(relativePath, "*") { - panic("URL parameters can not be used when serving a static folder") - } - handler := group.createStaticHandler(relativePath, fs) - urlPattern := path.Join(relativePath, "/*filepath") - - // Register GET and HEAD handlers - group.GET(urlPattern, handler) - group.HEAD(urlPattern, handler) - return group.returnObj() -} - -func (group *RouterGroup) createStaticHandler(relativePath string, fs http.FileSystem) HandlerFunc { - absolutePath := group.calculateAbsolutePath(relativePath) - fileServer := http.StripPrefix(absolutePath, http.FileServer(fs)) - _, nolisting := fs.(*onlyfilesFS) - return func(c *Context) { - if nolisting { - c.Writer.WriteHeader(404) - } - fileServer.ServeHTTP(c.Writer, c.Request) - } -} - -func (group *RouterGroup) combineHandlers(handlers HandlersChain) HandlersChain { - finalSize := len(group.Handlers) + len(handlers) - if finalSize >= int(abortIndex) { - panic("too many handlers") - } - mergedHandlers := make(HandlersChain, finalSize) - copy(mergedHandlers, group.Handlers) - copy(mergedHandlers[len(group.Handlers):], handlers) - return mergedHandlers -} - -func (group *RouterGroup) calculateAbsolutePath(relativePath string) string { - return joinPaths(group.basePath, relativePath) -} - -func (group *RouterGroup) returnObj() IRoutes { - if group.root { - return group.engine - } - return group -} diff --git a/vendor/github.com/gin-gonic/gin/tree.go b/vendor/github.com/gin-gonic/gin/tree.go deleted file mode 100644 index 4f1da27..0000000 --- a/vendor/github.com/gin-gonic/gin/tree.go +++ /dev/null @@ -1,605 +0,0 @@ -// Copyright 2013 Julien Schmidt. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be found -// in the LICENSE file. - -package gin - -import ( - "strings" - "unicode" -) - -// Param is a single URL parameter, consisting of a key and a value. -type Param struct { - Key string - Value string -} - -// Params is a Param-slice, as returned by the router. -// The slice is ordered, the first URL parameter is also the first slice value. -// It is therefore safe to read values by the index. -type Params []Param - -// Get returns the value of the first Param which key matches the given name. -// If no matching Param is found, an empty string is returned. -func (ps Params) Get(name string) (string, bool) { - for _, entry := range ps { - if entry.Key == name { - return entry.Value, true - } - } - return "", false -} - -// ByName returns the value of the first Param which key matches the given name. -// If no matching Param is found, an empty string is returned. -func (ps Params) ByName(name string) (va string) { - va, _ = ps.Get(name) - return -} - -type methodTree struct { - method string - root *node -} - -type methodTrees []methodTree - -func (trees methodTrees) get(method string) *node { - for _, tree := range trees { - if tree.method == method { - return tree.root - } - } - return nil -} - -func min(a, b int) int { - if a <= b { - return a - } - return b -} - -func countParams(path string) uint8 { - var n uint - for i := 0; i < len(path); i++ { - if path[i] != ':' && path[i] != '*' { - continue - } - n++ - } - if n >= 255 { - return 255 - } - return uint8(n) -} - -type nodeType uint8 - -const ( - static nodeType = iota // default - root - param - catchAll -) - -type node struct { - path string - wildChild bool - nType nodeType - maxParams uint8 - indices string - children []*node - handlers HandlersChain - priority uint32 -} - -// increments priority of the given child and reorders if necessary -func (n *node) incrementChildPrio(pos int) int { - n.children[pos].priority++ - prio := n.children[pos].priority - - // adjust position (move to front) - newPos := pos - for newPos > 0 && n.children[newPos-1].priority < prio { - // swap node positions - tmpN := n.children[newPos-1] - n.children[newPos-1] = n.children[newPos] - n.children[newPos] = tmpN - - newPos-- - } - - // build new index char string - if newPos != pos { - n.indices = n.indices[:newPos] + // unchanged prefix, might be empty - n.indices[pos:pos+1] + // the index char we move - n.indices[newPos:pos] + n.indices[pos+1:] // rest without char at 'pos' - } - - return newPos -} - -// addRoute adds a node with the given handle to the path. -// Not concurrency-safe! -func (n *node) addRoute(path string, handlers HandlersChain) { - fullPath := path - n.priority++ - numParams := countParams(path) - - // non-empty tree - if len(n.path) > 0 || len(n.children) > 0 { - walk: - for { - // Update maxParams of the current node - if numParams > n.maxParams { - n.maxParams = numParams - } - - // Find the longest common prefix. - // This also implies that the common prefix contains no ':' or '*' - // since the existing key can't contain those chars. - i := 0 - max := min(len(path), len(n.path)) - for i < max && path[i] == n.path[i] { - i++ - } - - // Split edge - if i < len(n.path) { - child := node{ - path: n.path[i:], - wildChild: n.wildChild, - indices: n.indices, - children: n.children, - handlers: n.handlers, - priority: n.priority - 1, - } - - // Update maxParams (max of all children) - for i := range child.children { - if child.children[i].maxParams > child.maxParams { - child.maxParams = child.children[i].maxParams - } - } - - n.children = []*node{&child} - // []byte for proper unicode char conversion, see #65 - n.indices = string([]byte{n.path[i]}) - n.path = path[:i] - n.handlers = nil - n.wildChild = false - } - - // Make new node a child of this node - if i < len(path) { - path = path[i:] - - if n.wildChild { - n = n.children[0] - n.priority++ - - // Update maxParams of the child node - if numParams > n.maxParams { - n.maxParams = numParams - } - numParams-- - - // Check if the wildcard matches - if len(path) >= len(n.path) && n.path == path[:len(n.path)] { - // check for longer wildcard, e.g. :name and :names - if len(n.path) >= len(path) || path[len(n.path)] == '/' { - continue walk - } - } - - panic("path segment '" + path + - "' conflicts with existing wildcard '" + n.path + - "' in path '" + fullPath + "'") - } - - c := path[0] - - // slash after param - if n.nType == param && c == '/' && len(n.children) == 1 { - n = n.children[0] - n.priority++ - continue walk - } - - // Check if a child with the next path byte exists - for i := 0; i < len(n.indices); i++ { - if c == n.indices[i] { - i = n.incrementChildPrio(i) - n = n.children[i] - continue walk - } - } - - // Otherwise insert it - if c != ':' && c != '*' { - // []byte for proper unicode char conversion, see #65 - n.indices += string([]byte{c}) - child := &node{ - maxParams: numParams, - } - n.children = append(n.children, child) - n.incrementChildPrio(len(n.indices) - 1) - n = child - } - n.insertChild(numParams, path, fullPath, handlers) - return - - } else if i == len(path) { // Make node a (in-path) leaf - if n.handlers != nil { - panic("handlers are already registered for path ''" + fullPath + "'") - } - n.handlers = handlers - } - return - } - } else { // Empty tree - n.insertChild(numParams, path, fullPath, handlers) - n.nType = root - } -} - -func (n *node) insertChild(numParams uint8, path string, fullPath string, handlers HandlersChain) { - var offset int // already handled bytes of the path - - // find prefix until first wildcard (beginning with ':'' or '*'') - for i, max := 0, len(path); numParams > 0; i++ { - c := path[i] - if c != ':' && c != '*' { - continue - } - - // find wildcard end (either '/' or path end) - end := i + 1 - for end < max && path[end] != '/' { - switch path[end] { - // the wildcard name must not contain ':' and '*' - case ':', '*': - panic("only one wildcard per path segment is allowed, has: '" + - path[i:] + "' in path '" + fullPath + "'") - default: - end++ - } - } - - // check if this Node existing children which would be - // unreachable if we insert the wildcard here - if len(n.children) > 0 { - panic("wildcard route '" + path[i:end] + - "' conflicts with existing children in path '" + fullPath + "'") - } - - // check if the wildcard has a name - if end-i < 2 { - panic("wildcards must be named with a non-empty name in path '" + fullPath + "'") - } - - if c == ':' { // param - // split path at the beginning of the wildcard - if i > 0 { - n.path = path[offset:i] - offset = i - } - - child := &node{ - nType: param, - maxParams: numParams, - } - n.children = []*node{child} - n.wildChild = true - n = child - n.priority++ - numParams-- - - // if the path doesn't end with the wildcard, then there - // will be another non-wildcard subpath starting with '/' - if end < max { - n.path = path[offset:end] - offset = end - - child := &node{ - maxParams: numParams, - priority: 1, - } - n.children = []*node{child} - n = child - } - - } else { // catchAll - if end != max || numParams > 1 { - panic("catch-all routes are only allowed at the end of the path in path '" + fullPath + "'") - } - - if len(n.path) > 0 && n.path[len(n.path)-1] == '/' { - panic("catch-all conflicts with existing handle for the path segment root in path '" + fullPath + "'") - } - - // currently fixed width 1 for '/' - i-- - if path[i] != '/' { - panic("no / before catch-all in path '" + fullPath + "'") - } - - n.path = path[offset:i] - - // first node: catchAll node with empty path - child := &node{ - wildChild: true, - nType: catchAll, - maxParams: 1, - } - n.children = []*node{child} - n.indices = string(path[i]) - n = child - n.priority++ - - // second node: node holding the variable - child = &node{ - path: path[i:], - nType: catchAll, - maxParams: 1, - handlers: handlers, - priority: 1, - } - n.children = []*node{child} - - return - } - } - - // insert remaining path part and handle to the leaf - n.path = path[offset:] - n.handlers = handlers -} - -// Returns the handle registered with the given path (key). The values of -// wildcards are saved to a map. -// If no handle can be found, a TSR (trailing slash redirect) recommendation is -// made if a handle exists with an extra (without the) trailing slash for the -// given path. -func (n *node) getValue(path string, po Params) (handlers HandlersChain, p Params, tsr bool) { - p = po -walk: // Outer loop for walking the tree - for { - if len(path) > len(n.path) { - if path[:len(n.path)] == n.path { - path = path[len(n.path):] - // If this node does not have a wildcard (param or catchAll) - // child, we can just look up the next child node and continue - // to walk down the tree - if !n.wildChild { - c := path[0] - for i := 0; i < len(n.indices); i++ { - if c == n.indices[i] { - n = n.children[i] - continue walk - } - } - - // Nothing found. - // We can recommend to redirect to the same URL without a - // trailing slash if a leaf exists for that path. - tsr = (path == "/" && n.handlers != nil) - return - } - - // handle wildcard child - n = n.children[0] - switch n.nType { - case param: - // find param end (either '/' or path end) - end := 0 - for end < len(path) && path[end] != '/' { - end++ - } - - // save param value - if cap(p) < int(n.maxParams) { - p = make(Params, 0, n.maxParams) - } - i := len(p) - p = p[:i+1] // expand slice within preallocated capacity - p[i].Key = n.path[1:] - p[i].Value = path[:end] - - // we need to go deeper! - if end < len(path) { - if len(n.children) > 0 { - path = path[end:] - n = n.children[0] - continue walk - } - - // ... but we can't - tsr = (len(path) == end+1) - return - } - - if handlers = n.handlers; handlers != nil { - return - } else if len(n.children) == 1 { - // No handle found. Check if a handle for this path + a - // trailing slash exists for TSR recommendation - n = n.children[0] - tsr = (n.path == "/" && n.handlers != nil) - } - - return - - case catchAll: - // save param value - if cap(p) < int(n.maxParams) { - p = make(Params, 0, n.maxParams) - } - i := len(p) - p = p[:i+1] // expand slice within preallocated capacity - p[i].Key = n.path[2:] - p[i].Value = path - - handlers = n.handlers - return - - default: - panic("invalid node type") - } - } - } else if path == n.path { - // We should have reached the node containing the handle. - // Check if this node has a handle registered. - if handlers = n.handlers; handlers != nil { - return - } - - if path == "/" && n.wildChild && n.nType != root { - tsr = true - return - } - - // No handle found. Check if a handle for this path + a - // trailing slash exists for trailing slash recommendation - for i := 0; i < len(n.indices); i++ { - if n.indices[i] == '/' { - n = n.children[i] - tsr = (len(n.path) == 1 && n.handlers != nil) || - (n.nType == catchAll && n.children[0].handlers != nil) - return - } - } - - return - } - - // Nothing found. We can recommend to redirect to the same URL with an - // extra trailing slash if a leaf exists for that path - tsr = (path == "/") || - (len(n.path) == len(path)+1 && n.path[len(path)] == '/' && - path == n.path[:len(n.path)-1] && n.handlers != nil) - return - } -} - -// Makes a case-insensitive lookup of the given path and tries to find a handler. -// It can optionally also fix trailing slashes. -// It returns the case-corrected path and a bool indicating whether the lookup -// was successful. -func (n *node) findCaseInsensitivePath(path string, fixTrailingSlash bool) (ciPath []byte, found bool) { - ciPath = make([]byte, 0, len(path)+1) // preallocate enough memory - - // Outer loop for walking the tree - for len(path) >= len(n.path) && strings.ToLower(path[:len(n.path)]) == strings.ToLower(n.path) { - path = path[len(n.path):] - ciPath = append(ciPath, n.path...) - - if len(path) > 0 { - // If this node does not have a wildcard (param or catchAll) child, - // we can just look up the next child node and continue to walk down - // the tree - if !n.wildChild { - r := unicode.ToLower(rune(path[0])) - for i, index := range n.indices { - // must use recursive approach since both index and - // ToLower(index) could exist. We must check both. - if r == unicode.ToLower(index) { - out, found := n.children[i].findCaseInsensitivePath(path, fixTrailingSlash) - if found { - return append(ciPath, out...), true - } - } - } - - // Nothing found. We can recommend to redirect to the same URL - // without a trailing slash if a leaf exists for that path - found = (fixTrailingSlash && path == "/" && n.handlers != nil) - return - } - - n = n.children[0] - switch n.nType { - case param: - // find param end (either '/' or path end) - k := 0 - for k < len(path) && path[k] != '/' { - k++ - } - - // add param value to case insensitive path - ciPath = append(ciPath, path[:k]...) - - // we need to go deeper! - if k < len(path) { - if len(n.children) > 0 { - path = path[k:] - n = n.children[0] - continue - } - - // ... but we can't - if fixTrailingSlash && len(path) == k+1 { - return ciPath, true - } - return - } - - if n.handlers != nil { - return ciPath, true - } else if fixTrailingSlash && len(n.children) == 1 { - // No handle found. Check if a handle for this path + a - // trailing slash exists - n = n.children[0] - if n.path == "/" && n.handlers != nil { - return append(ciPath, '/'), true - } - } - return - - case catchAll: - return append(ciPath, path...), true - - default: - panic("invalid node type") - } - } else { - // We should have reached the node containing the handle. - // Check if this node has a handle registered. - if n.handlers != nil { - return ciPath, true - } - - // No handle found. - // Try to fix the path by adding a trailing slash - if fixTrailingSlash { - for i := 0; i < len(n.indices); i++ { - if n.indices[i] == '/' { - n = n.children[i] - if (len(n.path) == 1 && n.handlers != nil) || - (n.nType == catchAll && n.children[0].handlers != nil) { - return append(ciPath, '/'), true - } - return - } - } - } - return - } - } - - // Nothing found. - // Try to fix the path by adding / removing a trailing slash - if fixTrailingSlash { - if path == "/" { - return ciPath, true - } - if len(path)+1 == len(n.path) && n.path[len(path)] == '/' && - strings.ToLower(path) == strings.ToLower(n.path[:len(path)]) && - n.handlers != nil { - return append(ciPath, n.path...), true - } - } - return -} diff --git a/vendor/github.com/gin-gonic/gin/utils.go b/vendor/github.com/gin-gonic/gin/utils.go deleted file mode 100644 index 18064fb..0000000 --- a/vendor/github.com/gin-gonic/gin/utils.go +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright 2014 Manu Martinez-Almeida. All rights reserved. -// Use of this source code is governed by a MIT style -// license that can be found in the LICENSE file. - -package gin - -import ( - "encoding/xml" - "net/http" - "os" - "path" - "reflect" - "runtime" - "strings" -) - -const BindKey = "_gin-gonic/gin/bindkey" - -func Bind(val interface{}) HandlerFunc { - value := reflect.ValueOf(val) - if value.Kind() == reflect.Ptr { - panic(`Bind struct can not be a pointer. Example: - Use: gin.Bind(Struct{}) instead of gin.Bind(&Struct{}) -`) - } - typ := value.Type() - - return func(c *Context) { - obj := reflect.New(typ).Interface() - if c.Bind(obj) == nil { - c.Set(BindKey, obj) - } - } -} - -func WrapF(f http.HandlerFunc) HandlerFunc { - return func(c *Context) { - f(c.Writer, c.Request) - } -} - -func WrapH(h http.Handler) HandlerFunc { - return func(c *Context) { - h.ServeHTTP(c.Writer, c.Request) - } -} - -type H map[string]interface{} - -// MarshalXML allows type H to be used with xml.Marshal -func (h H) MarshalXML(e *xml.Encoder, start xml.StartElement) error { - start.Name = xml.Name{ - Space: "", - Local: "map", - } - if err := e.EncodeToken(start); err != nil { - return err - } - for key, value := range h { - elem := xml.StartElement{ - Name: xml.Name{Space: "", Local: key}, - Attr: []xml.Attr{}, - } - if err := e.EncodeElement(value, elem); err != nil { - return err - } - } - if err := e.EncodeToken(xml.EndElement{Name: start.Name}); err != nil { - return err - } - return nil -} - -func assert1(guard bool, text string) { - if !guard { - panic(text) - } -} - -func filterFlags(content string) string { - for i, char := range content { - if char == ' ' || char == ';' { - return content[:i] - } - } - return content -} - -func chooseData(custom, wildcard interface{}) interface{} { - if custom == nil { - if wildcard == nil { - panic("negotiation config is invalid") - } - return wildcard - } - return custom -} - -func parseAccept(acceptHeader string) []string { - parts := strings.Split(acceptHeader, ",") - out := make([]string, 0, len(parts)) - for _, part := range parts { - index := strings.IndexByte(part, ';') - if index >= 0 { - part = part[0:index] - } - part = strings.TrimSpace(part) - if len(part) > 0 { - out = append(out, part) - } - } - return out -} - -func lastChar(str string) uint8 { - size := len(str) - if size == 0 { - panic("The length of the string can't be 0") - } - return str[size-1] -} - -func nameOfFunction(f interface{}) string { - return runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name() -} - -func joinPaths(absolutePath, relativePath string) string { - if len(relativePath) == 0 { - return absolutePath - } - - finalPath := path.Join(absolutePath, relativePath) - appendSlash := lastChar(relativePath) == '/' && lastChar(finalPath) != '/' - if appendSlash { - return finalPath + "/" - } - return finalPath -} - -func resolveAddress(addr []string) string { - switch len(addr) { - case 0: - if port := os.Getenv("PORT"); len(port) > 0 { - debugPrint("Environment variable PORT=\"%s\"", port) - return ":" + port - } - debugPrint("Environment variable PORT is undefined. Using port :8080 by default") - return ":8080" - case 1: - return addr[0] - default: - panic("too much parameters") - } -} diff --git a/vendor/github.com/gin-gonic/gin/wercker.yml b/vendor/github.com/gin-gonic/gin/wercker.yml deleted file mode 100644 index 3ab8084..0000000 --- a/vendor/github.com/gin-gonic/gin/wercker.yml +++ /dev/null @@ -1 +0,0 @@ -box: wercker/default \ No newline at end of file diff --git a/vendor/github.com/golang/protobuf/AUTHORS b/vendor/github.com/golang/protobuf/AUTHORS deleted file mode 100644 index 15167cd..0000000 --- a/vendor/github.com/golang/protobuf/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -# This source code refers to The Go Authors for copyright purposes. -# The master list of authors is in the main Go distribution, -# visible at http://tip.golang.org/AUTHORS. diff --git a/vendor/github.com/golang/protobuf/CONTRIBUTORS b/vendor/github.com/golang/protobuf/CONTRIBUTORS deleted file mode 100644 index 1c4577e..0000000 --- a/vendor/github.com/golang/protobuf/CONTRIBUTORS +++ /dev/null @@ -1,3 +0,0 @@ -# This source code was written by the Go contributors. -# The master list of contributors is in the main Go distribution, -# visible at http://tip.golang.org/CONTRIBUTORS. diff --git a/vendor/github.com/golang/protobuf/LICENSE b/vendor/github.com/golang/protobuf/LICENSE deleted file mode 100644 index 1b1b192..0000000 --- a/vendor/github.com/golang/protobuf/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -Go support for Protocol Buffers - Google's data interchange format - -Copyright 2010 The Go Authors. All rights reserved. -https://github.com/golang/protobuf - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/vendor/github.com/golang/protobuf/proto/Makefile b/vendor/github.com/golang/protobuf/proto/Makefile deleted file mode 100644 index e2e0651..0000000 --- a/vendor/github.com/golang/protobuf/proto/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# Go support for Protocol Buffers - Google's data interchange format -# -# Copyright 2010 The Go Authors. All rights reserved. -# https://github.com/golang/protobuf -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -install: - go install - -test: install generate-test-pbs - go test - - -generate-test-pbs: - make install - make -C testdata - protoc --go_out=Mtestdata/test.proto=github.com/golang/protobuf/proto/testdata,Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any:. proto3_proto/proto3.proto - make diff --git a/vendor/github.com/golang/protobuf/proto/clone.go b/vendor/github.com/golang/protobuf/proto/clone.go deleted file mode 100644 index e392575..0000000 --- a/vendor/github.com/golang/protobuf/proto/clone.go +++ /dev/null @@ -1,229 +0,0 @@ -// Go support for Protocol Buffers - Google's data interchange format -// -// Copyright 2011 The Go Authors. All rights reserved. -// https://github.com/golang/protobuf -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Protocol buffer deep copy and merge. -// TODO: RawMessage. - -package proto - -import ( - "log" - "reflect" - "strings" -) - -// Clone returns a deep copy of a protocol buffer. -func Clone(pb Message) Message { - in := reflect.ValueOf(pb) - if in.IsNil() { - return pb - } - - out := reflect.New(in.Type().Elem()) - // out is empty so a merge is a deep copy. - mergeStruct(out.Elem(), in.Elem()) - return out.Interface().(Message) -} - -// Merge merges src into dst. -// Required and optional fields that are set in src will be set to that value in dst. -// Elements of repeated fields will be appended. -// Merge panics if src and dst are not the same type, or if dst is nil. -func Merge(dst, src Message) { - in := reflect.ValueOf(src) - out := reflect.ValueOf(dst) - if out.IsNil() { - panic("proto: nil destination") - } - if in.Type() != out.Type() { - // Explicit test prior to mergeStruct so that mistyped nils will fail - panic("proto: type mismatch") - } - if in.IsNil() { - // Merging nil into non-nil is a quiet no-op - return - } - mergeStruct(out.Elem(), in.Elem()) -} - -func mergeStruct(out, in reflect.Value) { - sprop := GetProperties(in.Type()) - for i := 0; i < in.NumField(); i++ { - f := in.Type().Field(i) - if strings.HasPrefix(f.Name, "XXX_") { - continue - } - mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i]) - } - - if emIn, ok := extendable(in.Addr().Interface()); ok { - emOut, _ := extendable(out.Addr().Interface()) - mIn, muIn := emIn.extensionsRead() - if mIn != nil { - mOut := emOut.extensionsWrite() - muIn.Lock() - mergeExtension(mOut, mIn) - muIn.Unlock() - } - } - - uf := in.FieldByName("XXX_unrecognized") - if !uf.IsValid() { - return - } - uin := uf.Bytes() - if len(uin) > 0 { - out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...)) - } -} - -// mergeAny performs a merge between two values of the same type. -// viaPtr indicates whether the values were indirected through a pointer (implying proto2). -// prop is set if this is a struct field (it may be nil). -func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) { - if in.Type() == protoMessageType { - if !in.IsNil() { - if out.IsNil() { - out.Set(reflect.ValueOf(Clone(in.Interface().(Message)))) - } else { - Merge(out.Interface().(Message), in.Interface().(Message)) - } - } - return - } - switch in.Kind() { - case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64, - reflect.String, reflect.Uint32, reflect.Uint64: - if !viaPtr && isProto3Zero(in) { - return - } - out.Set(in) - case reflect.Interface: - // Probably a oneof field; copy non-nil values. - if in.IsNil() { - return - } - // Allocate destination if it is not set, or set to a different type. - // Otherwise we will merge as normal. - if out.IsNil() || out.Elem().Type() != in.Elem().Type() { - out.Set(reflect.New(in.Elem().Elem().Type())) // interface -> *T -> T -> new(T) - } - mergeAny(out.Elem(), in.Elem(), false, nil) - case reflect.Map: - if in.Len() == 0 { - return - } - if out.IsNil() { - out.Set(reflect.MakeMap(in.Type())) - } - // For maps with value types of *T or []byte we need to deep copy each value. - elemKind := in.Type().Elem().Kind() - for _, key := range in.MapKeys() { - var val reflect.Value - switch elemKind { - case reflect.Ptr: - val = reflect.New(in.Type().Elem().Elem()) - mergeAny(val, in.MapIndex(key), false, nil) - case reflect.Slice: - val = in.MapIndex(key) - val = reflect.ValueOf(append([]byte{}, val.Bytes()...)) - default: - val = in.MapIndex(key) - } - out.SetMapIndex(key, val) - } - case reflect.Ptr: - if in.IsNil() { - return - } - if out.IsNil() { - out.Set(reflect.New(in.Elem().Type())) - } - mergeAny(out.Elem(), in.Elem(), true, nil) - case reflect.Slice: - if in.IsNil() { - return - } - if in.Type().Elem().Kind() == reflect.Uint8 { - // []byte is a scalar bytes field, not a repeated field. - - // Edge case: if this is in a proto3 message, a zero length - // bytes field is considered the zero value, and should not - // be merged. - if prop != nil && prop.proto3 && in.Len() == 0 { - return - } - - // Make a deep copy. - // Append to []byte{} instead of []byte(nil) so that we never end up - // with a nil result. - out.SetBytes(append([]byte{}, in.Bytes()...)) - return - } - n := in.Len() - if out.IsNil() { - out.Set(reflect.MakeSlice(in.Type(), 0, n)) - } - switch in.Type().Elem().Kind() { - case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64, - reflect.String, reflect.Uint32, reflect.Uint64: - out.Set(reflect.AppendSlice(out, in)) - default: - for i := 0; i < n; i++ { - x := reflect.Indirect(reflect.New(in.Type().Elem())) - mergeAny(x, in.Index(i), false, nil) - out.Set(reflect.Append(out, x)) - } - } - case reflect.Struct: - mergeStruct(out, in) - default: - // unknown type, so not a protocol buffer - log.Printf("proto: don't know how to copy %v", in) - } -} - -func mergeExtension(out, in map[int32]Extension) { - for extNum, eIn := range in { - eOut := Extension{desc: eIn.desc} - if eIn.value != nil { - v := reflect.New(reflect.TypeOf(eIn.value)).Elem() - mergeAny(v, reflect.ValueOf(eIn.value), false, nil) - eOut.value = v.Interface() - } - if eIn.enc != nil { - eOut.enc = make([]byte, len(eIn.enc)) - copy(eOut.enc, eIn.enc) - } - - out[extNum] = eOut - } -} diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go deleted file mode 100644 index aa20729..0000000 --- a/vendor/github.com/golang/protobuf/proto/decode.go +++ /dev/null @@ -1,970 +0,0 @@ -// Go support for Protocol Buffers - Google's data interchange format -// -// Copyright 2010 The Go Authors. All rights reserved. -// https://github.com/golang/protobuf -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -package proto - -/* - * Routines for decoding protocol buffer data to construct in-memory representations. - */ - -import ( - "errors" - "fmt" - "io" - "os" - "reflect" -) - -// errOverflow is returned when an integer is too large to be represented. -var errOverflow = errors.New("proto: integer overflow") - -// ErrInternalBadWireType is returned by generated code when an incorrect -// wire type is encountered. It does not get returned to user code. -var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof") - -// The fundamental decoders that interpret bytes on the wire. -// Those that take integer types all return uint64 and are -// therefore of type valueDecoder. - -// DecodeVarint reads a varint-encoded integer from the slice. -// It returns the integer and the number of bytes consumed, or -// zero if there is not enough. -// This is the format for the -// int32, int64, uint32, uint64, bool, and enum -// protocol buffer types. -func DecodeVarint(buf []byte) (x uint64, n int) { - for shift := uint(0); shift < 64; shift += 7 { - if n >= len(buf) { - return 0, 0 - } - b := uint64(buf[n]) - n++ - x |= (b & 0x7F) << shift - if (b & 0x80) == 0 { - return x, n - } - } - - // The number is too large to represent in a 64-bit value. - return 0, 0 -} - -func (p *Buffer) decodeVarintSlow() (x uint64, err error) { - i := p.index - l := len(p.buf) - - for shift := uint(0); shift < 64; shift += 7 { - if i >= l { - err = io.ErrUnexpectedEOF - return - } - b := p.buf[i] - i++ - x |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - p.index = i - return - } - } - - // The number is too large to represent in a 64-bit value. - err = errOverflow - return -} - -// DecodeVarint reads a varint-encoded integer from the Buffer. -// This is the format for the -// int32, int64, uint32, uint64, bool, and enum -// protocol buffer types. -func (p *Buffer) DecodeVarint() (x uint64, err error) { - i := p.index - buf := p.buf - - if i >= len(buf) { - return 0, io.ErrUnexpectedEOF - } else if buf[i] < 0x80 { - p.index++ - return uint64(buf[i]), nil - } else if len(buf)-i < 10 { - return p.decodeVarintSlow() - } - - var b uint64 - // we already checked the first byte - x = uint64(buf[i]) - 0x80 - i++ - - b = uint64(buf[i]) - i++ - x += b << 7 - if b&0x80 == 0 { - goto done - } - x -= 0x80 << 7 - - b = uint64(buf[i]) - i++ - x += b << 14 - if b&0x80 == 0 { - goto done - } - x -= 0x80 << 14 - - b = uint64(buf[i]) - i++ - x += b << 21 - if b&0x80 == 0 { - goto done - } - x -= 0x80 << 21 - - b = uint64(buf[i]) - i++ - x += b << 28 - if b&0x80 == 0 { - goto done - } - x -= 0x80 << 28 - - b = uint64(buf[i]) - i++ - x += b << 35 - if b&0x80 == 0 { - goto done - } - x -= 0x80 << 35 - - b = uint64(buf[i]) - i++ - x += b << 42 - if b&0x80 == 0 { - goto done - } - x -= 0x80 << 42 - - b = uint64(buf[i]) - i++ - x += b << 49 - if b&0x80 == 0 { - goto done - } - x -= 0x80 << 49 - - b = uint64(buf[i]) - i++ - x += b << 56 - if b&0x80 == 0 { - goto done - } - x -= 0x80 << 56 - - b = uint64(buf[i]) - i++ - x += b << 63 - if b&0x80 == 0 { - goto done - } - // x -= 0x80 << 63 // Always zero. - - return 0, errOverflow - -done: - p.index = i - return x, nil -} - -// DecodeFixed64 reads a 64-bit integer from the Buffer. -// This is the format for the -// fixed64, sfixed64, and double protocol buffer types. -func (p *Buffer) DecodeFixed64() (x uint64, err error) { - // x, err already 0 - i := p.index + 8 - if i < 0 || i > len(p.buf) { - err = io.ErrUnexpectedEOF - return - } - p.index = i - - x = uint64(p.buf[i-8]) - x |= uint64(p.buf[i-7]) << 8 - x |= uint64(p.buf[i-6]) << 16 - x |= uint64(p.buf[i-5]) << 24 - x |= uint64(p.buf[i-4]) << 32 - x |= uint64(p.buf[i-3]) << 40 - x |= uint64(p.buf[i-2]) << 48 - x |= uint64(p.buf[i-1]) << 56 - return -} - -// DecodeFixed32 reads a 32-bit integer from the Buffer. -// This is the format for the -// fixed32, sfixed32, and float protocol buffer types. -func (p *Buffer) DecodeFixed32() (x uint64, err error) { - // x, err already 0 - i := p.index + 4 - if i < 0 || i > len(p.buf) { - err = io.ErrUnexpectedEOF - return - } - p.index = i - - x = uint64(p.buf[i-4]) - x |= uint64(p.buf[i-3]) << 8 - x |= uint64(p.buf[i-2]) << 16 - x |= uint64(p.buf[i-1]) << 24 - return -} - -// DecodeZigzag64 reads a zigzag-encoded 64-bit integer -// from the Buffer. -// This is the format used for the sint64 protocol buffer type. -func (p *Buffer) DecodeZigzag64() (x uint64, err error) { - x, err = p.DecodeVarint() - if err != nil { - return - } - x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63) - return -} - -// DecodeZigzag32 reads a zigzag-encoded 32-bit integer -// from the Buffer. -// This is the format used for the sint32 protocol buffer type. -func (p *Buffer) DecodeZigzag32() (x uint64, err error) { - x, err = p.DecodeVarint() - if err != nil { - return - } - x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31)) - return -} - -// These are not ValueDecoders: they produce an array of bytes or a string. -// bytes, embedded messages - -// DecodeRawBytes reads a count-delimited byte buffer from the Buffer. -// This is the format used for the bytes protocol buffer -// type and for embedded messages. -func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) { - n, err := p.DecodeVarint() - if err != nil { - return nil, err - } - - nb := int(n) - if nb < 0 { - return nil, fmt.Errorf("proto: bad byte length %d", nb) - } - end := p.index + nb - if end < p.index || end > len(p.buf) { - return nil, io.ErrUnexpectedEOF - } - - if !alloc { - // todo: check if can get more uses of alloc=false - buf = p.buf[p.index:end] - p.index += nb - return - } - - buf = make([]byte, nb) - copy(buf, p.buf[p.index:]) - p.index += nb - return -} - -// DecodeStringBytes reads an encoded string from the Buffer. -// This is the format used for the proto2 string type. -func (p *Buffer) DecodeStringBytes() (s string, err error) { - buf, err := p.DecodeRawBytes(false) - if err != nil { - return - } - return string(buf), nil -} - -// Skip the next item in the buffer. Its wire type is decoded and presented as an argument. -// If the protocol buffer has extensions, and the field matches, add it as an extension. -// Otherwise, if the XXX_unrecognized field exists, append the skipped data there. -func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error { - oi := o.index - - err := o.skip(t, tag, wire) - if err != nil { - return err - } - - if !unrecField.IsValid() { - return nil - } - - ptr := structPointer_Bytes(base, unrecField) - - // Add the skipped field to struct field - obuf := o.buf - - o.buf = *ptr - o.EncodeVarint(uint64(tag<<3 | wire)) - *ptr = append(o.buf, obuf[oi:o.index]...) - - o.buf = obuf - - return nil -} - -// Skip the next item in the buffer. Its wire type is decoded and presented as an argument. -func (o *Buffer) skip(t reflect.Type, tag, wire int) error { - - var u uint64 - var err error - - switch wire { - case WireVarint: - _, err = o.DecodeVarint() - case WireFixed64: - _, err = o.DecodeFixed64() - case WireBytes: - _, err = o.DecodeRawBytes(false) - case WireFixed32: - _, err = o.DecodeFixed32() - case WireStartGroup: - for { - u, err = o.DecodeVarint() - if err != nil { - break - } - fwire := int(u & 0x7) - if fwire == WireEndGroup { - break - } - ftag := int(u >> 3) - err = o.skip(t, ftag, fwire) - if err != nil { - break - } - } - default: - err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t) - } - return err -} - -// Unmarshaler is the interface representing objects that can -// unmarshal themselves. The method should reset the receiver before -// decoding starts. The argument points to data that may be -// overwritten, so implementations should not keep references to the -// buffer. -type Unmarshaler interface { - Unmarshal([]byte) error -} - -// Unmarshal parses the protocol buffer representation in buf and places the -// decoded result in pb. If the struct underlying pb does not match -// the data in buf, the results can be unpredictable. -// -// Unmarshal resets pb before starting to unmarshal, so any -// existing data in pb is always removed. Use UnmarshalMerge -// to preserve and append to existing data. -func Unmarshal(buf []byte, pb Message) error { - pb.Reset() - return UnmarshalMerge(buf, pb) -} - -// UnmarshalMerge parses the protocol buffer representation in buf and -// writes the decoded result to pb. If the struct underlying pb does not match -// the data in buf, the results can be unpredictable. -// -// UnmarshalMerge merges into existing data in pb. -// Most code should use Unmarshal instead. -func UnmarshalMerge(buf []byte, pb Message) error { - // If the object can unmarshal itself, let it. - if u, ok := pb.(Unmarshaler); ok { - return u.Unmarshal(buf) - } - return NewBuffer(buf).Unmarshal(pb) -} - -// DecodeMessage reads a count-delimited message from the Buffer. -func (p *Buffer) DecodeMessage(pb Message) error { - enc, err := p.DecodeRawBytes(false) - if err != nil { - return err - } - return NewBuffer(enc).Unmarshal(pb) -} - -// DecodeGroup reads a tag-delimited group from the Buffer. -func (p *Buffer) DecodeGroup(pb Message) error { - typ, base, err := getbase(pb) - if err != nil { - return err - } - return p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), true, base) -} - -// Unmarshal parses the protocol buffer representation in the -// Buffer and places the decoded result in pb. If the struct -// underlying pb does not match the data in the buffer, the results can be -// unpredictable. -// -// Unlike proto.Unmarshal, this does not reset pb before starting to unmarshal. -func (p *Buffer) Unmarshal(pb Message) error { - // If the object can unmarshal itself, let it. - if u, ok := pb.(Unmarshaler); ok { - err := u.Unmarshal(p.buf[p.index:]) - p.index = len(p.buf) - return err - } - - typ, base, err := getbase(pb) - if err != nil { - return err - } - - err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base) - - if collectStats { - stats.Decode++ - } - - return err -} - -// unmarshalType does the work of unmarshaling a structure. -func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error { - var state errorState - required, reqFields := prop.reqCount, uint64(0) - - var err error - for err == nil && o.index < len(o.buf) { - oi := o.index - var u uint64 - u, err = o.DecodeVarint() - if err != nil { - break - } - wire := int(u & 0x7) - if wire == WireEndGroup { - if is_group { - if required > 0 { - // Not enough information to determine the exact field. - // (See below.) - return &RequiredNotSetError{"{Unknown}"} - } - return nil // input is satisfied - } - return fmt.Errorf("proto: %s: wiretype end group for non-group", st) - } - tag := int(u >> 3) - if tag <= 0 { - return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire) - } - fieldnum, ok := prop.decoderTags.get(tag) - if !ok { - // Maybe it's an extension? - if prop.extendable { - if e, _ := extendable(structPointer_Interface(base, st)); isExtensionField(e, int32(tag)) { - if err = o.skip(st, tag, wire); err == nil { - extmap := e.extensionsWrite() - ext := extmap[int32(tag)] // may be missing - ext.enc = append(ext.enc, o.buf[oi:o.index]...) - extmap[int32(tag)] = ext - } - continue - } - } - // Maybe it's a oneof? - if prop.oneofUnmarshaler != nil { - m := structPointer_Interface(base, st).(Message) - // First return value indicates whether tag is a oneof field. - ok, err = prop.oneofUnmarshaler(m, tag, wire, o) - if err == ErrInternalBadWireType { - // Map the error to something more descriptive. - // Do the formatting here to save generated code space. - err = fmt.Errorf("bad wiretype for oneof field in %T", m) - } - if ok { - continue - } - } - err = o.skipAndSave(st, tag, wire, base, prop.unrecField) - continue - } - p := prop.Prop[fieldnum] - - if p.dec == nil { - fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name) - continue - } - dec := p.dec - if wire != WireStartGroup && wire != p.WireType { - if wire == WireBytes && p.packedDec != nil { - // a packable field - dec = p.packedDec - } else { - err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType) - continue - } - } - decErr := dec(o, p, base) - if decErr != nil && !state.shouldContinue(decErr, p) { - err = decErr - } - if err == nil && p.Required { - // Successfully decoded a required field. - if tag <= 64 { - // use bitmap for fields 1-64 to catch field reuse. - var mask uint64 = 1 << uint64(tag-1) - if reqFields&mask == 0 { - // new required field - reqFields |= mask - required-- - } - } else { - // This is imprecise. It can be fooled by a required field - // with a tag > 64 that is encoded twice; that's very rare. - // A fully correct implementation would require allocating - // a data structure, which we would like to avoid. - required-- - } - } - } - if err == nil { - if is_group { - return io.ErrUnexpectedEOF - } - if state.err != nil { - return state.err - } - if required > 0 { - // Not enough information to determine the exact field. If we use extra - // CPU, we could determine the field only if the missing required field - // has a tag <= 64 and we check reqFields. - return &RequiredNotSetError{"{Unknown}"} - } - } - return err -} - -// Individual type decoders -// For each, -// u is the decoded value, -// v is a pointer to the field (pointer) in the struct - -// Sizes of the pools to allocate inside the Buffer. -// The goal is modest amortization and allocation -// on at least 16-byte boundaries. -const ( - boolPoolSize = 16 - uint32PoolSize = 8 - uint64PoolSize = 4 -) - -// Decode a bool. -func (o *Buffer) dec_bool(p *Properties, base structPointer) error { - u, err := p.valDec(o) - if err != nil { - return err - } - if len(o.bools) == 0 { - o.bools = make([]bool, boolPoolSize) - } - o.bools[0] = u != 0 - *structPointer_Bool(base, p.field) = &o.bools[0] - o.bools = o.bools[1:] - return nil -} - -func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error { - u, err := p.valDec(o) - if err != nil { - return err - } - *structPointer_BoolVal(base, p.field) = u != 0 - return nil -} - -// Decode an int32. -func (o *Buffer) dec_int32(p *Properties, base structPointer) error { - u, err := p.valDec(o) - if err != nil { - return err - } - word32_Set(structPointer_Word32(base, p.field), o, uint32(u)) - return nil -} - -func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error { - u, err := p.valDec(o) - if err != nil { - return err - } - word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u)) - return nil -} - -// Decode an int64. -func (o *Buffer) dec_int64(p *Properties, base structPointer) error { - u, err := p.valDec(o) - if err != nil { - return err - } - word64_Set(structPointer_Word64(base, p.field), o, u) - return nil -} - -func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error { - u, err := p.valDec(o) - if err != nil { - return err - } - word64Val_Set(structPointer_Word64Val(base, p.field), o, u) - return nil -} - -// Decode a string. -func (o *Buffer) dec_string(p *Properties, base structPointer) error { - s, err := o.DecodeStringBytes() - if err != nil { - return err - } - *structPointer_String(base, p.field) = &s - return nil -} - -func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error { - s, err := o.DecodeStringBytes() - if err != nil { - return err - } - *structPointer_StringVal(base, p.field) = s - return nil -} - -// Decode a slice of bytes ([]byte). -func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error { - b, err := o.DecodeRawBytes(true) - if err != nil { - return err - } - *structPointer_Bytes(base, p.field) = b - return nil -} - -// Decode a slice of bools ([]bool). -func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error { - u, err := p.valDec(o) - if err != nil { - return err - } - v := structPointer_BoolSlice(base, p.field) - *v = append(*v, u != 0) - return nil -} - -// Decode a slice of bools ([]bool) in packed format. -func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error { - v := structPointer_BoolSlice(base, p.field) - - nn, err := o.DecodeVarint() - if err != nil { - return err - } - nb := int(nn) // number of bytes of encoded bools - fin := o.index + nb - if fin < o.index { - return errOverflow - } - - y := *v - for o.index < fin { - u, err := p.valDec(o) - if err != nil { - return err - } - y = append(y, u != 0) - } - - *v = y - return nil -} - -// Decode a slice of int32s ([]int32). -func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error { - u, err := p.valDec(o) - if err != nil { - return err - } - structPointer_Word32Slice(base, p.field).Append(uint32(u)) - return nil -} - -// Decode a slice of int32s ([]int32) in packed format. -func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error { - v := structPointer_Word32Slice(base, p.field) - - nn, err := o.DecodeVarint() - if err != nil { - return err - } - nb := int(nn) // number of bytes of encoded int32s - - fin := o.index + nb - if fin < o.index { - return errOverflow - } - for o.index < fin { - u, err := p.valDec(o) - if err != nil { - return err - } - v.Append(uint32(u)) - } - return nil -} - -// Decode a slice of int64s ([]int64). -func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error { - u, err := p.valDec(o) - if err != nil { - return err - } - - structPointer_Word64Slice(base, p.field).Append(u) - return nil -} - -// Decode a slice of int64s ([]int64) in packed format. -func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error { - v := structPointer_Word64Slice(base, p.field) - - nn, err := o.DecodeVarint() - if err != nil { - return err - } - nb := int(nn) // number of bytes of encoded int64s - - fin := o.index + nb - if fin < o.index { - return errOverflow - } - for o.index < fin { - u, err := p.valDec(o) - if err != nil { - return err - } - v.Append(u) - } - return nil -} - -// Decode a slice of strings ([]string). -func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error { - s, err := o.DecodeStringBytes() - if err != nil { - return err - } - v := structPointer_StringSlice(base, p.field) - *v = append(*v, s) - return nil -} - -// Decode a slice of slice of bytes ([][]byte). -func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error { - b, err := o.DecodeRawBytes(true) - if err != nil { - return err - } - v := structPointer_BytesSlice(base, p.field) - *v = append(*v, b) - return nil -} - -// Decode a map field. -func (o *Buffer) dec_new_map(p *Properties, base structPointer) error { - raw, err := o.DecodeRawBytes(false) - if err != nil { - return err - } - oi := o.index // index at the end of this map entry - o.index -= len(raw) // move buffer back to start of map entry - - mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V - if mptr.Elem().IsNil() { - mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem())) - } - v := mptr.Elem() // map[K]V - - // Prepare addressable doubly-indirect placeholders for the key and value types. - // See enc_new_map for why. - keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K - keybase := toStructPointer(keyptr.Addr()) // **K - - var valbase structPointer - var valptr reflect.Value - switch p.mtype.Elem().Kind() { - case reflect.Slice: - // []byte - var dummy []byte - valptr = reflect.ValueOf(&dummy) // *[]byte - valbase = toStructPointer(valptr) // *[]byte - case reflect.Ptr: - // message; valptr is **Msg; need to allocate the intermediate pointer - valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V - valptr.Set(reflect.New(valptr.Type().Elem())) - valbase = toStructPointer(valptr) - default: - // everything else - valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V - valbase = toStructPointer(valptr.Addr()) // **V - } - - // Decode. - // This parses a restricted wire format, namely the encoding of a message - // with two fields. See enc_new_map for the format. - for o.index < oi { - // tagcode for key and value properties are always a single byte - // because they have tags 1 and 2. - tagcode := o.buf[o.index] - o.index++ - switch tagcode { - case p.mkeyprop.tagcode[0]: - if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil { - return err - } - case p.mvalprop.tagcode[0]: - if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil { - return err - } - default: - // TODO: Should we silently skip this instead? - return fmt.Errorf("proto: bad map data tag %d", raw[0]) - } - } - keyelem, valelem := keyptr.Elem(), valptr.Elem() - if !keyelem.IsValid() { - keyelem = reflect.Zero(p.mtype.Key()) - } - if !valelem.IsValid() { - valelem = reflect.Zero(p.mtype.Elem()) - } - - v.SetMapIndex(keyelem, valelem) - return nil -} - -// Decode a group. -func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error { - bas := structPointer_GetStructPointer(base, p.field) - if structPointer_IsNil(bas) { - // allocate new nested message - bas = toStructPointer(reflect.New(p.stype)) - structPointer_SetStructPointer(base, p.field, bas) - } - return o.unmarshalType(p.stype, p.sprop, true, bas) -} - -// Decode an embedded message. -func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) { - raw, e := o.DecodeRawBytes(false) - if e != nil { - return e - } - - bas := structPointer_GetStructPointer(base, p.field) - if structPointer_IsNil(bas) { - // allocate new nested message - bas = toStructPointer(reflect.New(p.stype)) - structPointer_SetStructPointer(base, p.field, bas) - } - - // If the object can unmarshal itself, let it. - if p.isUnmarshaler { - iv := structPointer_Interface(bas, p.stype) - return iv.(Unmarshaler).Unmarshal(raw) - } - - obuf := o.buf - oi := o.index - o.buf = raw - o.index = 0 - - err = o.unmarshalType(p.stype, p.sprop, false, bas) - o.buf = obuf - o.index = oi - - return err -} - -// Decode a slice of embedded messages. -func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error { - return o.dec_slice_struct(p, false, base) -} - -// Decode a slice of embedded groups. -func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error { - return o.dec_slice_struct(p, true, base) -} - -// Decode a slice of structs ([]*struct). -func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error { - v := reflect.New(p.stype) - bas := toStructPointer(v) - structPointer_StructPointerSlice(base, p.field).Append(bas) - - if is_group { - err := o.unmarshalType(p.stype, p.sprop, is_group, bas) - return err - } - - raw, err := o.DecodeRawBytes(false) - if err != nil { - return err - } - - // If the object can unmarshal itself, let it. - if p.isUnmarshaler { - iv := v.Interface() - return iv.(Unmarshaler).Unmarshal(raw) - } - - obuf := o.buf - oi := o.index - o.buf = raw - o.index = 0 - - err = o.unmarshalType(p.stype, p.sprop, is_group, bas) - - o.buf = obuf - o.index = oi - - return err -} diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go deleted file mode 100644 index 2b30f84..0000000 --- a/vendor/github.com/golang/protobuf/proto/encode.go +++ /dev/null @@ -1,1362 +0,0 @@ -// Go support for Protocol Buffers - Google's data interchange format -// -// Copyright 2010 The Go Authors. All rights reserved. -// https://github.com/golang/protobuf -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -package proto - -/* - * Routines for encoding data into the wire format for protocol buffers. - */ - -import ( - "errors" - "fmt" - "reflect" - "sort" -) - -// RequiredNotSetError is the error returned if Marshal is called with -// a protocol buffer struct whose required fields have not -// all been initialized. It is also the error returned if Unmarshal is -// called with an encoded protocol buffer that does not include all the -// required fields. -// -// When printed, RequiredNotSetError reports the first unset required field in a -// message. If the field cannot be precisely determined, it is reported as -// "{Unknown}". -type RequiredNotSetError struct { - field string -} - -func (e *RequiredNotSetError) Error() string { - return fmt.Sprintf("proto: required field %q not set", e.field) -} - -var ( - // errRepeatedHasNil is the error returned if Marshal is called with - // a struct with a repeated field containing a nil element. - errRepeatedHasNil = errors.New("proto: repeated field has nil element") - - // errOneofHasNil is the error returned if Marshal is called with - // a struct with a oneof field containing a nil element. - errOneofHasNil = errors.New("proto: oneof field has nil value") - - // ErrNil is the error returned if Marshal is called with nil. - ErrNil = errors.New("proto: Marshal called with nil") - - // ErrTooLarge is the error returned if Marshal is called with a - // message that encodes to >2GB. - ErrTooLarge = errors.New("proto: message encodes to over 2 GB") -) - -// The fundamental encoders that put bytes on the wire. -// Those that take integer types all accept uint64 and are -// therefore of type valueEncoder. - -const maxVarintBytes = 10 // maximum length of a varint - -// maxMarshalSize is the largest allowed size of an encoded protobuf, -// since C++ and Java use signed int32s for the size. -const maxMarshalSize = 1<<31 - 1 - -// EncodeVarint returns the varint encoding of x. -// This is the format for the -// int32, int64, uint32, uint64, bool, and enum -// protocol buffer types. -// Not used by the package itself, but helpful to clients -// wishing to use the same encoding. -func EncodeVarint(x uint64) []byte { - var buf [maxVarintBytes]byte - var n int - for n = 0; x > 127; n++ { - buf[n] = 0x80 | uint8(x&0x7F) - x >>= 7 - } - buf[n] = uint8(x) - n++ - return buf[0:n] -} - -// EncodeVarint writes a varint-encoded integer to the Buffer. -// This is the format for the -// int32, int64, uint32, uint64, bool, and enum -// protocol buffer types. -func (p *Buffer) EncodeVarint(x uint64) error { - for x >= 1<<7 { - p.buf = append(p.buf, uint8(x&0x7f|0x80)) - x >>= 7 - } - p.buf = append(p.buf, uint8(x)) - return nil -} - -// SizeVarint returns the varint encoding size of an integer. -func SizeVarint(x uint64) int { - return sizeVarint(x) -} - -func sizeVarint(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n -} - -// EncodeFixed64 writes a 64-bit integer to the Buffer. -// This is the format for the -// fixed64, sfixed64, and double protocol buffer types. -func (p *Buffer) EncodeFixed64(x uint64) error { - p.buf = append(p.buf, - uint8(x), - uint8(x>>8), - uint8(x>>16), - uint8(x>>24), - uint8(x>>32), - uint8(x>>40), - uint8(x>>48), - uint8(x>>56)) - return nil -} - -func sizeFixed64(x uint64) int { - return 8 -} - -// EncodeFixed32 writes a 32-bit integer to the Buffer. -// This is the format for the -// fixed32, sfixed32, and float protocol buffer types. -func (p *Buffer) EncodeFixed32(x uint64) error { - p.buf = append(p.buf, - uint8(x), - uint8(x>>8), - uint8(x>>16), - uint8(x>>24)) - return nil -} - -func sizeFixed32(x uint64) int { - return 4 -} - -// EncodeZigzag64 writes a zigzag-encoded 64-bit integer -// to the Buffer. -// This is the format used for the sint64 protocol buffer type. -func (p *Buffer) EncodeZigzag64(x uint64) error { - // use signed number to get arithmetic right shift. - return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} - -func sizeZigzag64(x uint64) int { - return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} - -// EncodeZigzag32 writes a zigzag-encoded 32-bit integer -// to the Buffer. -// This is the format used for the sint32 protocol buffer type. -func (p *Buffer) EncodeZigzag32(x uint64) error { - // use signed number to get arithmetic right shift. - return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31)))) -} - -func sizeZigzag32(x uint64) int { - return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31)))) -} - -// EncodeRawBytes writes a count-delimited byte buffer to the Buffer. -// This is the format used for the bytes protocol buffer -// type and for embedded messages. -func (p *Buffer) EncodeRawBytes(b []byte) error { - p.EncodeVarint(uint64(len(b))) - p.buf = append(p.buf, b...) - return nil -} - -func sizeRawBytes(b []byte) int { - return sizeVarint(uint64(len(b))) + - len(b) -} - -// EncodeStringBytes writes an encoded string to the Buffer. -// This is the format used for the proto2 string type. -func (p *Buffer) EncodeStringBytes(s string) error { - p.EncodeVarint(uint64(len(s))) - p.buf = append(p.buf, s...) - return nil -} - -func sizeStringBytes(s string) int { - return sizeVarint(uint64(len(s))) + - len(s) -} - -// Marshaler is the interface representing objects that can marshal themselves. -type Marshaler interface { - Marshal() ([]byte, error) -} - -// Marshal takes the protocol buffer -// and encodes it into the wire format, returning the data. -func Marshal(pb Message) ([]byte, error) { - // Can the object marshal itself? - if m, ok := pb.(Marshaler); ok { - return m.Marshal() - } - p := NewBuffer(nil) - err := p.Marshal(pb) - if p.buf == nil && err == nil { - // Return a non-nil slice on success. - return []byte{}, nil - } - return p.buf, err -} - -// EncodeMessage writes the protocol buffer to the Buffer, -// prefixed by a varint-encoded length. -func (p *Buffer) EncodeMessage(pb Message) error { - t, base, err := getbase(pb) - if structPointer_IsNil(base) { - return ErrNil - } - if err == nil { - var state errorState - err = p.enc_len_struct(GetProperties(t.Elem()), base, &state) - } - return err -} - -// Marshal takes the protocol buffer -// and encodes it into the wire format, writing the result to the -// Buffer. -func (p *Buffer) Marshal(pb Message) error { - // Can the object marshal itself? - if m, ok := pb.(Marshaler); ok { - data, err := m.Marshal() - p.buf = append(p.buf, data...) - return err - } - - t, base, err := getbase(pb) - if structPointer_IsNil(base) { - return ErrNil - } - if err == nil { - err = p.enc_struct(GetProperties(t.Elem()), base) - } - - if collectStats { - (stats).Encode++ // Parens are to work around a goimports bug. - } - - if len(p.buf) > maxMarshalSize { - return ErrTooLarge - } - return err -} - -// Size returns the encoded size of a protocol buffer. -func Size(pb Message) (n int) { - // Can the object marshal itself? If so, Size is slow. - // TODO: add Size to Marshaler, or add a Sizer interface. - if m, ok := pb.(Marshaler); ok { - b, _ := m.Marshal() - return len(b) - } - - t, base, err := getbase(pb) - if structPointer_IsNil(base) { - return 0 - } - if err == nil { - n = size_struct(GetProperties(t.Elem()), base) - } - - if collectStats { - (stats).Size++ // Parens are to work around a goimports bug. - } - - return -} - -// Individual type encoders. - -// Encode a bool. -func (o *Buffer) enc_bool(p *Properties, base structPointer) error { - v := *structPointer_Bool(base, p.field) - if v == nil { - return ErrNil - } - x := 0 - if *v { - x = 1 - } - o.buf = append(o.buf, p.tagcode...) - p.valEnc(o, uint64(x)) - return nil -} - -func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error { - v := *structPointer_BoolVal(base, p.field) - if !v { - return ErrNil - } - o.buf = append(o.buf, p.tagcode...) - p.valEnc(o, 1) - return nil -} - -func size_bool(p *Properties, base structPointer) int { - v := *structPointer_Bool(base, p.field) - if v == nil { - return 0 - } - return len(p.tagcode) + 1 // each bool takes exactly one byte -} - -func size_proto3_bool(p *Properties, base structPointer) int { - v := *structPointer_BoolVal(base, p.field) - if !v && !p.oneof { - return 0 - } - return len(p.tagcode) + 1 // each bool takes exactly one byte -} - -// Encode an int32. -func (o *Buffer) enc_int32(p *Properties, base structPointer) error { - v := structPointer_Word32(base, p.field) - if word32_IsNil(v) { - return ErrNil - } - x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range - o.buf = append(o.buf, p.tagcode...) - p.valEnc(o, uint64(x)) - return nil -} - -func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error { - v := structPointer_Word32Val(base, p.field) - x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range - if x == 0 { - return ErrNil - } - o.buf = append(o.buf, p.tagcode...) - p.valEnc(o, uint64(x)) - return nil -} - -func size_int32(p *Properties, base structPointer) (n int) { - v := structPointer_Word32(base, p.field) - if word32_IsNil(v) { - return 0 - } - x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range - n += len(p.tagcode) - n += p.valSize(uint64(x)) - return -} - -func size_proto3_int32(p *Properties, base structPointer) (n int) { - v := structPointer_Word32Val(base, p.field) - x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range - if x == 0 && !p.oneof { - return 0 - } - n += len(p.tagcode) - n += p.valSize(uint64(x)) - return -} - -// Encode a uint32. -// Exactly the same as int32, except for no sign extension. -func (o *Buffer) enc_uint32(p *Properties, base structPointer) error { - v := structPointer_Word32(base, p.field) - if word32_IsNil(v) { - return ErrNil - } - x := word32_Get(v) - o.buf = append(o.buf, p.tagcode...) - p.valEnc(o, uint64(x)) - return nil -} - -func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error { - v := structPointer_Word32Val(base, p.field) - x := word32Val_Get(v) - if x == 0 { - return ErrNil - } - o.buf = append(o.buf, p.tagcode...) - p.valEnc(o, uint64(x)) - return nil -} - -func size_uint32(p *Properties, base structPointer) (n int) { - v := structPointer_Word32(base, p.field) - if word32_IsNil(v) { - return 0 - } - x := word32_Get(v) - n += len(p.tagcode) - n += p.valSize(uint64(x)) - return -} - -func size_proto3_uint32(p *Properties, base structPointer) (n int) { - v := structPointer_Word32Val(base, p.field) - x := word32Val_Get(v) - if x == 0 && !p.oneof { - return 0 - } - n += len(p.tagcode) - n += p.valSize(uint64(x)) - return -} - -// Encode an int64. -func (o *Buffer) enc_int64(p *Properties, base structPointer) error { - v := structPointer_Word64(base, p.field) - if word64_IsNil(v) { - return ErrNil - } - x := word64_Get(v) - o.buf = append(o.buf, p.tagcode...) - p.valEnc(o, x) - return nil -} - -func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error { - v := structPointer_Word64Val(base, p.field) - x := word64Val_Get(v) - if x == 0 { - return ErrNil - } - o.buf = append(o.buf, p.tagcode...) - p.valEnc(o, x) - return nil -} - -func size_int64(p *Properties, base structPointer) (n int) { - v := structPointer_Word64(base, p.field) - if word64_IsNil(v) { - return 0 - } - x := word64_Get(v) - n += len(p.tagcode) - n += p.valSize(x) - return -} - -func size_proto3_int64(p *Properties, base structPointer) (n int) { - v := structPointer_Word64Val(base, p.field) - x := word64Val_Get(v) - if x == 0 && !p.oneof { - return 0 - } - n += len(p.tagcode) - n += p.valSize(x) - return -} - -// Encode a string. -func (o *Buffer) enc_string(p *Properties, base structPointer) error { - v := *structPointer_String(base, p.field) - if v == nil { - return ErrNil - } - x := *v - o.buf = append(o.buf, p.tagcode...) - o.EncodeStringBytes(x) - return nil -} - -func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error { - v := *structPointer_StringVal(base, p.field) - if v == "" { - return ErrNil - } - o.buf = append(o.buf, p.tagcode...) - o.EncodeStringBytes(v) - return nil -} - -func size_string(p *Properties, base structPointer) (n int) { - v := *structPointer_String(base, p.field) - if v == nil { - return 0 - } - x := *v - n += len(p.tagcode) - n += sizeStringBytes(x) - return -} - -func size_proto3_string(p *Properties, base structPointer) (n int) { - v := *structPointer_StringVal(base, p.field) - if v == "" && !p.oneof { - return 0 - } - n += len(p.tagcode) - n += sizeStringBytes(v) - return -} - -// All protocol buffer fields are nillable, but be careful. -func isNil(v reflect.Value) bool { - switch v.Kind() { - case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice: - return v.IsNil() - } - return false -} - -// Encode a message struct. -func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error { - var state errorState - structp := structPointer_GetStructPointer(base, p.field) - if structPointer_IsNil(structp) { - return ErrNil - } - - // Can the object marshal itself? - if p.isMarshaler { - m := structPointer_Interface(structp, p.stype).(Marshaler) - data, err := m.Marshal() - if err != nil && !state.shouldContinue(err, nil) { - return err - } - o.buf = append(o.buf, p.tagcode...) - o.EncodeRawBytes(data) - return state.err - } - - o.buf = append(o.buf, p.tagcode...) - return o.enc_len_struct(p.sprop, structp, &state) -} - -func size_struct_message(p *Properties, base structPointer) int { - structp := structPointer_GetStructPointer(base, p.field) - if structPointer_IsNil(structp) { - return 0 - } - - // Can the object marshal itself? - if p.isMarshaler { - m := structPointer_Interface(structp, p.stype).(Marshaler) - data, _ := m.Marshal() - n0 := len(p.tagcode) - n1 := sizeRawBytes(data) - return n0 + n1 - } - - n0 := len(p.tagcode) - n1 := size_struct(p.sprop, structp) - n2 := sizeVarint(uint64(n1)) // size of encoded length - return n0 + n1 + n2 -} - -// Encode a group struct. -func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error { - var state errorState - b := structPointer_GetStructPointer(base, p.field) - if structPointer_IsNil(b) { - return ErrNil - } - - o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup)) - err := o.enc_struct(p.sprop, b) - if err != nil && !state.shouldContinue(err, nil) { - return err - } - o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup)) - return state.err -} - -func size_struct_group(p *Properties, base structPointer) (n int) { - b := structPointer_GetStructPointer(base, p.field) - if structPointer_IsNil(b) { - return 0 - } - - n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup)) - n += size_struct(p.sprop, b) - n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup)) - return -} - -// Encode a slice of bools ([]bool). -func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error { - s := *structPointer_BoolSlice(base, p.field) - l := len(s) - if l == 0 { - return ErrNil - } - for _, x := range s { - o.buf = append(o.buf, p.tagcode...) - v := uint64(0) - if x { - v = 1 - } - p.valEnc(o, v) - } - return nil -} - -func size_slice_bool(p *Properties, base structPointer) int { - s := *structPointer_BoolSlice(base, p.field) - l := len(s) - if l == 0 { - return 0 - } - return l * (len(p.tagcode) + 1) // each bool takes exactly one byte -} - -// Encode a slice of bools ([]bool) in packed format. -func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error { - s := *structPointer_BoolSlice(base, p.field) - l := len(s) - if l == 0 { - return ErrNil - } - o.buf = append(o.buf, p.tagcode...) - o.EncodeVarint(uint64(l)) // each bool takes exactly one byte - for _, x := range s { - v := uint64(0) - if x { - v = 1 - } - p.valEnc(o, v) - } - return nil -} - -func size_slice_packed_bool(p *Properties, base structPointer) (n int) { - s := *structPointer_BoolSlice(base, p.field) - l := len(s) - if l == 0 { - return 0 - } - n += len(p.tagcode) - n += sizeVarint(uint64(l)) - n += l // each bool takes exactly one byte - return -} - -// Encode a slice of bytes ([]byte). -func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error { - s := *structPointer_Bytes(base, p.field) - if s == nil { - return ErrNil - } - o.buf = append(o.buf, p.tagcode...) - o.EncodeRawBytes(s) - return nil -} - -func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error { - s := *structPointer_Bytes(base, p.field) - if len(s) == 0 { - return ErrNil - } - o.buf = append(o.buf, p.tagcode...) - o.EncodeRawBytes(s) - return nil -} - -func size_slice_byte(p *Properties, base structPointer) (n int) { - s := *structPointer_Bytes(base, p.field) - if s == nil && !p.oneof { - return 0 - } - n += len(p.tagcode) - n += sizeRawBytes(s) - return -} - -func size_proto3_slice_byte(p *Properties, base structPointer) (n int) { - s := *structPointer_Bytes(base, p.field) - if len(s) == 0 && !p.oneof { - return 0 - } - n += len(p.tagcode) - n += sizeRawBytes(s) - return -} - -// Encode a slice of int32s ([]int32). -func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error { - s := structPointer_Word32Slice(base, p.field) - l := s.Len() - if l == 0 { - return ErrNil - } - for i := 0; i < l; i++ { - o.buf = append(o.buf, p.tagcode...) - x := int32(s.Index(i)) // permit sign extension to use full 64-bit range - p.valEnc(o, uint64(x)) - } - return nil -} - -func size_slice_int32(p *Properties, base structPointer) (n int) { - s := structPointer_Word32Slice(base, p.field) - l := s.Len() - if l == 0 { - return 0 - } - for i := 0; i < l; i++ { - n += len(p.tagcode) - x := int32(s.Index(i)) // permit sign extension to use full 64-bit range - n += p.valSize(uint64(x)) - } - return -} - -// Encode a slice of int32s ([]int32) in packed format. -func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error { - s := structPointer_Word32Slice(base, p.field) - l := s.Len() - if l == 0 { - return ErrNil - } - // TODO: Reuse a Buffer. - buf := NewBuffer(nil) - for i := 0; i < l; i++ { - x := int32(s.Index(i)) // permit sign extension to use full 64-bit range - p.valEnc(buf, uint64(x)) - } - - o.buf = append(o.buf, p.tagcode...) - o.EncodeVarint(uint64(len(buf.buf))) - o.buf = append(o.buf, buf.buf...) - return nil -} - -func size_slice_packed_int32(p *Properties, base structPointer) (n int) { - s := structPointer_Word32Slice(base, p.field) - l := s.Len() - if l == 0 { - return 0 - } - var bufSize int - for i := 0; i < l; i++ { - x := int32(s.Index(i)) // permit sign extension to use full 64-bit range - bufSize += p.valSize(uint64(x)) - } - - n += len(p.tagcode) - n += sizeVarint(uint64(bufSize)) - n += bufSize - return -} - -// Encode a slice of uint32s ([]uint32). -// Exactly the same as int32, except for no sign extension. -func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error { - s := structPointer_Word32Slice(base, p.field) - l := s.Len() - if l == 0 { - return ErrNil - } - for i := 0; i < l; i++ { - o.buf = append(o.buf, p.tagcode...) - x := s.Index(i) - p.valEnc(o, uint64(x)) - } - return nil -} - -func size_slice_uint32(p *Properties, base structPointer) (n int) { - s := structPointer_Word32Slice(base, p.field) - l := s.Len() - if l == 0 { - return 0 - } - for i := 0; i < l; i++ { - n += len(p.tagcode) - x := s.Index(i) - n += p.valSize(uint64(x)) - } - return -} - -// Encode a slice of uint32s ([]uint32) in packed format. -// Exactly the same as int32, except for no sign extension. -func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error { - s := structPointer_Word32Slice(base, p.field) - l := s.Len() - if l == 0 { - return ErrNil - } - // TODO: Reuse a Buffer. - buf := NewBuffer(nil) - for i := 0; i < l; i++ { - p.valEnc(buf, uint64(s.Index(i))) - } - - o.buf = append(o.buf, p.tagcode...) - o.EncodeVarint(uint64(len(buf.buf))) - o.buf = append(o.buf, buf.buf...) - return nil -} - -func size_slice_packed_uint32(p *Properties, base structPointer) (n int) { - s := structPointer_Word32Slice(base, p.field) - l := s.Len() - if l == 0 { - return 0 - } - var bufSize int - for i := 0; i < l; i++ { - bufSize += p.valSize(uint64(s.Index(i))) - } - - n += len(p.tagcode) - n += sizeVarint(uint64(bufSize)) - n += bufSize - return -} - -// Encode a slice of int64s ([]int64). -func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error { - s := structPointer_Word64Slice(base, p.field) - l := s.Len() - if l == 0 { - return ErrNil - } - for i := 0; i < l; i++ { - o.buf = append(o.buf, p.tagcode...) - p.valEnc(o, s.Index(i)) - } - return nil -} - -func size_slice_int64(p *Properties, base structPointer) (n int) { - s := structPointer_Word64Slice(base, p.field) - l := s.Len() - if l == 0 { - return 0 - } - for i := 0; i < l; i++ { - n += len(p.tagcode) - n += p.valSize(s.Index(i)) - } - return -} - -// Encode a slice of int64s ([]int64) in packed format. -func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error { - s := structPointer_Word64Slice(base, p.field) - l := s.Len() - if l == 0 { - return ErrNil - } - // TODO: Reuse a Buffer. - buf := NewBuffer(nil) - for i := 0; i < l; i++ { - p.valEnc(buf, s.Index(i)) - } - - o.buf = append(o.buf, p.tagcode...) - o.EncodeVarint(uint64(len(buf.buf))) - o.buf = append(o.buf, buf.buf...) - return nil -} - -func size_slice_packed_int64(p *Properties, base structPointer) (n int) { - s := structPointer_Word64Slice(base, p.field) - l := s.Len() - if l == 0 { - return 0 - } - var bufSize int - for i := 0; i < l; i++ { - bufSize += p.valSize(s.Index(i)) - } - - n += len(p.tagcode) - n += sizeVarint(uint64(bufSize)) - n += bufSize - return -} - -// Encode a slice of slice of bytes ([][]byte). -func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error { - ss := *structPointer_BytesSlice(base, p.field) - l := len(ss) - if l == 0 { - return ErrNil - } - for i := 0; i < l; i++ { - o.buf = append(o.buf, p.tagcode...) - o.EncodeRawBytes(ss[i]) - } - return nil -} - -func size_slice_slice_byte(p *Properties, base structPointer) (n int) { - ss := *structPointer_BytesSlice(base, p.field) - l := len(ss) - if l == 0 { - return 0 - } - n += l * len(p.tagcode) - for i := 0; i < l; i++ { - n += sizeRawBytes(ss[i]) - } - return -} - -// Encode a slice of strings ([]string). -func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error { - ss := *structPointer_StringSlice(base, p.field) - l := len(ss) - for i := 0; i < l; i++ { - o.buf = append(o.buf, p.tagcode...) - o.EncodeStringBytes(ss[i]) - } - return nil -} - -func size_slice_string(p *Properties, base structPointer) (n int) { - ss := *structPointer_StringSlice(base, p.field) - l := len(ss) - n += l * len(p.tagcode) - for i := 0; i < l; i++ { - n += sizeStringBytes(ss[i]) - } - return -} - -// Encode a slice of message structs ([]*struct). -func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error { - var state errorState - s := structPointer_StructPointerSlice(base, p.field) - l := s.Len() - - for i := 0; i < l; i++ { - structp := s.Index(i) - if structPointer_IsNil(structp) { - return errRepeatedHasNil - } - - // Can the object marshal itself? - if p.isMarshaler { - m := structPointer_Interface(structp, p.stype).(Marshaler) - data, err := m.Marshal() - if err != nil && !state.shouldContinue(err, nil) { - return err - } - o.buf = append(o.buf, p.tagcode...) - o.EncodeRawBytes(data) - continue - } - - o.buf = append(o.buf, p.tagcode...) - err := o.enc_len_struct(p.sprop, structp, &state) - if err != nil && !state.shouldContinue(err, nil) { - if err == ErrNil { - return errRepeatedHasNil - } - return err - } - } - return state.err -} - -func size_slice_struct_message(p *Properties, base structPointer) (n int) { - s := structPointer_StructPointerSlice(base, p.field) - l := s.Len() - n += l * len(p.tagcode) - for i := 0; i < l; i++ { - structp := s.Index(i) - if structPointer_IsNil(structp) { - return // return the size up to this point - } - - // Can the object marshal itself? - if p.isMarshaler { - m := structPointer_Interface(structp, p.stype).(Marshaler) - data, _ := m.Marshal() - n += sizeRawBytes(data) - continue - } - - n0 := size_struct(p.sprop, structp) - n1 := sizeVarint(uint64(n0)) // size of encoded length - n += n0 + n1 - } - return -} - -// Encode a slice of group structs ([]*struct). -func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error { - var state errorState - s := structPointer_StructPointerSlice(base, p.field) - l := s.Len() - - for i := 0; i < l; i++ { - b := s.Index(i) - if structPointer_IsNil(b) { - return errRepeatedHasNil - } - - o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup)) - - err := o.enc_struct(p.sprop, b) - - if err != nil && !state.shouldContinue(err, nil) { - if err == ErrNil { - return errRepeatedHasNil - } - return err - } - - o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup)) - } - return state.err -} - -func size_slice_struct_group(p *Properties, base structPointer) (n int) { - s := structPointer_StructPointerSlice(base, p.field) - l := s.Len() - - n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup)) - n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup)) - for i := 0; i < l; i++ { - b := s.Index(i) - if structPointer_IsNil(b) { - return // return size up to this point - } - - n += size_struct(p.sprop, b) - } - return -} - -// Encode an extension map. -func (o *Buffer) enc_map(p *Properties, base structPointer) error { - exts := structPointer_ExtMap(base, p.field) - if err := encodeExtensionsMap(*exts); err != nil { - return err - } - - return o.enc_map_body(*exts) -} - -func (o *Buffer) enc_exts(p *Properties, base structPointer) error { - exts := structPointer_Extensions(base, p.field) - - v, mu := exts.extensionsRead() - if v == nil { - return nil - } - - mu.Lock() - defer mu.Unlock() - if err := encodeExtensionsMap(v); err != nil { - return err - } - - return o.enc_map_body(v) -} - -func (o *Buffer) enc_map_body(v map[int32]Extension) error { - // Fast-path for common cases: zero or one extensions. - if len(v) <= 1 { - for _, e := range v { - o.buf = append(o.buf, e.enc...) - } - return nil - } - - // Sort keys to provide a deterministic encoding. - keys := make([]int, 0, len(v)) - for k := range v { - keys = append(keys, int(k)) - } - sort.Ints(keys) - - for _, k := range keys { - o.buf = append(o.buf, v[int32(k)].enc...) - } - return nil -} - -func size_map(p *Properties, base structPointer) int { - v := structPointer_ExtMap(base, p.field) - return extensionsMapSize(*v) -} - -func size_exts(p *Properties, base structPointer) int { - v := structPointer_Extensions(base, p.field) - return extensionsSize(v) -} - -// Encode a map field. -func (o *Buffer) enc_new_map(p *Properties, base structPointer) error { - var state errorState // XXX: or do we need to plumb this through? - - /* - A map defined as - map| - | github.com/gorilla | -golang.org/x/net | -
|---|---|---|
| RFC 6455 Features | ||
| Passes Autobahn Test Suite | Yes | No |
| Receive fragmented message | Yes | No, see note 1 |
| Send close message | Yes | No |
| Send pings and receive pongs | Yes | No |
| Get the type of a received data message | Yes | Yes, see note 2 |
| Other Features | ||
| Compression Extensions | Experimental | No |
| Read message using io.Reader | Yes | No, see note 3 |
| Write message using io.WriteCloser | Yes | No, see note 3 |
-
-```
-
-To pass through mostly unaltered (it gained a rel="nofollow" which is a good thing for user generated content):
-```html
-
-
-
-```
-
-It protects sites from [XSS](http://en.wikipedia.org/wiki/Cross-site_scripting) attacks. There are many [vectors for an XSS attack](https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet) and the best way to mitigate the risk is to sanitize user input against a known safe list of HTML elements and attributes.
-
-You should **always** run bluemonday **after** any other processing.
-
-If you use [blackfriday](https://github.com/russross/blackfriday) or [Pandoc](http://johnmacfarlane.net/pandoc/) then bluemonday should be run after these steps. This ensures that no insecure HTML is introduced later in your process.
-
-bluemonday is heavily inspired by both the [OWASP Java HTML Sanitizer](https://code.google.com/p/owasp-java-html-sanitizer/) and the [HTML Purifier](http://htmlpurifier.org/).
-
-## Technical Summary
-
-Whitelist based, you need to either build a policy describing the HTML elements and attributes to permit (and the `regexp` patterns of attributes), or use one of the supplied policies representing good defaults.
-
-The policy containing the whitelist is applied using a fast non-validating, forward only, token-based parser implemented in the [Go net/html library](https://godoc.org/golang.org/x/net/html) by the core Go team.
-
-We expect to be supplied with well-formatted HTML (closing elements for every applicable open element, nested correctly) and so we do not focus on repairing badly nested or incomplete HTML. We focus on simply ensuring that whatever elements do exist are described in the policy whitelist and that attributes and links are safe for use on your web page. [GIGO](http://en.wikipedia.org/wiki/Garbage_in,_garbage_out) does apply and if you feed it bad HTML bluemonday is not tasked with figuring out how to make it good again.
-
-### Supported Go Versions
-
-bluemonday is regularly tested against Go 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7 and tip.
-
-We do not support Go 1.0 as we depend on `golang.org/x/net/html` which includes a reference to `io.ErrNoProgress` which did not exist in Go 1.0.
-
-## Is it production ready?
-
-*Yes*
-
-We are using bluemonday in production having migrated from the widely used and heavily field tested OWASP Java HTML Sanitizer.
-
-We are passing our extensive test suite (including AntiSamy tests as well as tests for any issues raised). Check for any [unresolved issues](https://github.com/microcosm-cc/bluemonday/issues?page=1&state=open) to see whether anything may be a blocker for you.
-
-We invite pull requests and issues to help us ensure we are offering comprehensive protection against various attacks via user generated content.
-
-## Usage
-
-Install in your `${GOPATH}` using `go get -u github.com/microcosm-cc/bluemonday`
-
-Then call it:
-```go
-package main
-
-import (
- "fmt"
-
- "github.com/microcosm-cc/bluemonday"
-)
-
-func main() {
- p := bluemonday.UGCPolicy()
- html := p.Sanitize(
- `Google`,
- )
-
- // Output:
- // Google
- fmt.Println(html)
-}
-```
-
-We offer three ways to call Sanitize:
-```go
-p.Sanitize(string) string
-p.SanitizeBytes([]byte) []byte
-p.SanitizeReader(io.Reader) bytes.Buffer
-```
-
-If you are obsessed about performance, `p.SanitizeReader(r).Bytes()` will return a `[]byte` without performing any unnecessary casting of the inputs or outputs. Though the difference is so negligible you should never need to care.
-
-You can build your own policies:
-```go
-package main
-
-import (
- "fmt"
-
- "github.com/microcosm-cc/bluemonday"
-)
-
-func main() {
- p := bluemonday.NewPolicy()
-
- // Require URLs to be parseable by net/url.Parse and either:
- // mailto: http:// or https://
- p.AllowStandardURLs()
-
- // We only allow and
- p.AllowAttrs("href").OnElements("a")
- p.AllowElements("p")
-
- html := p.Sanitize(
- `Google`,
- )
-
- // Output:
- // Google
- fmt.Println(html)
-}
-```
-
-We ship two default policies:
-
-1. `bluemonday.StrictPolicy()` which can be thought of as equivalent to stripping all HTML elements and their attributes as it has nothing on it's whitelist. An example usage scenario would be blog post titles where HTML tags are not expected at all and if they are then the elements *and* the content of the elements should be stripped. This is a *very* strict policy.
-2. `bluemonday.UGCPolicy()` which allows a broad selection of HTML elements and attributes that are safe for user generated content. Note that this policy does *not* whitelist iframes, object, embed, styles, script, etc. An example usage scenario would be blog post bodies where a variety of formatting is expected along with the potential for TABLEs and IMGs.
-
-## Policy Building
-
-The essence of building a policy is to determine which HTML elements and attributes are considered safe for your scenario. OWASP provide an [XSS prevention cheat sheet](https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet) to help explain the risks, but essentially:
-
-1. Avoid anything other than the standard HTML elements
-1. Avoid `script`, `style`, `iframe`, `object`, `embed`, `base` elements that allow code to be executed by the client or third party content to be included that can execute code
-1. Avoid anything other than plain HTML attributes with values matched to a regexp
-
-Basically, you should be able to describe what HTML is fine for your scenario. If you do not have confidence that you can describe your policy please consider using one of the shipped policies such as `bluemonday.UGCPolicy()`.
-
-To create a new policy:
-```go
-p := bluemonday.NewPolicy()
-```
-
-To add elements to a policy either add just the elements:
-```go
-p.AllowElements("b", "strong")
-```
-
-Or add elements as a virtue of adding an attribute:
-```go
-// Not the recommended pattern, see the recommendation on using .Matching() below
-p.AllowAttrs("nowrap").OnElements("td", "th")
-```
-
-Attributes can either be added to all elements:
-```go
-p.AllowAttrs("dir").Matching(regexp.MustCompile("(?i)rtl|ltr")).Globally()
-```
-
-Or attributes can be added to specific elements:
-```go
-// Not the recommended pattern, see the recommendation on using .Matching() below
-p.AllowAttrs("value").OnElements("li")
-```
-
-It is **always** recommended that an attribute be made to match a pattern. XSS in HTML attributes is very easy otherwise:
-```go
-// \p{L} matches unicode letters, \p{N} matches unicode numbers
-p.AllowAttrs("title").Matching(regexp.MustCompile(`[\p{L}\p{N}\s\-_',:\[\]!\./\\\(\)&]*`)).Globally()
-```
-
-You can stop at any time and call .Sanitize():
-```go
-// string htmlIn passed in from a HTTP POST
-htmlOut := p.Sanitize(htmlIn)
-```
-
-And you can take any existing policy and extend it:
-```go
-p := bluemonday.UGCPolicy()
-p.AllowElements("fieldset", "select", "option")
-```
-
-### Links
-
-Links are difficult beasts to sanitise safely and also one of the biggest attack vectors for malicious content.
-
-It is possible to do this:
-```go
-p.AllowAttrs("href").Matching(regexp.MustCompile(`(?i)mailto|https?`)).OnElements("a")
-```
-
-But that will not protect you as the regular expression is insufficient in this case to have prevented a malformed value doing something unexpected.
-
-We provide some additional global options for safely working with links.
-
-`RequireParseableURLs` will ensure that URLs are parseable by Go's `net/url` package:
-```go
-p.RequireParseableURLs(true)
-```
-
-If you have enabled parseable URLs then the following option will `AllowRelativeURLs`. By default this is disabled (bluemonday is a whitelist tool... you need to explicitly tell us to permit things) and when disabled it will prevent all local and scheme relative URLs (i.e. `href="localpage.html"`, `href="../home.html"` and even `href="//www.google.com"` are relative):
-```go
-p.AllowRelativeURLs(true)
-```
-
-If you have enabled parseable URLs then you can whitelist the schemes (commonly called protocol when thinking of `http` and `https`) that are permitted. Bear in mind that allowing relative URLs in the above option will allow for a blank scheme:
-```go
-p.AllowURLSchemes("mailto", "http", "https")
-```
-
-Regardless of whether you have enabled parseable URLs, you can force all URLs to have a rel="nofollow" attribute. This will be added if it does not exist, but only when the `href` is valid:
-```go
-// This applies to "a" "area" "link" elements that have a "href" attribute
-p.RequireNoFollowOnLinks(true)
-```
-
-We provide a convenience method that applies all of the above, but you will still need to whitelist the linkable elements for the URL rules to be applied to:
-```go
-p.AllowStandardURLs()
-p.AllowAttrs("cite").OnElements("blockquote", "q")
-p.AllowAttrs("href").OnElements("a", "area")
-p.AllowAttrs("src").OnElements("img")
-```
-
-An additional complexity regarding links is the data URI as defined in [RFC2397](http://tools.ietf.org/html/rfc2397). The data URI allows for images to be served inline using this format:
-
-```html
- Hello World
-```
-
-We have provided a helper to verify the mimetype followed by base64 content of data URIs links:
-
-```go
-p.AllowDataURIImages()
-```
-
-That helper will enable GIF, JPEG, PNG and WEBP images.
-
-It should be noted that there is a potential [security](http://palizine.plynt.com/issues/2010Oct/bypass-xss-filters/) [risk](https://capec.mitre.org/data/definitions/244.html) with the use of data URI links. You should only enable data URI links if you already trust the content.
-
-We also have some features to help deal with user generated content:
-```go
-p.AddTargetBlankToFullyQualifiedLinks(true)
-```
-
-This will ensure that anchor `` links that are fully qualified (the href destination includes a host name) will get `target="_blank"` added to them.
-
-Additionally any link that has `target="_blank"` after the policy has been applied will also have the `rel` attribute adjusted to add `noopener`. This means a link may start like `` and will end up as ``. It is important to note that the addition of `noopener` is a security feature and not an issue. There is an unfortunate feature to browsers that a browser window opened as a result of `target="_blank"` can still control the opener (your web page) and this protects against that. The background to this can be found here: [https://dev.to/ben/the-targetblank-vulnerability-by-example](https://dev.to/ben/the-targetblank-vulnerability-by-example)
-
-### Policy Building Helpers
-
-We also bundle some helpers to simplify policy building:
-```go
-
-// Permits the "dir", "id", "lang", "title" attributes globally
-p.AllowStandardAttributes()
-
-// Permits the "img" element and it's standard attributes
-p.AllowImages()
-
-// Permits ordered and unordered lists, and also definition lists
-p.AllowLists()
-
-// Permits HTML tables and all applicable elements and non-styling attributes
-p.AllowTables()
-```
-
-### Invalid Instructions
-
-The following are invalid:
-```go
-// This does not say where the attributes are allowed, you need to add
-// .Globally() or .OnElements(...)
-// This will be ignored without error.
-p.AllowAttrs("value")
-
-// This does not say where the attributes are allowed, you need to add
-// .Globally() or .OnElements(...)
-// This will be ignored without error.
-p.AllowAttrs(
- "type",
-).Matching(
- regexp.MustCompile("(?i)^(circle|disc|square|a|A|i|I|1)$"),
-)
-```
-
-Both examples exhibit the same issue, they declare attributes but do not then specify whether they are whitelisted globally or only on specific elements (and which elements). Attributes belong to one or more elements, and the policy needs to declare this.
-
-## Limitations
-
-We are not yet including any tools to help whitelist and sanitize CSS. Which means that unless you wish to do the heavy lifting in a single regular expression (inadvisable), **you should not allow the "style" attribute anywhere**.
-
-It is not the job of bluemonday to fix your bad HTML, it is merely the job of bluemonday to prevent malicious HTML getting through. If you have mismatched HTML elements, or non-conforming nesting of elements, those will remain. But if you have well-structured HTML bluemonday will not break it.
-
-## TODO
-
-* Add support for CSS sanitisation to allow some CSS properties based on a whitelist, possibly using the [Gorilla CSS3 scanner](http://www.gorillatoolkit.org/pkg/css/scanner)
-* Investigate whether devs want to blacklist elements and attributes. This would allow devs to take an existing policy (such as the `bluemonday.UGCPolicy()` ) that encapsulates 90% of what they're looking for but does more than they need, and to remove the extra things they do not want to make it 100% what they want
-* Investigate whether devs want a validating HTML mode, in which the HTML elements are not just transformed into a balanced tree (every start tag has a closing tag at the correct depth) but also that elements and character data appear only in their allowed context (i.e. that a `table` element isn't a descendent of a `caption`, that `colgroup`, `thead`, `tbody`, `tfoot` and `tr` are permitted, and that character data is not permitted)
-
-## Development
-
-If you have cloned this repo you will probably need the dependency:
-
-`go get golang.org/x/net/html`
-
-Gophers can use their familiar tools:
-
-`go build`
-
-`go test`
-
-I personally use a Makefile as it spares typing the same args over and over whilst providing consistency for those of us who jump from language to language and enjoy just typing `make` in a project directory and watch magic happen.
-
-`make` will build, vet, test and install the library.
-
-`make clean` will remove the library from a *single* `${GOPATH}/pkg` directory tree
-
-`make test` will run the tests
-
-`make cover` will run the tests and *open a browser window* with the coverage report
-
-`make lint` will run golint (install via `go get github.com/golang/lint/golint`)
-
-## Long term goals
-
-1. Open the code to adversarial peer review similar to the [Attack Review Ground Rules](https://code.google.com/p/owasp-java-html-sanitizer/wiki/AttackReviewGroundRules)
-1. Raise funds and pay for an external security review
diff --git a/vendor/github.com/microcosm-cc/bluemonday/doc.go b/vendor/github.com/microcosm-cc/bluemonday/doc.go
deleted file mode 100644
index 2cb0a36..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/doc.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) 2014, David Kitchen
-
-
-To pass through mostly unaltered (it gained a rel="nofollow"):
-
-
-
-
-
-The primary purpose of bluemonday is to take potentially unsafe user generated
-content (from things like Markdown, HTML WYSIWYG tools, etc) and make it safe
-for you to put on your website.
-
-It protects sites against XSS (http://en.wikipedia.org/wiki/Cross-site_scripting)
-and other malicious content that a user interface may deliver. There are many
-vectors for an XSS attack (https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet)
-and the safest thing to do is to sanitize user input against a known safe list
-of HTML elements and attributes.
-
-Note: You should always run bluemonday after any other processing.
-
-If you use blackfriday (https://github.com/russross/blackfriday) or
-Pandoc (http://johnmacfarlane.net/pandoc/) then bluemonday should be run after
-these steps. This ensures that no insecure HTML is introduced later in your
-process.
-
-bluemonday is heavily inspired by both the OWASP Java HTML Sanitizer
-(https://code.google.com/p/owasp-java-html-sanitizer/) and the HTML Purifier
-(http://htmlpurifier.org/).
-
-We ship two default policies, one is bluemonday.StrictPolicy() and can be
-thought of as equivalent to stripping all HTML elements and their attributes as
-it has nothing on it's whitelist.
-
-The other is bluemonday.UGCPolicy() and allows a broad selection of HTML
-elements and attributes that are safe for user generated content. Note that
-this policy does not whitelist iframes, object, embed, styles, script, etc.
-
-The essence of building a policy is to determine which HTML elements and
-attributes are considered safe for your scenario. OWASP provide an XSS
-prevention cheat sheet ( https://www.google.com/search?q=xss+prevention+cheat+sheet )
-to help explain the risks, but essentially:
-
- 1. Avoid whitelisting anything other than plain HTML elements
- 2. Avoid whitelisting `script`, `style`, `iframe`, `object`, `embed`, `base`
- elements
- 3. Avoid whitelisting anything other than plain HTML elements with simple
- values that you can match to a regexp
-*/
-package bluemonday
diff --git a/vendor/github.com/microcosm-cc/bluemonday/helpers.go b/vendor/github.com/microcosm-cc/bluemonday/helpers.go
deleted file mode 100644
index dfa5868..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/helpers.go
+++ /dev/null
@@ -1,297 +0,0 @@
-// Copyright (c) 2014, David Kitchen . To prevent those being removed we maintain
- // a list of elements that are allowed to have no attributes and that will
- // be maintained in the output HTML.
- setOfElementsAllowedWithoutAttrs map[string]struct{}
-
- setOfElementsToSkipContent map[string]struct{}
-}
-
-type attrPolicy struct {
-
- // optional pattern to match, when not nil the regexp needs to match
- // otherwise the attribute is removed
- regexp *regexp.Regexp
-}
-
-type attrPolicyBuilder struct {
- p *Policy
-
- attrNames []string
- regexp *regexp.Regexp
- allowEmpty bool
-}
-
-type urlPolicy func(url *url.URL) (allowUrl bool)
-
-// init initializes the maps if this has not been done already
-func (p *Policy) init() {
- if !p.initialized {
- p.elsAndAttrs = make(map[string]map[string]attrPolicy)
- p.globalAttrs = make(map[string]attrPolicy)
- p.allowURLSchemes = make(map[string]urlPolicy)
- p.setOfElementsAllowedWithoutAttrs = make(map[string]struct{})
- p.setOfElementsToSkipContent = make(map[string]struct{})
- p.initialized = true
- }
-}
-
-// NewPolicy returns a blank policy with nothing whitelisted or permitted. This
-// is the recommended way to start building a policy and you should now use
-// AllowAttrs() and/or AllowElements() to construct the whitelist of HTML
-// elements and attributes.
-func NewPolicy() *Policy {
-
- p := Policy{}
-
- p.addDefaultElementsWithoutAttrs()
- p.addDefaultSkipElementContent()
-
- return &p
-}
-
-// AllowAttrs takes a range of HTML attribute names and returns an
-// attribute policy builder that allows you to specify the pattern and scope of
-// the whitelisted attribute.
-//
-// The attribute policy is only added to the core policy when either Globally()
-// or OnElements(...) are called.
-func (p *Policy) AllowAttrs(attrNames ...string) *attrPolicyBuilder {
-
- p.init()
-
- abp := attrPolicyBuilder{
- p: p,
- allowEmpty: false,
- }
-
- for _, attrName := range attrNames {
- abp.attrNames = append(abp.attrNames, strings.ToLower(attrName))
- }
-
- return &abp
-}
-
-// AllowNoAttrs says that attributes on element are optional.
-//
-// The attribute policy is only added to the core policy when OnElements(...)
-// are called.
-func (p *Policy) AllowNoAttrs() *attrPolicyBuilder {
-
- p.init()
-
- abp := attrPolicyBuilder{
- p: p,
- allowEmpty: true,
- }
- return &abp
-}
-
-// AllowNoAttrs says that attributes on element are optional.
-//
-// The attribute policy is only added to the core policy when OnElements(...)
-// are called.
-func (abp *attrPolicyBuilder) AllowNoAttrs() *attrPolicyBuilder {
-
- abp.allowEmpty = true
-
- return abp
-}
-
-// Matching allows a regular expression to be applied to a nascent attribute
-// policy, and returns the attribute policy. Calling this more than once will
-// replace the existing regexp.
-func (abp *attrPolicyBuilder) Matching(regex *regexp.Regexp) *attrPolicyBuilder {
-
- abp.regexp = regex
-
- return abp
-}
-
-// OnElements will bind an attribute policy to a given range of HTML elements
-// and return the updated policy
-func (abp *attrPolicyBuilder) OnElements(elements ...string) *Policy {
-
- for _, element := range elements {
- element = strings.ToLower(element)
-
- for _, attr := range abp.attrNames {
-
- if _, ok := abp.p.elsAndAttrs[element]; !ok {
- abp.p.elsAndAttrs[element] = make(map[string]attrPolicy)
- }
-
- ap := attrPolicy{}
- if abp.regexp != nil {
- ap.regexp = abp.regexp
- }
-
- abp.p.elsAndAttrs[element][attr] = ap
- }
-
- if abp.allowEmpty {
- abp.p.setOfElementsAllowedWithoutAttrs[element] = struct{}{}
-
- if _, ok := abp.p.elsAndAttrs[element]; !ok {
- abp.p.elsAndAttrs[element] = make(map[string]attrPolicy)
- }
- }
- }
-
- return abp.p
-}
-
-// Globally will bind an attribute policy to all HTML elements and return the
-// updated policy
-func (abp *attrPolicyBuilder) Globally() *Policy {
-
- for _, attr := range abp.attrNames {
- if _, ok := abp.p.globalAttrs[attr]; !ok {
- abp.p.globalAttrs[attr] = attrPolicy{}
- }
-
- ap := attrPolicy{}
- if abp.regexp != nil {
- ap.regexp = abp.regexp
- }
-
- abp.p.globalAttrs[attr] = ap
- }
-
- return abp.p
-}
-
-// AllowElements will append HTML elements to the whitelist without applying an
-// attribute policy to those elements (the elements are permitted
-// sans-attributes)
-func (p *Policy) AllowElements(names ...string) *Policy {
- p.init()
-
- for _, element := range names {
- element = strings.ToLower(element)
-
- if _, ok := p.elsAndAttrs[element]; !ok {
- p.elsAndAttrs[element] = make(map[string]attrPolicy)
- }
- }
-
- return p
-}
-
-// RequireNoFollowOnLinks will result in all tags having a rel="nofollow"
-// added to them if one does not already exist
-//
-// Note: This requires p.RequireParseableURLs(true) and will enable it.
-func (p *Policy) RequireNoFollowOnLinks(require bool) *Policy {
-
- p.requireNoFollow = require
- p.requireParseableURLs = true
-
- return p
-}
-
-// RequireNoFollowOnFullyQualifiedLinks will result in all tags that point
-// to a non-local destination (i.e. starts with a protocol and has a host)
-// having a rel="nofollow" added to them if one does not already exist
-//
-// Note: This requires p.RequireParseableURLs(true) and will enable it.
-func (p *Policy) RequireNoFollowOnFullyQualifiedLinks(require bool) *Policy {
-
- p.requireNoFollowFullyQualifiedLinks = require
- p.requireParseableURLs = true
-
- return p
-}
-
-// AddTargetBlankToFullyQualifiedLinks will result in all tags that point
-// to a non-local destination (i.e. starts with a protocol and has a host)
-// having a target="_blank" added to them if one does not already exist
-//
-// Note: This requires p.RequireParseableURLs(true) and will enable it.
-func (p *Policy) AddTargetBlankToFullyQualifiedLinks(require bool) *Policy {
-
- p.addTargetBlankToFullyQualifiedLinks = require
- p.requireParseableURLs = true
-
- return p
-}
-
-// RequireParseableURLs will result in all URLs requiring that they be parseable
-// by "net/url" url.Parse()
-// This applies to:
-// - a.href
-// - area.href
-// - blockquote.cite
-// - img.src
-// - link.href
-// - script.src
-func (p *Policy) RequireParseableURLs(require bool) *Policy {
-
- p.requireParseableURLs = require
-
- return p
-}
-
-// AllowRelativeURLs enables RequireParseableURLs and then permits URLs that
-// are parseable, have no schema information and url.IsAbs() returns false
-// This permits local URLs
-func (p *Policy) AllowRelativeURLs(require bool) *Policy {
-
- p.RequireParseableURLs(true)
- p.allowRelativeURLs = require
-
- return p
-}
-
-// AllowURLSchemes will append URL schemes to the whitelist
-// Example: p.AllowURLSchemes("mailto", "http", "https")
-func (p *Policy) AllowURLSchemes(schemes ...string) *Policy {
- p.init()
-
- p.RequireParseableURLs(true)
-
- for _, scheme := range schemes {
- scheme = strings.ToLower(scheme)
-
- // Allow all URLs with matching scheme.
- p.allowURLSchemes[scheme] = nil
- }
-
- return p
-}
-
-// AllowURLSchemeWithCustomPolicy will append URL schemes with
-// a custom URL policy to the whitelist.
-// Only the URLs with matching schema and urlPolicy(url)
-// returning true will be allowed.
-func (p *Policy) AllowURLSchemeWithCustomPolicy(
- scheme string,
- urlPolicy func(url *url.URL) (allowUrl bool),
-) *Policy {
-
- p.init()
-
- p.RequireParseableURLs(true)
-
- scheme = strings.ToLower(scheme)
-
- p.allowURLSchemes[scheme] = urlPolicy
-
- return p
-}
-
-// AllowDocType states whether the HTML sanitised by the sanitizer is allowed to
-// contain the HTML DocType tag: or one of it's variants.
-//
-// The HTML spec only permits one doctype per document, and as you know how you
-// are using the output of this, you know best as to whether we should ignore it
-// (default) or not.
-//
-// If you are sanitizing a HTML fragment the default (false) is fine.
-func (p *Policy) AllowDocType(allow bool) *Policy {
-
- p.allowDocType = allow
-
- return p
-}
-
-// AddSpaceWhenStrippingTag states whether to add a single space " " when
-// removing tags that are not whitelisted by the policy.
-//
-// This is useful if you expect to strip tags in dense markup and may lose the
-// value of whitespace.
-//
-// For example: "
is valid, but isn't valid as the "dir" attr
-// is mandatory
-func (p *Policy) addDefaultElementsWithoutAttrs() {
- p.init()
-
- p.setOfElementsAllowedWithoutAttrs["abbr"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["acronym"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["article"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["aside"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["audio"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["b"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["bdi"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["blockquote"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["body"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["br"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["button"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["canvas"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["caption"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["cite"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["code"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["col"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["colgroup"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["datalist"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["dd"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["del"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["details"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["dfn"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["div"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["dl"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["dt"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["em"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["fieldset"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["figcaption"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["figure"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["footer"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["h1"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["h2"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["h3"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["h4"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["h5"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["h6"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["head"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["header"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["hgroup"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["hr"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["html"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["i"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["ins"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["kbd"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["li"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["mark"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["nav"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["ol"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["optgroup"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["option"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["p"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["pre"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["q"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["rp"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["rt"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["ruby"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["s"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["samp"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["section"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["select"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["small"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["span"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["strike"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["strong"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["style"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["sub"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["summary"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["sup"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["svg"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["table"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["tbody"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["td"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["textarea"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["tfoot"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["th"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["thead"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["title"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["time"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["tr"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["tt"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["u"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["ul"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["var"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["video"] = struct{}{}
- p.setOfElementsAllowedWithoutAttrs["wbr"] = struct{}{}
-
-}
-
-// addDefaultSkipElementContent adds the HTML elements that we should skip
-// rendering the character content of, if the element itself is not allowed.
-// This is all character data that the end user would not normally see.
-// i.e. if we exclude a tag.
-func (p *Policy) addDefaultSkipElementContent() {
- p.init()
-
- p.setOfElementsToSkipContent["frame"] = struct{}{}
- p.setOfElementsToSkipContent["frameset"] = struct{}{}
- p.setOfElementsToSkipContent["iframe"] = struct{}{}
- p.setOfElementsToSkipContent["noembed"] = struct{}{}
- p.setOfElementsToSkipContent["noframes"] = struct{}{}
- p.setOfElementsToSkipContent["noscript"] = struct{}{}
- p.setOfElementsToSkipContent["nostyle"] = struct{}{}
- p.setOfElementsToSkipContent["object"] = struct{}{}
- p.setOfElementsToSkipContent["script"] = struct{}{}
- p.setOfElementsToSkipContent["style"] = struct{}{}
- p.setOfElementsToSkipContent["title"] = struct{}{}
-}
diff --git a/vendor/github.com/microcosm-cc/bluemonday/sanitize.go b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go
deleted file mode 100644
index 1d98a4e..0000000
--- a/vendor/github.com/microcosm-cc/bluemonday/sanitize.go
+++ /dev/null
@@ -1,539 +0,0 @@
-// Copyright (c) 2014, David Kitchen
- // ...
- //
- if data[0] == '<' {
- if i := p.html(out, data, true); i > 0 {
- data = data[i:]
- continue
- }
- }
-
- // title block
- //
- // % stuff
- // % more stuff
- // % even more stuff
- if p.flags&EXTENSION_TITLEBLOCK != 0 {
- if data[0] == '%' {
- if i := p.titleBlock(out, data, true); i > 0 {
- data = data[i:]
- continue
- }
- }
- }
-
- // blank lines. note: returns the # of bytes to skip
- if i := p.isEmpty(data); i > 0 {
- data = data[i:]
- continue
- }
-
- // indented code block:
- //
- // func max(a, b int) int {
- // if a > b {
- // return a
- // }
- // return b
- // }
- if p.codePrefix(data) > 0 {
- data = data[p.code(out, data):]
- continue
- }
-
- // fenced code block:
- //
- // ``` go
- // func fact(n int) int {
- // if n <= 1 {
- // return n
- // }
- // return n * fact(n-1)
- // }
- // ```
- if p.flags&EXTENSION_FENCED_CODE != 0 {
- if i := p.fencedCodeBlock(out, data, true); i > 0 {
- data = data[i:]
- continue
- }
- }
-
- // horizontal rule:
- //
- // ------
- // or
- // ******
- // or
- // ______
- if p.isHRule(data) {
- p.r.HRule(out)
- var i int
- for i = 0; data[i] != '\n'; i++ {
- }
- data = data[i:]
- continue
- }
-
- // block quote:
- //
- // > A big quote I found somewhere
- // > on the web
- if p.quotePrefix(data) > 0 {
- data = data[p.quote(out, data):]
- continue
- }
-
- // table:
- //
- // Name | Age | Phone
- // ------|-----|---------
- // Bob | 31 | 555-1234
- // Alice | 27 | 555-4321
- if p.flags&EXTENSION_TABLES != 0 {
- if i := p.table(out, data); i > 0 {
- data = data[i:]
- continue
- }
- }
-
- // an itemized/unordered list:
- //
- // * Item 1
- // * Item 2
- //
- // also works with + or -
- if p.uliPrefix(data) > 0 {
- data = data[p.list(out, data, 0):]
- continue
- }
-
- // a numbered/ordered list:
- //
- // 1. Item 1
- // 2. Item 2
- if p.oliPrefix(data) > 0 {
- data = data[p.list(out, data, LIST_TYPE_ORDERED):]
- continue
- }
-
- // definition lists:
- //
- // Term 1
- // : Definition a
- // : Definition b
- //
- // Term 2
- // : Definition c
- if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
- if p.dliPrefix(data) > 0 {
- data = data[p.list(out, data, LIST_TYPE_DEFINITION):]
- continue
- }
- }
-
- // anything else must look like a normal paragraph
- // note: this finds underlined headers, too
- data = data[p.paragraph(out, data):]
- }
-
- p.nesting--
-}
-
-func (p *parser) isPrefixHeader(data []byte) bool {
- if data[0] != '#' {
- return false
- }
-
- if p.flags&EXTENSION_SPACE_HEADERS != 0 {
- level := 0
- for level < 6 && data[level] == '#' {
- level++
- }
- if data[level] != ' ' {
- return false
- }
- }
- return true
-}
-
-func (p *parser) prefixHeader(out *bytes.Buffer, data []byte) int {
- level := 0
- for level < 6 && data[level] == '#' {
- level++
- }
- i := skipChar(data, level, ' ')
- end := skipUntilChar(data, i, '\n')
- skip := end
- id := ""
- if p.flags&EXTENSION_HEADER_IDS != 0 {
- j, k := 0, 0
- // find start/end of header id
- for j = i; j < end-1 && (data[j] != '{' || data[j+1] != '#'); j++ {
- }
- for k = j + 1; k < end && data[k] != '}'; k++ {
- }
- // extract header id iff found
- if j < end && k < end {
- id = string(data[j+2 : k])
- end = j
- skip = k + 1
- for end > 0 && data[end-1] == ' ' {
- end--
- }
- }
- }
- for end > 0 && data[end-1] == '#' {
- if isBackslashEscaped(data, end-1) {
- break
- }
- end--
- }
- for end > 0 && data[end-1] == ' ' {
- end--
- }
- if end > i {
- if id == "" && p.flags&EXTENSION_AUTO_HEADER_IDS != 0 {
- id = sanitized_anchor_name.Create(string(data[i:end]))
- }
- work := func() bool {
- p.inline(out, data[i:end])
- return true
- }
- p.r.Header(out, work, level, id)
- }
- return skip
-}
-
-func (p *parser) isUnderlinedHeader(data []byte) int {
- // test of level 1 header
- if data[0] == '=' {
- i := skipChar(data, 1, '=')
- i = skipChar(data, i, ' ')
- if data[i] == '\n' {
- return 1
- } else {
- return 0
- }
- }
-
- // test of level 2 header
- if data[0] == '-' {
- i := skipChar(data, 1, '-')
- i = skipChar(data, i, ' ')
- if data[i] == '\n' {
- return 2
- } else {
- return 0
- }
- }
-
- return 0
-}
-
-func (p *parser) titleBlock(out *bytes.Buffer, data []byte, doRender bool) int {
- if data[0] != '%' {
- return 0
- }
- splitData := bytes.Split(data, []byte("\n"))
- var i int
- for idx, b := range splitData {
- if !bytes.HasPrefix(b, []byte("%")) {
- i = idx // - 1
- break
- }
- }
-
- data = bytes.Join(splitData[0:i], []byte("\n"))
- p.r.TitleBlock(out, data)
-
- return len(data)
-}
-
-func (p *parser) html(out *bytes.Buffer, data []byte, doRender bool) int {
- var i, j int
-
- // identify the opening tag
- if data[0] != '<' {
- return 0
- }
- curtag, tagfound := p.htmlFindTag(data[1:])
-
- // handle special cases
- if !tagfound {
- // check for an HTML comment
- if size := p.htmlComment(out, data, doRender); size > 0 {
- return size
- }
-
- // check for an
tag
- if size := p.htmlHr(out, data, doRender); size > 0 {
- return size
- }
-
- // check for HTML CDATA
- if size := p.htmlCDATA(out, data, doRender); size > 0 {
- return size
- }
-
- // no special case recognized
- return 0
- }
-
- // look for an unindented matching closing tag
- // followed by a blank line
- found := false
- /*
- closetag := []byte("\n")
- j = len(curtag) + 1
- for !found {
- // scan for a closing tag at the beginning of a line
- if skip := bytes.Index(data[j:], closetag); skip >= 0 {
- j += skip + len(closetag)
- } else {
- break
- }
-
- // see if it is the only thing on the line
- if skip := p.isEmpty(data[j:]); skip > 0 {
- // see if it is followed by a blank line/eof
- j += skip
- if j >= len(data) {
- found = true
- i = j
- } else {
- if skip := p.isEmpty(data[j:]); skip > 0 {
- j += skip
- found = true
- i = j
- }
- }
- }
- }
- */
-
- // if not found, try a second pass looking for indented match
- // but not if tag is "ins" or "del" (following original Markdown.pl)
- if !found && curtag != "ins" && curtag != "del" {
- i = 1
- for i < len(data) {
- i++
- for i < len(data) && !(data[i-1] == '<' && data[i] == '/') {
- i++
- }
-
- if i+2+len(curtag) >= len(data) {
- break
- }
-
- j = p.htmlFindEnd(curtag, data[i-1:])
-
- if j > 0 {
- i += j - 1
- found = true
- break
- }
- }
- }
-
- if !found {
- return 0
- }
-
- // the end of the block has been found
- if doRender {
- // trim newlines
- end := i
- for end > 0 && data[end-1] == '\n' {
- end--
- }
- p.r.BlockHtml(out, data[:end])
- }
-
- return i
-}
-
-func (p *parser) renderHTMLBlock(out *bytes.Buffer, data []byte, start int, doRender bool) int {
- // html block needs to end with a blank line
- if i := p.isEmpty(data[start:]); i > 0 {
- size := start + i
- if doRender {
- // trim trailing newlines
- end := size
- for end > 0 && data[end-1] == '\n' {
- end--
- }
- p.r.BlockHtml(out, data[:end])
- }
- return size
- }
- return 0
-}
-
-// HTML comment, lax form
-func (p *parser) htmlComment(out *bytes.Buffer, data []byte, doRender bool) int {
- i := p.inlineHTMLComment(out, data)
- return p.renderHTMLBlock(out, data, i, doRender)
-}
-
-// HTML CDATA section
-func (p *parser) htmlCDATA(out *bytes.Buffer, data []byte, doRender bool) int {
- const cdataTag = "') {
- i++
- }
- i++
- // no end-of-comment marker
- if i >= len(data) {
- return 0
- }
- return p.renderHTMLBlock(out, data, i, doRender)
-}
-
-// HR, which is the only self-closing block tag considered
-func (p *parser) htmlHr(out *bytes.Buffer, data []byte, doRender bool) int {
- if data[0] != '<' || (data[1] != 'h' && data[1] != 'H') || (data[2] != 'r' && data[2] != 'R') {
- return 0
- }
- if data[3] != ' ' && data[3] != '/' && data[3] != '>' {
- // not an
tag after all; at least not a valid one
- return 0
- }
-
- i := 3
- for data[i] != '>' && data[i] != '\n' {
- i++
- }
-
- if data[i] == '>' {
- return p.renderHTMLBlock(out, data, i+1, doRender)
- }
-
- return 0
-}
-
-func (p *parser) htmlFindTag(data []byte) (string, bool) {
- i := 0
- for isalnum(data[i]) {
- i++
- }
- key := string(data[:i])
- if _, ok := blockTags[key]; ok {
- return key, true
- }
- return "", false
-}
-
-func (p *parser) htmlFindEnd(tag string, data []byte) int {
- // assume data[0] == '<' && data[1] == '/' already tested
-
- // check if tag is a match
- closetag := []byte("")
- if !bytes.HasPrefix(data, closetag) {
- return 0
- }
- i := len(closetag)
-
- // check that the rest of the line is blank
- skip := 0
- if skip = p.isEmpty(data[i:]); skip == 0 {
- return 0
- }
- i += skip
- skip = 0
-
- if i >= len(data) {
- return i
- }
-
- if p.flags&EXTENSION_LAX_HTML_BLOCKS != 0 {
- return i
- }
- if skip = p.isEmpty(data[i:]); skip == 0 {
- // following line must be blank
- return 0
- }
-
- return i + skip
-}
-
-func (*parser) isEmpty(data []byte) int {
- // it is okay to call isEmpty on an empty buffer
- if len(data) == 0 {
- return 0
- }
-
- var i int
- for i = 0; i < len(data) && data[i] != '\n'; i++ {
- if data[i] != ' ' && data[i] != '\t' {
- return 0
- }
- }
- return i + 1
-}
-
-func (*parser) isHRule(data []byte) bool {
- i := 0
-
- // skip up to three spaces
- for i < 3 && data[i] == ' ' {
- i++
- }
-
- // look at the hrule char
- if data[i] != '*' && data[i] != '-' && data[i] != '_' {
- return false
- }
- c := data[i]
-
- // the whole line must be the char or whitespace
- n := 0
- for data[i] != '\n' {
- switch {
- case data[i] == c:
- n++
- case data[i] != ' ':
- return false
- }
- i++
- }
-
- return n >= 3
-}
-
-// isFenceLine checks if there's a fence line (e.g., ``` or ``` go) at the beginning of data,
-// and returns the end index if so, or 0 otherwise. It also returns the marker found.
-// If syntax is not nil, it gets set to the syntax specified in the fence line.
-// A final newline is mandatory to recognize the fence line, unless newlineOptional is true.
-func isFenceLine(data []byte, syntax *string, oldmarker string, newlineOptional bool) (end int, marker string) {
- i, size := 0, 0
-
- // skip up to three spaces
- for i < len(data) && i < 3 && data[i] == ' ' {
- i++
- }
-
- // check for the marker characters: ~ or `
- if i >= len(data) {
- return 0, ""
- }
- if data[i] != '~' && data[i] != '`' {
- return 0, ""
- }
-
- c := data[i]
-
- // the whole line must be the same char or whitespace
- for i < len(data) && data[i] == c {
- size++
- i++
- }
-
- // the marker char must occur at least 3 times
- if size < 3 {
- return 0, ""
- }
- marker = string(data[i-size : i])
-
- // if this is the end marker, it must match the beginning marker
- if oldmarker != "" && marker != oldmarker {
- return 0, ""
- }
-
- // TODO(shurcooL): It's probably a good idea to simplify the 2 code paths here
- // into one, always get the syntax, and discard it if the caller doesn't care.
- if syntax != nil {
- syn := 0
- i = skipChar(data, i, ' ')
-
- if i >= len(data) {
- if newlineOptional && i == len(data) {
- return i, marker
- }
- return 0, ""
- }
-
- syntaxStart := i
-
- if data[i] == '{' {
- i++
- syntaxStart++
-
- for i < len(data) && data[i] != '}' && data[i] != '\n' {
- syn++
- i++
- }
-
- if i >= len(data) || data[i] != '}' {
- return 0, ""
- }
-
- // strip all whitespace at the beginning and the end
- // of the {} block
- for syn > 0 && isspace(data[syntaxStart]) {
- syntaxStart++
- syn--
- }
-
- for syn > 0 && isspace(data[syntaxStart+syn-1]) {
- syn--
- }
-
- i++
- } else {
- for i < len(data) && !isspace(data[i]) {
- syn++
- i++
- }
- }
-
- *syntax = string(data[syntaxStart : syntaxStart+syn])
- }
-
- i = skipChar(data, i, ' ')
- if i >= len(data) || data[i] != '\n' {
- if newlineOptional && i == len(data) {
- return i, marker
- }
- return 0, ""
- }
-
- return i + 1, marker // Take newline into account.
-}
-
-// fencedCodeBlock returns the end index if data contains a fenced code block at the beginning,
-// or 0 otherwise. It writes to out if doRender is true, otherwise it has no side effects.
-// If doRender is true, a final newline is mandatory to recognize the fenced code block.
-func (p *parser) fencedCodeBlock(out *bytes.Buffer, data []byte, doRender bool) int {
- var syntax string
- beg, marker := isFenceLine(data, &syntax, "", false)
- if beg == 0 || beg >= len(data) {
- return 0
- }
-
- var work bytes.Buffer
-
- for {
- // safe to assume beg < len(data)
-
- // check for the end of the code block
- newlineOptional := !doRender
- fenceEnd, _ := isFenceLine(data[beg:], nil, marker, newlineOptional)
- if fenceEnd != 0 {
- beg += fenceEnd
- break
- }
-
- // copy the current line
- end := skipUntilChar(data, beg, '\n') + 1
-
- // did we reach the end of the buffer without a closing marker?
- if end >= len(data) {
- return 0
- }
-
- // verbatim copy to the working buffer
- if doRender {
- work.Write(data[beg:end])
- }
- beg = end
- }
-
- if doRender {
- p.r.BlockCode(out, work.Bytes(), syntax)
- }
-
- return beg
-}
-
-func (p *parser) table(out *bytes.Buffer, data []byte) int {
- var header bytes.Buffer
- i, columns := p.tableHeader(&header, data)
- if i == 0 {
- return 0
- }
-
- var body bytes.Buffer
-
- for i < len(data) {
- pipes, rowStart := 0, i
- for ; data[i] != '\n'; i++ {
- if data[i] == '|' {
- pipes++
- }
- }
-
- if pipes == 0 {
- i = rowStart
- break
- }
-
- // include the newline in data sent to tableRow
- i++
- p.tableRow(&body, data[rowStart:i], columns, false)
- }
-
- p.r.Table(out, header.Bytes(), body.Bytes(), columns)
-
- return i
-}
-
-// check if the specified position is preceded by an odd number of backslashes
-func isBackslashEscaped(data []byte, i int) bool {
- backslashes := 0
- for i-backslashes-1 >= 0 && data[i-backslashes-1] == '\\' {
- backslashes++
- }
- return backslashes&1 == 1
-}
-
-func (p *parser) tableHeader(out *bytes.Buffer, data []byte) (size int, columns []int) {
- i := 0
- colCount := 1
- for i = 0; data[i] != '\n'; i++ {
- if data[i] == '|' && !isBackslashEscaped(data, i) {
- colCount++
- }
- }
-
- // doesn't look like a table header
- if colCount == 1 {
- return
- }
-
- // include the newline in the data sent to tableRow
- header := data[:i+1]
-
- // column count ignores pipes at beginning or end of line
- if data[0] == '|' {
- colCount--
- }
- if i > 2 && data[i-1] == '|' && !isBackslashEscaped(data, i-1) {
- colCount--
- }
-
- columns = make([]int, colCount)
-
- // move on to the header underline
- i++
- if i >= len(data) {
- return
- }
-
- if data[i] == '|' && !isBackslashEscaped(data, i) {
- i++
- }
- i = skipChar(data, i, ' ')
-
- // each column header is of form: / *:?-+:? *|/ with # dashes + # colons >= 3
- // and trailing | optional on last column
- col := 0
- for data[i] != '\n' {
- dashes := 0
-
- if data[i] == ':' {
- i++
- columns[col] |= TABLE_ALIGNMENT_LEFT
- dashes++
- }
- for data[i] == '-' {
- i++
- dashes++
- }
- if data[i] == ':' {
- i++
- columns[col] |= TABLE_ALIGNMENT_RIGHT
- dashes++
- }
- for data[i] == ' ' {
- i++
- }
-
- // end of column test is messy
- switch {
- case dashes < 3:
- // not a valid column
- return
-
- case data[i] == '|' && !isBackslashEscaped(data, i):
- // marker found, now skip past trailing whitespace
- col++
- i++
- for data[i] == ' ' {
- i++
- }
-
- // trailing junk found after last column
- if col >= colCount && data[i] != '\n' {
- return
- }
-
- case (data[i] != '|' || isBackslashEscaped(data, i)) && col+1 < colCount:
- // something else found where marker was required
- return
-
- case data[i] == '\n':
- // marker is optional for the last column
- col++
-
- default:
- // trailing junk found after last column
- return
- }
- }
- if col != colCount {
- return
- }
-
- p.tableRow(out, header, columns, true)
- size = i + 1
- return
-}
-
-func (p *parser) tableRow(out *bytes.Buffer, data []byte, columns []int, header bool) {
- i, col := 0, 0
- var rowWork bytes.Buffer
-
- if data[i] == '|' && !isBackslashEscaped(data, i) {
- i++
- }
-
- for col = 0; col < len(columns) && i < len(data); col++ {
- for data[i] == ' ' {
- i++
- }
-
- cellStart := i
-
- for (data[i] != '|' || isBackslashEscaped(data, i)) && data[i] != '\n' {
- i++
- }
-
- cellEnd := i
-
- // skip the end-of-cell marker, possibly taking us past end of buffer
- i++
-
- for cellEnd > cellStart && data[cellEnd-1] == ' ' {
- cellEnd--
- }
-
- var cellWork bytes.Buffer
- p.inline(&cellWork, data[cellStart:cellEnd])
-
- if header {
- p.r.TableHeaderCell(&rowWork, cellWork.Bytes(), columns[col])
- } else {
- p.r.TableCell(&rowWork, cellWork.Bytes(), columns[col])
- }
- }
-
- // pad it out with empty columns to get the right number
- for ; col < len(columns); col++ {
- if header {
- p.r.TableHeaderCell(&rowWork, nil, columns[col])
- } else {
- p.r.TableCell(&rowWork, nil, columns[col])
- }
- }
-
- // silently ignore rows with too many cells
-
- p.r.TableRow(out, rowWork.Bytes())
-}
-
-// returns blockquote prefix length
-func (p *parser) quotePrefix(data []byte) int {
- i := 0
- for i < 3 && data[i] == ' ' {
- i++
- }
- if data[i] == '>' {
- if data[i+1] == ' ' {
- return i + 2
- }
- return i + 1
- }
- return 0
-}
-
-// blockquote ends with at least one blank line
-// followed by something without a blockquote prefix
-func (p *parser) terminateBlockquote(data []byte, beg, end int) bool {
- if p.isEmpty(data[beg:]) <= 0 {
- return false
- }
- if end >= len(data) {
- return true
- }
- return p.quotePrefix(data[end:]) == 0 && p.isEmpty(data[end:]) == 0
-}
-
-// parse a blockquote fragment
-func (p *parser) quote(out *bytes.Buffer, data []byte) int {
- var raw bytes.Buffer
- beg, end := 0, 0
- for beg < len(data) {
- end = beg
- // Step over whole lines, collecting them. While doing that, check for
- // fenced code and if one's found, incorporate it altogether,
- // irregardless of any contents inside it
- for data[end] != '\n' {
- if p.flags&EXTENSION_FENCED_CODE != 0 {
- if i := p.fencedCodeBlock(out, data[end:], false); i > 0 {
- // -1 to compensate for the extra end++ after the loop:
- end += i - 1
- break
- }
- }
- end++
- }
- end++
-
- if pre := p.quotePrefix(data[beg:]); pre > 0 {
- // skip the prefix
- beg += pre
- } else if p.terminateBlockquote(data, beg, end) {
- break
- }
-
- // this line is part of the blockquote
- raw.Write(data[beg:end])
- beg = end
- }
-
- var cooked bytes.Buffer
- p.block(&cooked, raw.Bytes())
- p.r.BlockQuote(out, cooked.Bytes())
- return end
-}
-
-// returns prefix length for block code
-func (p *parser) codePrefix(data []byte) int {
- if data[0] == ' ' && data[1] == ' ' && data[2] == ' ' && data[3] == ' ' {
- return 4
- }
- return 0
-}
-
-func (p *parser) code(out *bytes.Buffer, data []byte) int {
- var work bytes.Buffer
-
- i := 0
- for i < len(data) {
- beg := i
- for data[i] != '\n' {
- i++
- }
- i++
-
- blankline := p.isEmpty(data[beg:i]) > 0
- if pre := p.codePrefix(data[beg:i]); pre > 0 {
- beg += pre
- } else if !blankline {
- // non-empty, non-prefixed line breaks the pre
- i = beg
- break
- }
-
- // verbatim copy to the working buffeu
- if blankline {
- work.WriteByte('\n')
- } else {
- work.Write(data[beg:i])
- }
- }
-
- // trim all the \n off the end of work
- workbytes := work.Bytes()
- eol := len(workbytes)
- for eol > 0 && workbytes[eol-1] == '\n' {
- eol--
- }
- if eol != len(workbytes) {
- work.Truncate(eol)
- }
-
- work.WriteByte('\n')
-
- p.r.BlockCode(out, work.Bytes(), "")
-
- return i
-}
-
-// returns unordered list item prefix
-func (p *parser) uliPrefix(data []byte) int {
- i := 0
-
- // start with up to 3 spaces
- for i < 3 && data[i] == ' ' {
- i++
- }
-
- // need a *, +, or - followed by a space
- if (data[i] != '*' && data[i] != '+' && data[i] != '-') ||
- data[i+1] != ' ' {
- return 0
- }
- return i + 2
-}
-
-// returns ordered list item prefix
-func (p *parser) oliPrefix(data []byte) int {
- i := 0
-
- // start with up to 3 spaces
- for i < 3 && data[i] == ' ' {
- i++
- }
-
- // count the digits
- start := i
- for data[i] >= '0' && data[i] <= '9' {
- i++
- }
-
- // we need >= 1 digits followed by a dot and a space
- if start == i || data[i] != '.' || data[i+1] != ' ' {
- return 0
- }
- return i + 2
-}
-
-// returns definition list item prefix
-func (p *parser) dliPrefix(data []byte) int {
- i := 0
-
- // need a : followed by a spaces
- if data[i] != ':' || data[i+1] != ' ' {
- return 0
- }
- for data[i] == ' ' {
- i++
- }
- return i + 2
-}
-
-// parse ordered or unordered list block
-func (p *parser) list(out *bytes.Buffer, data []byte, flags int) int {
- i := 0
- flags |= LIST_ITEM_BEGINNING_OF_LIST
- work := func() bool {
- for i < len(data) {
- skip := p.listItem(out, data[i:], &flags)
- i += skip
-
- if skip == 0 || flags&LIST_ITEM_END_OF_LIST != 0 {
- break
- }
- flags &= ^LIST_ITEM_BEGINNING_OF_LIST
- }
- return true
- }
-
- p.r.List(out, work, flags)
- return i
-}
-
-// Parse a single list item.
-// Assumes initial prefix is already removed if this is a sublist.
-func (p *parser) listItem(out *bytes.Buffer, data []byte, flags *int) int {
- // keep track of the indentation of the first line
- itemIndent := 0
- for itemIndent < 3 && data[itemIndent] == ' ' {
- itemIndent++
- }
-
- i := p.uliPrefix(data)
- if i == 0 {
- i = p.oliPrefix(data)
- }
- if i == 0 {
- i = p.dliPrefix(data)
- // reset definition term flag
- if i > 0 {
- *flags &= ^LIST_TYPE_TERM
- }
- }
- if i == 0 {
- // if in defnition list, set term flag and continue
- if *flags&LIST_TYPE_DEFINITION != 0 {
- *flags |= LIST_TYPE_TERM
- } else {
- return 0
- }
- }
-
- // skip leading whitespace on first line
- for data[i] == ' ' {
- i++
- }
-
- // find the end of the line
- line := i
- for i > 0 && data[i-1] != '\n' {
- i++
- }
-
- // get working buffer
- var raw bytes.Buffer
-
- // put the first line into the working buffer
- raw.Write(data[line:i])
- line = i
-
- // process the following lines
- containsBlankLine := false
- sublist := 0
-
-gatherlines:
- for line < len(data) {
- i++
-
- // find the end of this line
- for data[i-1] != '\n' {
- i++
- }
-
- // if it is an empty line, guess that it is part of this item
- // and move on to the next line
- if p.isEmpty(data[line:i]) > 0 {
- containsBlankLine = true
- raw.Write(data[line:i])
- line = i
- continue
- }
-
- // calculate the indentation
- indent := 0
- for indent < 4 && line+indent < i && data[line+indent] == ' ' {
- indent++
- }
-
- chunk := data[line+indent : i]
-
- // evaluate how this line fits in
- switch {
- // is this a nested list item?
- case (p.uliPrefix(chunk) > 0 && !p.isHRule(chunk)) ||
- p.oliPrefix(chunk) > 0 ||
- p.dliPrefix(chunk) > 0:
-
- if containsBlankLine {
- // end the list if the type changed after a blank line
- if indent <= itemIndent &&
- ((*flags&LIST_TYPE_ORDERED != 0 && p.uliPrefix(chunk) > 0) ||
- (*flags&LIST_TYPE_ORDERED == 0 && p.oliPrefix(chunk) > 0)) {
-
- *flags |= LIST_ITEM_END_OF_LIST
- break gatherlines
- }
- *flags |= LIST_ITEM_CONTAINS_BLOCK
- }
-
- // to be a nested list, it must be indented more
- // if not, it is the next item in the same list
- if indent <= itemIndent {
- break gatherlines
- }
-
- // is this the first item in the nested list?
- if sublist == 0 {
- sublist = raw.Len()
- }
-
- // is this a nested prefix header?
- case p.isPrefixHeader(chunk):
- // if the header is not indented, it is not nested in the list
- // and thus ends the list
- if containsBlankLine && indent < 4 {
- *flags |= LIST_ITEM_END_OF_LIST
- break gatherlines
- }
- *flags |= LIST_ITEM_CONTAINS_BLOCK
-
- // anything following an empty line is only part
- // of this item if it is indented 4 spaces
- // (regardless of the indentation of the beginning of the item)
- case containsBlankLine && indent < 4:
- if *flags&LIST_TYPE_DEFINITION != 0 && i < len(data)-1 {
- // is the next item still a part of this list?
- next := i
- for data[next] != '\n' {
- next++
- }
- for next < len(data)-1 && data[next] == '\n' {
- next++
- }
- if i < len(data)-1 && data[i] != ':' && data[next] != ':' {
- *flags |= LIST_ITEM_END_OF_LIST
- }
- } else {
- *flags |= LIST_ITEM_END_OF_LIST
- }
- break gatherlines
-
- // a blank line means this should be parsed as a block
- case containsBlankLine:
- *flags |= LIST_ITEM_CONTAINS_BLOCK
- }
-
- containsBlankLine = false
-
- // add the line into the working buffer without prefix
- raw.Write(data[line+indent : i])
-
- line = i
- }
-
- // If reached end of data, the Renderer.ListItem call we're going to make below
- // is definitely the last in the list.
- if line >= len(data) {
- *flags |= LIST_ITEM_END_OF_LIST
- }
-
- rawBytes := raw.Bytes()
-
- // render the contents of the list item
- var cooked bytes.Buffer
- if *flags&LIST_ITEM_CONTAINS_BLOCK != 0 && *flags&LIST_TYPE_TERM == 0 {
- // intermediate render of block item, except for definition term
- if sublist > 0 {
- p.block(&cooked, rawBytes[:sublist])
- p.block(&cooked, rawBytes[sublist:])
- } else {
- p.block(&cooked, rawBytes)
- }
- } else {
- // intermediate render of inline item
- if sublist > 0 {
- p.inline(&cooked, rawBytes[:sublist])
- p.block(&cooked, rawBytes[sublist:])
- } else {
- p.inline(&cooked, rawBytes)
- }
- }
-
- // render the actual list item
- cookedBytes := cooked.Bytes()
- parsedEnd := len(cookedBytes)
-
- // strip trailing newlines
- for parsedEnd > 0 && cookedBytes[parsedEnd-1] == '\n' {
- parsedEnd--
- }
- p.r.ListItem(out, cookedBytes[:parsedEnd], *flags)
-
- return line
-}
-
-// render a single paragraph that has already been parsed out
-func (p *parser) renderParagraph(out *bytes.Buffer, data []byte) {
- if len(data) == 0 {
- return
- }
-
- // trim leading spaces
- beg := 0
- for data[beg] == ' ' {
- beg++
- }
-
- // trim trailing newline
- end := len(data) - 1
-
- // trim trailing spaces
- for end > beg && data[end-1] == ' ' {
- end--
- }
-
- work := func() bool {
- p.inline(out, data[beg:end])
- return true
- }
- p.r.Paragraph(out, work)
-}
-
-func (p *parser) paragraph(out *bytes.Buffer, data []byte) int {
- // prev: index of 1st char of previous line
- // line: index of 1st char of current line
- // i: index of cursor/end of current line
- var prev, line, i int
-
- // keep going until we find something to mark the end of the paragraph
- for i < len(data) {
- // mark the beginning of the current line
- prev = line
- current := data[i:]
- line = i
-
- // did we find a blank line marking the end of the paragraph?
- if n := p.isEmpty(current); n > 0 {
- // did this blank line followed by a definition list item?
- if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
- if i < len(data)-1 && data[i+1] == ':' {
- return p.list(out, data[prev:], LIST_TYPE_DEFINITION)
- }
- }
-
- p.renderParagraph(out, data[:i])
- return i + n
- }
-
- // an underline under some text marks a header, so our paragraph ended on prev line
- if i > 0 {
- if level := p.isUnderlinedHeader(current); level > 0 {
- // render the paragraph
- p.renderParagraph(out, data[:prev])
-
- // ignore leading and trailing whitespace
- eol := i - 1
- for prev < eol && data[prev] == ' ' {
- prev++
- }
- for eol > prev && data[eol-1] == ' ' {
- eol--
- }
-
- // render the header
- // this ugly double closure avoids forcing variables onto the heap
- work := func(o *bytes.Buffer, pp *parser, d []byte) func() bool {
- return func() bool {
- pp.inline(o, d)
- return true
- }
- }(out, p, data[prev:eol])
-
- id := ""
- if p.flags&EXTENSION_AUTO_HEADER_IDS != 0 {
- id = sanitized_anchor_name.Create(string(data[prev:eol]))
- }
-
- p.r.Header(out, work, level, id)
-
- // find the end of the underline
- for data[i] != '\n' {
- i++
- }
- return i
- }
- }
-
- // if the next line starts a block of HTML, then the paragraph ends here
- if p.flags&EXTENSION_LAX_HTML_BLOCKS != 0 {
- if data[i] == '<' && p.html(out, current, false) > 0 {
- // rewind to before the HTML block
- p.renderParagraph(out, data[:i])
- return i
- }
- }
-
- // if there's a prefixed header or a horizontal rule after this, paragraph is over
- if p.isPrefixHeader(current) || p.isHRule(current) {
- p.renderParagraph(out, data[:i])
- return i
- }
-
- // if there's a fenced code block, paragraph is over
- if p.flags&EXTENSION_FENCED_CODE != 0 {
- if p.fencedCodeBlock(out, current, false) > 0 {
- p.renderParagraph(out, data[:i])
- return i
- }
- }
-
- // if there's a definition list item, prev line is a definition term
- if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
- if p.dliPrefix(current) != 0 {
- return p.list(out, data[prev:], LIST_TYPE_DEFINITION)
- }
- }
-
- // if there's a list after this, paragraph is over
- if p.flags&EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK != 0 {
- if p.uliPrefix(current) != 0 ||
- p.oliPrefix(current) != 0 ||
- p.quotePrefix(current) != 0 ||
- p.codePrefix(current) != 0 {
- p.renderParagraph(out, data[:i])
- return i
- }
- }
-
- // otherwise, scan to the beginning of the next line
- for data[i] != '\n' {
- i++
- }
- i++
- }
-
- p.renderParagraph(out, data[:i])
- return i
-}
diff --git a/vendor/github.com/russross/blackfriday/html.go b/vendor/github.com/russross/blackfriday/html.go
deleted file mode 100644
index 74e67ee..0000000
--- a/vendor/github.com/russross/blackfriday/html.go
+++ /dev/null
@@ -1,949 +0,0 @@
-//
-// Blackfriday Markdown Processor
-// Available at http://github.com/russross/blackfriday
-//
-// Copyright © 2011 Russ Ross