diff --git a/CHANGELOG.md b/CHANGELOG.md index a706475c98..0ffd4e972a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,6 +79,7 @@ These are only breaking changes for unformatted code. - Add support for `|>` in uncurried mode by desugaring it https://github.com/rescript-lang/rescript-compiler/pull/6083 - Change the compilation of pattern matching for variants so it does not depends on variats being integers https://github.com/rescript-lang/rescript-compiler/pull/6085 - Improve code generated for string templates https://github.com/rescript-lang/rescript-compiler/pull/6090 +- Move Jsx and JsxDOM and JsxEvent and JsxPPXReactSupport inside Pervasives and build them separately for curried and uncurried mode https://github.com/rescript-lang/rescript-compiler/pull/6091 # 10.1.4 diff --git a/jscomp/others/jsx.res b/jscomp/others/jsxC.res similarity index 98% rename from jscomp/others/jsx.res rename to jscomp/others/jsxC.res index fd9735b9c1..d7e08eb405 100644 --- a/jscomp/others/jsx.res +++ b/jscomp/others/jsxC.res @@ -22,6 +22,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/*** Internal: use Jsx directly. */ + type element type ref diff --git a/jscomp/others/jsxDOM.res b/jscomp/others/jsxDOMC.res similarity index 80% rename from jscomp/others/jsxDOM.res rename to jscomp/others/jsxDOMC.res index 595bf12965..c1d709887b 100644 --- a/jscomp/others/jsxDOM.res +++ b/jscomp/others/jsxDOMC.res @@ -22,6 +22,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/*** Internal: use JsxDOM directly. */ + type style = JsxDOMStyle.t type domRef @@ -30,7 +32,7 @@ type domRef */ type domProps = { key?: string, - children?: Jsx.element, + children?: JsxC.element, ref?: domRef, /* accessibility */ /* https://www.w3.org/TR/wai-aria-1.1/ */ @@ -260,100 +262,100 @@ type domProps = { width?: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */, wrap?: string /* "hard" or "soft" */, /* Clipboard events */ - onCopy?: JsxEvent.Clipboard.t => unit, - onCut?: JsxEvent.Clipboard.t => unit, - onPaste?: JsxEvent.Clipboard.t => unit, + onCopy?: JsxEventC.Clipboard.t => unit, + onCut?: JsxEventC.Clipboard.t => unit, + onPaste?: JsxEventC.Clipboard.t => unit, /* Composition events */ - onCompositionEnd?: JsxEvent.Composition.t => unit, - onCompositionStart?: JsxEvent.Composition.t => unit, - onCompositionUpdate?: JsxEvent.Composition.t => unit, + onCompositionEnd?: JsxEventC.Composition.t => unit, + onCompositionStart?: JsxEventC.Composition.t => unit, + onCompositionUpdate?: JsxEventC.Composition.t => unit, /* Keyboard events */ - onKeyDown?: JsxEvent.Keyboard.t => unit, - onKeyPress?: JsxEvent.Keyboard.t => unit, - onKeyUp?: JsxEvent.Keyboard.t => unit, + onKeyDown?: JsxEventC.Keyboard.t => unit, + onKeyPress?: JsxEventC.Keyboard.t => unit, + onKeyUp?: JsxEventC.Keyboard.t => unit, /* Focus events */ - onFocus?: JsxEvent.Focus.t => unit, - onBlur?: JsxEvent.Focus.t => unit, + onFocus?: JsxEventC.Focus.t => unit, + onBlur?: JsxEventC.Focus.t => unit, /* Form events */ - onBeforeInput?: JsxEvent.Form.t => unit, - onChange?: JsxEvent.Form.t => unit, - onInput?: JsxEvent.Form.t => unit, - onReset?: JsxEvent.Form.t => unit, - onSubmit?: JsxEvent.Form.t => unit, - onInvalid?: JsxEvent.Form.t => unit, + onBeforeInput?: JsxEventC.Form.t => unit, + onChange?: JsxEventC.Form.t => unit, + onInput?: JsxEventC.Form.t => unit, + onReset?: JsxEventC.Form.t => unit, + onSubmit?: JsxEventC.Form.t => unit, + onInvalid?: JsxEventC.Form.t => unit, /* Mouse events */ - onClick?: JsxEvent.Mouse.t => unit, - onContextMenu?: JsxEvent.Mouse.t => unit, - onDoubleClick?: JsxEvent.Mouse.t => unit, - onDrag?: JsxEvent.Mouse.t => unit, - onDragEnd?: JsxEvent.Mouse.t => unit, - onDragEnter?: JsxEvent.Mouse.t => unit, - onDragExit?: JsxEvent.Mouse.t => unit, - onDragLeave?: JsxEvent.Mouse.t => unit, - onDragOver?: JsxEvent.Mouse.t => unit, - onDragStart?: JsxEvent.Mouse.t => unit, - onDrop?: JsxEvent.Mouse.t => unit, - onMouseDown?: JsxEvent.Mouse.t => unit, - onMouseEnter?: JsxEvent.Mouse.t => unit, - onMouseLeave?: JsxEvent.Mouse.t => unit, - onMouseMove?: JsxEvent.Mouse.t => unit, - onMouseOut?: JsxEvent.Mouse.t => unit, - onMouseOver?: JsxEvent.Mouse.t => unit, - onMouseUp?: JsxEvent.Mouse.t => unit, + onClick?: JsxEventC.Mouse.t => unit, + onContextMenu?: JsxEventC.Mouse.t => unit, + onDoubleClick?: JsxEventC.Mouse.t => unit, + onDrag?: JsxEventC.Mouse.t => unit, + onDragEnd?: JsxEventC.Mouse.t => unit, + onDragEnter?: JsxEventC.Mouse.t => unit, + onDragExit?: JsxEventC.Mouse.t => unit, + onDragLeave?: JsxEventC.Mouse.t => unit, + onDragOver?: JsxEventC.Mouse.t => unit, + onDragStart?: JsxEventC.Mouse.t => unit, + onDrop?: JsxEventC.Mouse.t => unit, + onMouseDown?: JsxEventC.Mouse.t => unit, + onMouseEnter?: JsxEventC.Mouse.t => unit, + onMouseLeave?: JsxEventC.Mouse.t => unit, + onMouseMove?: JsxEventC.Mouse.t => unit, + onMouseOut?: JsxEventC.Mouse.t => unit, + onMouseOver?: JsxEventC.Mouse.t => unit, + onMouseUp?: JsxEventC.Mouse.t => unit, /* Selection events */ - onSelect?: JsxEvent.Selection.t => unit, + onSelect?: JsxEventC.Selection.t => unit, /* Touch events */ - onTouchCancel?: JsxEvent.Touch.t => unit, - onTouchEnd?: JsxEvent.Touch.t => unit, - onTouchMove?: JsxEvent.Touch.t => unit, - onTouchStart?: JsxEvent.Touch.t => unit, + onTouchCancel?: JsxEventC.Touch.t => unit, + onTouchEnd?: JsxEventC.Touch.t => unit, + onTouchMove?: JsxEventC.Touch.t => unit, + onTouchStart?: JsxEventC.Touch.t => unit, // Pointer events - onPointerOver?: JsxEvent.Pointer.t => unit, - onPointerEnter?: JsxEvent.Pointer.t => unit, - onPointerDown?: JsxEvent.Pointer.t => unit, - onPointerMove?: JsxEvent.Pointer.t => unit, - onPointerUp?: JsxEvent.Pointer.t => unit, - onPointerCancel?: JsxEvent.Pointer.t => unit, - onPointerOut?: JsxEvent.Pointer.t => unit, - onPointerLeave?: JsxEvent.Pointer.t => unit, - onGotPointerCapture?: JsxEvent.Pointer.t => unit, - onLostPointerCapture?: JsxEvent.Pointer.t => unit, + onPointerOver?: JsxEventC.Pointer.t => unit, + onPointerEnter?: JsxEventC.Pointer.t => unit, + onPointerDown?: JsxEventC.Pointer.t => unit, + onPointerMove?: JsxEventC.Pointer.t => unit, + onPointerUp?: JsxEventC.Pointer.t => unit, + onPointerCancel?: JsxEventC.Pointer.t => unit, + onPointerOut?: JsxEventC.Pointer.t => unit, + onPointerLeave?: JsxEventC.Pointer.t => unit, + onGotPointerCapture?: JsxEventC.Pointer.t => unit, + onLostPointerCapture?: JsxEventC.Pointer.t => unit, /* UI events */ - onScroll?: JsxEvent.UI.t => unit, + onScroll?: JsxEventC.UI.t => unit, /* Wheel events */ - onWheel?: JsxEvent.Wheel.t => unit, + onWheel?: JsxEventC.Wheel.t => unit, /* Media events */ - onAbort?: JsxEvent.Media.t => unit, - onCanPlay?: JsxEvent.Media.t => unit, - onCanPlayThrough?: JsxEvent.Media.t => unit, - onDurationChange?: JsxEvent.Media.t => unit, - onEmptied?: JsxEvent.Media.t => unit, - onEncrypted?: JsxEvent.Media.t => unit, - onEnded?: JsxEvent.Media.t => unit, - onError?: JsxEvent.Media.t => unit, - onLoadedData?: JsxEvent.Media.t => unit, - onLoadedMetadata?: JsxEvent.Media.t => unit, - onLoadStart?: JsxEvent.Media.t => unit, - onPause?: JsxEvent.Media.t => unit, - onPlay?: JsxEvent.Media.t => unit, - onPlaying?: JsxEvent.Media.t => unit, - onProgress?: JsxEvent.Media.t => unit, - onRateChange?: JsxEvent.Media.t => unit, - onSeeked?: JsxEvent.Media.t => unit, - onSeeking?: JsxEvent.Media.t => unit, - onStalled?: JsxEvent.Media.t => unit, - onSuspend?: JsxEvent.Media.t => unit, - onTimeUpdate?: JsxEvent.Media.t => unit, - onVolumeChange?: JsxEvent.Media.t => unit, - onWaiting?: JsxEvent.Media.t => unit, + onAbort?: JsxEventC.Media.t => unit, + onCanPlay?: JsxEventC.Media.t => unit, + onCanPlayThrough?: JsxEventC.Media.t => unit, + onDurationChange?: JsxEventC.Media.t => unit, + onEmptied?: JsxEventC.Media.t => unit, + onEncrypted?: JsxEventC.Media.t => unit, + onEnded?: JsxEventC.Media.t => unit, + onError?: JsxEventC.Media.t => unit, + onLoadedData?: JsxEventC.Media.t => unit, + onLoadedMetadata?: JsxEventC.Media.t => unit, + onLoadStart?: JsxEventC.Media.t => unit, + onPause?: JsxEventC.Media.t => unit, + onPlay?: JsxEventC.Media.t => unit, + onPlaying?: JsxEventC.Media.t => unit, + onProgress?: JsxEventC.Media.t => unit, + onRateChange?: JsxEventC.Media.t => unit, + onSeeked?: JsxEventC.Media.t => unit, + onSeeking?: JsxEventC.Media.t => unit, + onStalled?: JsxEventC.Media.t => unit, + onSuspend?: JsxEventC.Media.t => unit, + onTimeUpdate?: JsxEventC.Media.t => unit, + onVolumeChange?: JsxEventC.Media.t => unit, + onWaiting?: JsxEventC.Media.t => unit, /* Image events */ - onLoad?: JsxEvent.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */, + onLoad?: JsxEventC.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */, /* Animation events */ - onAnimationStart?: JsxEvent.Animation.t => unit, - onAnimationEnd?: JsxEvent.Animation.t => unit, - onAnimationIteration?: JsxEvent.Animation.t => unit, + onAnimationStart?: JsxEventC.Animation.t => unit, + onAnimationEnd?: JsxEventC.Animation.t => unit, + onAnimationIteration?: JsxEventC.Animation.t => unit, /* Transition events */ - onTransitionEnd?: JsxEvent.Transition.t => unit, + onTransitionEnd?: JsxEventC.Transition.t => unit, /* svg */ accentHeight?: string, accumulate?: string, diff --git a/jscomp/others/jsxDOMU.res b/jscomp/others/jsxDOMU.res new file mode 100644 index 0000000000..a427376dc5 --- /dev/null +++ b/jscomp/others/jsxDOMU.res @@ -0,0 +1,624 @@ +/* Copyright (C) 2022- Authors of ReScript + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/*** Internal: use JsxDOM directly. */ + +@@uncurried + +type style = JsxDOMStyle.t +type domRef + +/* + This list isn't exhaustive. We'll add more as we go. +*/ +type domProps = { + key?: string, + children?: JsxU.element, + ref?: domRef, + /* accessibility */ + /* https://www.w3.org/TR/wai-aria-1.1/ */ + /* https://accessibilityresources.org/ is a great resource for these */ + @as("aria-current") + ariaCurrent?: [#page | #step | #location | #date | #time | #"true" | #"false"], + @as("aria-details") + ariaDetails?: string, + @as("aria-disabled") + ariaDisabled?: bool, + @as("aria-hidden") + ariaHidden?: bool, + @as("aria-invalid") ariaInvalid?: [#grammar | #"false" | #spelling | #"true"], + @as("aria-keyshortcuts") + ariaKeyshortcuts?: string, + @as("aria-label") + ariaLabel?: string, + @as("aria-roledescription") + ariaRoledescription?: string, + /* Widget Attributes */ + @as("aria-autocomplete") ariaAutocomplete?: [#inline | #list | #both | #none], + /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ + @as("aria-checked") + ariaChecked?: [#"true" | #"false" | #mixed], + @as("aria-expanded") + ariaExpanded?: bool, + @as("aria-haspopup") + ariaHaspopup?: [#menu | #listbox | #tree | #grid | #dialog | #"true" | #"false"], + @as("aria-level") + ariaLevel?: int, + @as("aria-modal") + ariaModal?: bool, + @as("aria-multiline") + ariaMultiline?: bool, + @as("aria-multiselectable") + ariaMultiselectable?: bool, + @as("aria-orientation") ariaOrientation?: [#horizontal | #vertical | #undefined], + @as("aria-placeholder") + ariaPlaceholder?: string, + /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ + @as("aria-pressed") ariaPressed?: [#"true" | #"false" | #mixed], + @as("aria-readonly") + ariaReadonly?: bool, + @as("aria-required") + ariaRequired?: bool, + @as("aria-selected") + ariaSelected?: bool, + @as("aria-sort") + ariaSort?: string, + @as("aria-valuemax") + ariaValuemax?: float, + @as("aria-valuemin") + ariaValuemin?: float, + @as("aria-valuenow") + ariaValuenow?: float, + @as("aria-valuetext") + ariaValuetext?: string, + /* Live Region Attributes */ + @as("aria-atomic") + ariaAtomic?: bool, + @as("aria-busy") + ariaBusy?: bool, + @as("aria-live") ariaLive?: [#off | #polite | #assertive | #rude], + @as("aria-relevant") + ariaRelevant?: string, + /* Drag-and-Drop Attributes */ + @as("aria-dropeffect") ariaDropeffect?: [#copy | #move | #link | #execute | #popup | #none], + @as("aria-grabbed") + ariaGrabbed?: bool, + /* Relationship Attributes */ + @as("aria-activedescendant") + ariaActivedescendant?: string, + @as("aria-colcount") + ariaColcount?: int, + @as("aria-colindex") + ariaColindex?: int, + @as("aria-colspan") + ariaColspan?: int, + @as("aria-controls") + ariaControls?: string, + @as("aria-describedby") + ariaDescribedby?: string, + @as("aria-errormessage") + ariaErrormessage?: string, + @as("aria-flowto") + ariaFlowto?: string, + @as("aria-labelledby") + ariaLabelledby?: string, + @as("aria-owns") + ariaOwns?: string, + @as("aria-posinset") + ariaPosinset?: int, + @as("aria-rowcount") + ariaRowcount?: int, + @as("aria-rowindex") + ariaRowindex?: int, + @as("aria-rowspan") + ariaRowspan?: int, + @as("aria-setsize") + ariaSetsize?: int, + /* react textarea/input */ + defaultChecked?: bool, + defaultValue?: string, + /* global html attributes */ + accessKey?: string, + className?: string /* substitute for "class" */, + contentEditable?: bool, + contextMenu?: string, + @as("data-testid") dataTestId?: string, + dir?: string /* "ltr", "rtl" or "auto" */, + draggable?: bool, + hidden?: bool, + id?: string, + lang?: string, + role?: string /* ARIA role */, + style?: style, + spellCheck?: bool, + tabIndex?: int, + title?: string, + /* html5 microdata */ + itemID?: string, + itemProp?: string, + itemRef?: string, + itemScope?: bool, + itemType?: string /* uri */, + /* tag-specific html attributes */ + accept?: string, + acceptCharset?: string, + action?: string /* uri */, + allowFullScreen?: bool, + alt?: string, + @as("as") + as_?: string, + async?: bool, + autoComplete?: string /* has a fixed, but large-ish, set of possible values */, + autoCapitalize?: string /* Mobile Safari specific */, + autoFocus?: bool, + autoPlay?: bool, + challenge?: string, + charSet?: string, + checked?: bool, + cite?: string /* uri */, + crossOrigin?: string /* anonymous, use-credentials */, + cols?: int, + colSpan?: int, + content?: string, + controls?: bool, + coords?: string /* set of values specifying the coordinates of a region */, + data?: string /* uri */, + dateTime?: string /* "valid date string with optional time" */, + default?: bool, + defer?: bool, + disabled?: bool, + download?: string /* should really be either a boolean, signifying presence, or a string */, + encType?: string /* "application/x-www-form-urlencoded", "multipart/form-data" or "text/plain" */, + form?: string, + formAction?: string /* uri */, + formTarget?: string /* "_blank", "_self", etc. */, + formMethod?: string /* "post", "get", "put" */, + headers?: string, + height?: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */, + high?: int, + href?: string /* uri */, + hrefLang?: string, + htmlFor?: string /* substitute for "for" */, + httpEquiv?: string /* has a fixed set of possible values */, + icon?: string /* uri? */, + inputMode?: string /* "verbatim", "latin", "numeric", etc. */, + integrity?: string, + keyType?: string, + kind?: string /* has a fixed set of possible values */, + label?: string, + list?: string, + loading?: [#"lazy" | #eager], + loop?: bool, + low?: int, + manifest?: string /* uri */, + max?: string /* should be int or Js.Date.t */, + maxLength?: int, + media?: string /* a valid media query */, + mediaGroup?: string, + method?: string /* "post" or "get" */, + min?: string, + minLength?: int, + multiple?: bool, + muted?: bool, + name?: string, + nonce?: string, + noValidate?: bool, + @as("open") + open_?: bool /* use this one. Previous one is deprecated */, + optimum?: int, + pattern?: string /* valid Js RegExp */, + placeholder?: string, + playsInline?: bool, + poster?: string /* uri */, + preload?: string /* "none", "metadata" or "auto" (and "" as a synonym for "auto") */, + radioGroup?: string, + readOnly?: bool, + rel?: string /* a space- or comma-separated (depending on the element) list of a fixed set of "link types" */, + required?: bool, + reversed?: bool, + rows?: int, + rowSpan?: int, + sandbox?: string /* has a fixed set of possible values */, + scope?: string /* has a fixed set of possible values */, + scoped?: bool, + scrolling?: string /* html4 only, "auto", "yes" or "no" */, + /* seamless - supported by React, but removed from the html5 spec */ + selected?: bool, + shape?: string, + size?: int, + sizes?: string, + span?: int, + src?: string /* uri */, + srcDoc?: string, + srcLang?: string, + srcSet?: string, + start?: int, + step?: float, + summary?: string /* deprecated */, + target?: string, + @as("type") + type_?: string /* has a fixed but large-ish set of possible values */ /* use this one. Previous one is deprecated */, + useMap?: string, + value?: string, + width?: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */, + wrap?: string /* "hard" or "soft" */, + /* Clipboard events */ + onCopy?: JsxEventU.Clipboard.t => unit, + onCut?: JsxEventU.Clipboard.t => unit, + onPaste?: JsxEventU.Clipboard.t => unit, + /* Composition events */ + onCompositionEnd?: JsxEventU.Composition.t => unit, + onCompositionStart?: JsxEventU.Composition.t => unit, + onCompositionUpdate?: JsxEventU.Composition.t => unit, + /* Keyboard events */ + onKeyDown?: JsxEventU.Keyboard.t => unit, + onKeyPress?: JsxEventU.Keyboard.t => unit, + onKeyUp?: JsxEventU.Keyboard.t => unit, + /* Focus events */ + onFocus?: JsxEventU.Focus.t => unit, + onBlur?: JsxEventU.Focus.t => unit, + /* Form events */ + onBeforeInput?: JsxEventU.Form.t => unit, + onChange?: JsxEventU.Form.t => unit, + onInput?: JsxEventU.Form.t => unit, + onReset?: JsxEventU.Form.t => unit, + onSubmit?: JsxEventU.Form.t => unit, + onInvalid?: JsxEventU.Form.t => unit, + /* Mouse events */ + onClick?: JsxEventU.Mouse.t => unit, + onContextMenu?: JsxEventU.Mouse.t => unit, + onDoubleClick?: JsxEventU.Mouse.t => unit, + onDrag?: JsxEventU.Mouse.t => unit, + onDragEnd?: JsxEventU.Mouse.t => unit, + onDragEnter?: JsxEventU.Mouse.t => unit, + onDragExit?: JsxEventU.Mouse.t => unit, + onDragLeave?: JsxEventU.Mouse.t => unit, + onDragOver?: JsxEventU.Mouse.t => unit, + onDragStart?: JsxEventU.Mouse.t => unit, + onDrop?: JsxEventU.Mouse.t => unit, + onMouseDown?: JsxEventU.Mouse.t => unit, + onMouseEnter?: JsxEventU.Mouse.t => unit, + onMouseLeave?: JsxEventU.Mouse.t => unit, + onMouseMove?: JsxEventU.Mouse.t => unit, + onMouseOut?: JsxEventU.Mouse.t => unit, + onMouseOver?: JsxEventU.Mouse.t => unit, + onMouseUp?: JsxEventU.Mouse.t => unit, + /* Selection events */ + onSelect?: JsxEventU.Selection.t => unit, + /* Touch events */ + onTouchCancel?: JsxEventU.Touch.t => unit, + onTouchEnd?: JsxEventU.Touch.t => unit, + onTouchMove?: JsxEventU.Touch.t => unit, + onTouchStart?: JsxEventU.Touch.t => unit, + // Pointer events + onPointerOver?: JsxEventU.Pointer.t => unit, + onPointerEnter?: JsxEventU.Pointer.t => unit, + onPointerDown?: JsxEventU.Pointer.t => unit, + onPointerMove?: JsxEventU.Pointer.t => unit, + onPointerUp?: JsxEventU.Pointer.t => unit, + onPointerCancel?: JsxEventU.Pointer.t => unit, + onPointerOut?: JsxEventU.Pointer.t => unit, + onPointerLeave?: JsxEventU.Pointer.t => unit, + onGotPointerCapture?: JsxEventU.Pointer.t => unit, + onLostPointerCapture?: JsxEventU.Pointer.t => unit, + /* UI events */ + onScroll?: JsxEventU.UI.t => unit, + /* Wheel events */ + onWheel?: JsxEventU.Wheel.t => unit, + /* Media events */ + onAbort?: JsxEventU.Media.t => unit, + onCanPlay?: JsxEventU.Media.t => unit, + onCanPlayThrough?: JsxEventU.Media.t => unit, + onDurationChange?: JsxEventU.Media.t => unit, + onEmptied?: JsxEventU.Media.t => unit, + onEncrypted?: JsxEventU.Media.t => unit, + onEnded?: JsxEventU.Media.t => unit, + onError?: JsxEventU.Media.t => unit, + onLoadedData?: JsxEventU.Media.t => unit, + onLoadedMetadata?: JsxEventU.Media.t => unit, + onLoadStart?: JsxEventU.Media.t => unit, + onPause?: JsxEventU.Media.t => unit, + onPlay?: JsxEventU.Media.t => unit, + onPlaying?: JsxEventU.Media.t => unit, + onProgress?: JsxEventU.Media.t => unit, + onRateChange?: JsxEventU.Media.t => unit, + onSeeked?: JsxEventU.Media.t => unit, + onSeeking?: JsxEventU.Media.t => unit, + onStalled?: JsxEventU.Media.t => unit, + onSuspend?: JsxEventU.Media.t => unit, + onTimeUpdate?: JsxEventU.Media.t => unit, + onVolumeChange?: JsxEventU.Media.t => unit, + onWaiting?: JsxEventU.Media.t => unit, + /* Image events */ + onLoad?: JsxEventU.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */, + /* Animation events */ + onAnimationStart?: JsxEventU.Animation.t => unit, + onAnimationEnd?: JsxEventU.Animation.t => unit, + onAnimationIteration?: JsxEventU.Animation.t => unit, + /* Transition events */ + onTransitionEnd?: JsxEventU.Transition.t => unit, + /* svg */ + accentHeight?: string, + accumulate?: string, + additive?: string, + alignmentBaseline?: string, + allowReorder?: string, + alphabetic?: string, + amplitude?: string, + arabicForm?: string, + ascent?: string, + attributeName?: string, + attributeType?: string, + autoReverse?: string, + azimuth?: string, + baseFrequency?: string, + baseProfile?: string, + baselineShift?: string, + bbox?: string, + begin?: string, + @deprecated("Please use begin") + begin_?: string, + bias?: string, + by?: string, + calcMode?: string, + capHeight?: string, + clip?: string, + clipPath?: string, + clipPathUnits?: string, + clipRule?: string, + colorInterpolation?: string, + colorInterpolationFilters?: string, + colorProfile?: string, + colorRendering?: string, + contentScriptType?: string, + contentStyleType?: string, + cursor?: string, + cx?: string, + cy?: string, + d?: string, + decelerate?: string, + descent?: string, + diffuseConstant?: string, + direction?: string, + display?: string, + divisor?: string, + dominantBaseline?: string, + dur?: string, + dx?: string, + dy?: string, + edgeMode?: string, + elevation?: string, + enableBackground?: string, + end?: string, + @deprecated("Please use end") + end_?: string, + exponent?: string, + externalResourcesRequired?: string, + fill?: string, + fillOpacity?: string, + fillRule?: string, + filter?: string, + filterRes?: string, + filterUnits?: string, + floodColor?: string, + floodOpacity?: string, + focusable?: string, + fontFamily?: string, + fontSize?: string, + fontSizeAdjust?: string, + fontStretch?: string, + fontStyle?: string, + fontVariant?: string, + fontWeight?: string, + fomat?: string, + from?: string, + fx?: string, + fy?: string, + g1?: string, + g2?: string, + glyphName?: string, + glyphOrientationHorizontal?: string, + glyphOrientationVertical?: string, + glyphRef?: string, + gradientTransform?: string, + gradientUnits?: string, + hanging?: string, + horizAdvX?: string, + horizOriginX?: string, + ideographic?: string, + imageRendering?: string, + @as("in") + in_?: string /* use this one. Previous one is deprecated */, + in2?: string, + intercept?: string, + k?: string, + k1?: string, + k2?: string, + k3?: string, + k4?: string, + kernelMatrix?: string, + kernelUnitLength?: string, + kerning?: string, + keyPoints?: string, + keySplines?: string, + keyTimes?: string, + lengthAdjust?: string, + letterSpacing?: string, + lightingColor?: string, + limitingConeAngle?: string, + local?: string, + markerEnd?: string, + markerHeight?: string, + markerMid?: string, + markerStart?: string, + markerUnits?: string, + markerWidth?: string, + mask?: string, + maskContentUnits?: string, + maskUnits?: string, + mathematical?: string, + mode?: string, + numOctaves?: string, + offset?: string, + opacity?: string, + operator?: string, + order?: string, + orient?: string, + orientation?: string, + origin?: string, + overflow?: string, + overflowX?: string, + overflowY?: string, + overlinePosition?: string, + overlineThickness?: string, + paintOrder?: string, + panose1?: string, + pathLength?: string, + patternContentUnits?: string, + patternTransform?: string, + patternUnits?: string, + pointerEvents?: string, + points?: string, + pointsAtX?: string, + pointsAtY?: string, + pointsAtZ?: string, + preserveAlpha?: string, + preserveAspectRatio?: string, + primitiveUnits?: string, + r?: string, + radius?: string, + refX?: string, + refY?: string, + renderingIntent?: string, + repeatCount?: string, + repeatDur?: string, + requiredExtensions?: string, + requiredFeatures?: string, + restart?: string, + result?: string, + rotate?: string, + rx?: string, + ry?: string, + scale?: string, + seed?: string, + shapeRendering?: string, + slope?: string, + spacing?: string, + specularConstant?: string, + specularExponent?: string, + speed?: string, + spreadMethod?: string, + startOffset?: string, + stdDeviation?: string, + stemh?: string, + stemv?: string, + stitchTiles?: string, + stopColor?: string, + stopOpacity?: string, + strikethroughPosition?: string, + strikethroughThickness?: string, + string?: string, + stroke?: string, + strokeDasharray?: string, + strokeDashoffset?: string, + strokeLinecap?: string, + strokeLinejoin?: string, + strokeMiterlimit?: string, + strokeOpacity?: string, + strokeWidth?: string, + surfaceScale?: string, + systemLanguage?: string, + tableValues?: string, + targetX?: string, + targetY?: string, + textAnchor?: string, + textDecoration?: string, + textLength?: string, + textRendering?: string, + to?: string, + @deprecated("Please use to") + to_?: string, + transform?: string, + u1?: string, + u2?: string, + underlinePosition?: string, + underlineThickness?: string, + unicode?: string, + unicodeBidi?: string, + unicodeRange?: string, + unitsPerEm?: string, + vAlphabetic?: string, + vHanging?: string, + vIdeographic?: string, + vMathematical?: string, + values?: string, + vectorEffect?: string, + version?: string, + vertAdvX?: string, + vertAdvY?: string, + vertOriginX?: string, + vertOriginY?: string, + viewBox?: string, + viewTarget?: string, + visibility?: string, + /* width::string? => */ + widths?: string, + wordSpacing?: string, + writingMode?: string, + x?: string, + x1?: string, + x2?: string, + xChannelSelector?: string, + xHeight?: string, + xlinkActuate?: string, + xlinkArcrole?: string, + xlinkHref?: string, + xlinkRole?: string, + xlinkShow?: string, + xlinkTitle?: string, + xlinkType?: string, + xmlns?: string, + xmlnsXlink?: string, + xmlBase?: string, + xmlLang?: string, + xmlSpace?: string, + y?: string, + y1?: string, + y2?: string, + yChannelSelector?: string, + z?: string, + zoomAndPan?: string, + /* RDFa */ + about?: string, + datatype?: string, + inlist?: string, + prefix?: string, + property?: string, + resource?: string, + typeof?: string, + vocab?: string, + /* react-specific */ + dangerouslySetInnerHTML?: {"__html": string}, + suppressContentEditableWarning?: bool, +} diff --git a/jscomp/others/jsxEvent.ml b/jscomp/others/jsxEvent.ml deleted file mode 100644 index 8828182b2b..0000000000 --- a/jscomp/others/jsxEvent.ml +++ /dev/null @@ -1,358 +0,0 @@ -(* Copyright (C) 2015-2016 Bloomberg Finance L.P. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * In addition to the permissions granted to you by the LGPL, you may combine - * or link a "work that uses the Library" with a publicly distributed version - * of this file to produce a combined library or application, then distribute - * that combined work under the terms of your choosing, with no requirement - * to comply with the obligations normally placed on you by section 4 of the - * LGPL version 3 (or the corresponding section of a later version of the LGPL - * should you choose to use a later version). - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *) - -type 'a synthetic - -module MakeEventWithType (Type : sig - type t -end) = -struct - external bubbles : Type.t -> bool = "bubbles" [@@bs.get] - external cancelable : Type.t -> bool = "cancelable" [@@bs.get] - external currentTarget : Type.t -> < .. > = "currentTarget" [@@bs.get] - - (* Should return Dom.eventTarget *) - external defaultPrevented : Type.t -> bool = "defaultPrevented" [@@bs.get] - external eventPhase : Type.t -> int = "eventPhase" [@@bs.get] - external isTrusted : Type.t -> bool = "isTrusted" [@@bs.get] - external nativeEvent : Type.t -> < .. > = "nativeEvent" [@@bs.get] - - (* Should return Dom.event *) - external preventDefault : Type.t -> unit = "preventDefault" [@@bs.send] - - external isDefaultPrevented : Type.t -> bool = "isDefaultPrevented" - [@@bs.send] - - external stopPropagation : Type.t -> unit = "stopPropagation" [@@bs.send] - - external isPropagationStopped : Type.t -> bool = "isPropagationStopped" - [@@bs.send] - - external target : Type.t -> < .. > = "target" [@@bs.get] - - (* Should return Dom.eventTarget *) - external timeStamp : Type.t -> float = "timeStamp" [@@bs.get] - external type_ : Type.t -> string = "type" [@@bs.get] - external persist : Type.t -> unit = "persist" [@@bs.send] -end - -module Synthetic = struct - type tag - type t = tag synthetic - - external bubbles : 'a synthetic -> bool = "bubbles" [@@bs.get] - external cancelable : 'a synthetic -> bool = "cancelable" [@@bs.get] - external currentTarget : 'a synthetic -> < .. > = "currentTarget" [@@bs.get] - (* Should return Dom.eventTarget *) - - external defaultPrevented : 'a synthetic -> bool = "defaultPrevented" - [@@bs.get] - - external eventPhase : 'a synthetic -> int = "eventPhase" [@@bs.get] - external isTrusted : 'a synthetic -> bool = "isTrusted" [@@bs.get] - external nativeEvent : 'a synthetic -> < .. > = "nativeEvent" [@@bs.get] - - (* Should return Dom.event *) - external preventDefault : 'a synthetic -> unit = "preventDefault" [@@bs.send] - - external isDefaultPrevented : 'a synthetic -> bool = "isDefaultPrevented" - [@@bs.send] - - external stopPropagation : 'a synthetic -> unit = "stopPropagation" - [@@bs.send] - - external isPropagationStopped : 'a synthetic -> bool = "isPropagationStopped" - [@@bs.send] - - external target : 'a synthetic -> < .. > = "target" [@@bs.get] - - (* Should return Dom.eventTarget *) - external timeStamp : 'a synthetic -> float = "timeStamp" [@@bs.get] - external type_ : 'a synthetic -> string = "type" [@@bs.get] - external persist : 'a synthetic -> unit = "persist" [@@bs.send] -end - -(* Cast any event type to the general synthetic type. This is safe, since synthetic is more general *) -external toSyntheticEvent : 'a synthetic -> Synthetic.t = "%identity" - -module Clipboard = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external clipboardData : t -> < .. > = "clipboardData" [@@bs.get] - (* Should return Dom.dataTransfer *) -end - -module Composition = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external data : t -> string = "data" [@@bs.get] -end - -module Keyboard = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external altKey : t -> bool = "altKey" [@@bs.get] - external charCode : t -> int = "charCode" [@@bs.get] - external ctrlKey : t -> bool = "ctrlKey" [@@bs.get] - - external getModifierState : t -> string -> bool = "getModifierState" - [@@bs.send] - - external key : t -> string = "key" [@@bs.get] - external keyCode : t -> int = "keyCode" [@@bs.get] - external locale : t -> string = "locale" [@@bs.get] - external location : t -> int = "location" [@@bs.get] - external metaKey : t -> bool = "metaKey" [@@bs.get] - external repeat : t -> bool = "repeat" [@@bs.get] - external shiftKey : t -> bool = "shiftKey" [@@bs.get] - external which : t -> int = "which" [@@bs.get] -end - -module Focus = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external relatedTarget : t -> < .. > option = "relatedTarget" - [@@bs.get] [@@bs.return nullable] - (* Should return Dom.eventTarget *) -end - -module Form = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) -end - -module Mouse = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external altKey : t -> bool = "altKey" [@@bs.get] - external button : t -> int = "button" [@@bs.get] - external buttons : t -> int = "buttons" [@@bs.get] - external clientX : t -> int = "clientX" [@@bs.get] - external clientY : t -> int = "clientY" [@@bs.get] - external ctrlKey : t -> bool = "ctrlKey" [@@bs.get] - - external getModifierState : (t -> string) -> bool = "getModifierState" - [@@bs.get] - - external metaKey : t -> bool = "metaKey" [@@bs.get] - external movementX : t -> int = "movementX" [@@bs.get] - external movementY : t -> int = "movementY" [@@bs.get] - external pageX : t -> int = "pageX" [@@bs.get] - external pageY : t -> int = "pageY" [@@bs.get] - - external relatedTarget : t -> < .. > option = "relatedTarget" - [@@bs.get] [@@bs.return nullable] - - (* Should return Dom.eventTarget *) - external screenX : t -> int = "screenX" [@@bs.get] - external screenY : t -> int = "screenY" [@@bs.get] - external shiftKey : t -> bool = "shiftKey" [@@bs.get] -end - -module Pointer = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - (* UIEvent *) - external detail : t -> int = "detail" - [@@bs.get] - (* external view : t -> Dom.window = "view" *) - (* Should return DOMAbstractView/WindowProxy *) - [@@bs.get] - - (* MouseEvent *) - external screenX : t -> int = "screenX" [@@bs.get] - external screenY : t -> int = "screenY" [@@bs.get] - external clientX : t -> int = "clientX" [@@bs.get] - external clientY : t -> int = "clientY" [@@bs.get] - external pageX : t -> int = "pageX" [@@bs.get] - external pageY : t -> int = "pageY" [@@bs.get] - external movementX : t -> int = "movementX" [@@bs.get] - external movementY : t -> int = "movementY" [@@bs.get] - external ctrlKey : t -> bool = "ctrlKey" [@@bs.get] - external shiftKey : t -> bool = "shiftKey" [@@bs.get] - external altKey : t -> bool = "altKey" [@@bs.get] - external metaKey : t -> bool = "metaKey" [@@bs.get] - - external getModifierState : (t -> string) -> bool = "getModifierState" - [@@bs.get] - - external button : t -> int = "button" [@@bs.get] - external buttons : t -> int = "buttons" [@@bs.get] - - external relatedTarget : t -> < .. > option = "relatedTarget" - [@@bs.get] [@@bs.return nullable] - (* Should return Dom.eventTarget *) - - (* PointerEvent *) - (* external pointerId : t -> Dom.eventPointerId = "pointerId" [@@bs.get] *) - external width : t -> float = "width" [@@bs.get] - external height : t -> float = "height" [@@bs.get] - external pressure : t -> float = "pressure" [@@bs.get] - external tangentialPressure : t -> float = "tangentialPressure" [@@bs.get] - external tiltX : t -> int = "tiltX" [@@bs.get] - external tiltY : t -> int = "tiltY" [@@bs.get] - external twist : t -> int = "twist" [@@bs.get] - external pointerType : t -> string = "pointerType" [@@bs.get] - external isPrimary : t -> bool = "isPrimary" [@@bs.get] -end - -module Selection = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) -end - -module Touch = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external altKey : t -> bool = "altKey" [@@bs.get] - external changedTouches : t -> < .. > = "changedTouches" [@@bs.get] - (* Should return Dom.touchList *) - - external ctrlKey : t -> bool = "ctrlKey" [@@bs.get] - - external getModifierState : (t -> string) -> bool = "getModifierState" - [@@bs.send] - - external metaKey : t -> bool = "metaKey" [@@bs.get] - external shiftKey : t -> bool = "shiftKey" [@@bs.get] - external targetTouches : t -> < .. > = "targetTouches" [@@bs.get] - (* Should return Dom.touchList *) - - external touches : t -> < .. > = "touches" [@@bs.get] - (* Should return Dom.touchList *) -end - -module UI = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external detail : t -> int = "detail" [@@bs.get] - (* external view : t -> Dom.window = "view" [@@bs.get] *) - (* Should return DOMAbstractView/WindowProxy *) -end - -module Wheel = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external deltaMode : t -> int = "deltaMode" [@@bs.get] - external deltaX : t -> float = "deltaX" [@@bs.get] - external deltaY : t -> float = "deltaY" [@@bs.get] - external deltaZ : t -> float = "deltaZ" [@@bs.get] -end - -module Media = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) -end - -module Image = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) -end - -module Animation = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external animationName : t -> string = "animationName" [@@bs.get] - external pseudoElement : t -> string = "pseudoElement" [@@bs.get] - external elapsedTime : t -> float = "elapsedTime" [@@bs.get] -end - -module Transition = struct - type tag - type t = tag synthetic - - include MakeEventWithType (struct - type nonrec t = t - end) - - external propertyName : t -> string = "propertyName" [@@bs.get] - external pseudoElement : t -> string = "pseudoElement" [@@bs.get] - external elapsedTime : t -> float = "elapsedTime" [@@bs.get] -end diff --git a/jscomp/others/jsxEventC.res b/jscomp/others/jsxEventC.res new file mode 100644 index 0000000000..89fe51d69f --- /dev/null +++ b/jscomp/others/jsxEventC.res @@ -0,0 +1,348 @@ +/* Copyright (C) 2015-2016 Bloomberg Finance L.P. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/*** Internal: use JsxEvent directly. */ + +type synthetic<'a> + +module MakeEventWithType = ( + Type: { + type t + }, +) => { + @get external bubbles: Type.t => bool = "bubbles" + @get external cancelable: Type.t => bool = "cancelable" + @get external currentTarget: Type.t => {..} = "currentTarget" + + /* Should return Dom.eventTarget */ + @get external defaultPrevented: Type.t => bool = "defaultPrevented" + @get external eventPhase: Type.t => int = "eventPhase" + @get external isTrusted: Type.t => bool = "isTrusted" + @get external nativeEvent: Type.t => {..} = "nativeEvent" + + /* Should return Dom.event */ + @send external preventDefault: Type.t => unit = "preventDefault" + + @send external isDefaultPrevented: Type.t => bool = "isDefaultPrevented" + + @send external stopPropagation: Type.t => unit = "stopPropagation" + + @send external isPropagationStopped: Type.t => bool = "isPropagationStopped" + + @get external target: Type.t => {..} = "target" + + /* Should return Dom.eventTarget */ + @get external timeStamp: Type.t => float = "timeStamp" + @get external type_: Type.t => string = "type" + @send external persist: Type.t => unit = "persist" +} + +module Synthetic = { + type tag + type t = synthetic + + @get external bubbles: synthetic<'a> => bool = "bubbles" + @get external cancelable: synthetic<'a> => bool = "cancelable" + @get external currentTarget: synthetic<'a> => {..} = "currentTarget" + /* Should return Dom.eventTarget */ + + @get external defaultPrevented: synthetic<'a> => bool = "defaultPrevented" + + @get external eventPhase: synthetic<'a> => int = "eventPhase" + @get external isTrusted: synthetic<'a> => bool = "isTrusted" + @get external nativeEvent: synthetic<'a> => {..} = "nativeEvent" + + /* Should return Dom.event */ + @send external preventDefault: synthetic<'a> => unit = "preventDefault" + + @send external isDefaultPrevented: synthetic<'a> => bool = "isDefaultPrevented" + + @send external stopPropagation: synthetic<'a> => unit = "stopPropagation" + + @send external isPropagationStopped: synthetic<'a> => bool = "isPropagationStopped" + + @get external target: synthetic<'a> => {..} = "target" + + /* Should return Dom.eventTarget */ + @get external timeStamp: synthetic<'a> => float = "timeStamp" + @get external type_: synthetic<'a> => string = "type" + @send external persist: synthetic<'a> => unit = "persist" +} + +/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */ +external toSyntheticEvent: synthetic<'a> => Synthetic.t = "%identity" + +module Clipboard = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external clipboardData: t => {..} = "clipboardData" + /* Should return Dom.dataTransfer */ +} + +module Composition = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external data: t => string = "data" +} + +module Keyboard = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external altKey: t => bool = "altKey" + @get external charCode: t => int = "charCode" + @get external ctrlKey: t => bool = "ctrlKey" + + @send external getModifierState: (t, string) => bool = "getModifierState" + + @get external key: t => string = "key" + @get external keyCode: t => int = "keyCode" + @get external locale: t => string = "locale" + @get external location: t => int = "location" + @get external metaKey: t => bool = "metaKey" + @get external repeat: t => bool = "repeat" + @get external shiftKey: t => bool = "shiftKey" + @get external which: t => int = "which" +} + +module Focus = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget" + /* Should return Dom.eventTarget */ +} + +module Form = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) +} + +module Mouse = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external altKey: t => bool = "altKey" + @get external button: t => int = "button" + @get external buttons: t => int = "buttons" + @get external clientX: t => int = "clientX" + @get external clientY: t => int = "clientY" + @get external ctrlKey: t => bool = "ctrlKey" + + @get external getModifierState: (t => string) => bool = "getModifierState" + + @get external metaKey: t => bool = "metaKey" + @get external movementX: t => int = "movementX" + @get external movementY: t => int = "movementY" + @get external pageX: t => int = "pageX" + @get external pageY: t => int = "pageY" + + @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget" + + /* Should return Dom.eventTarget */ + @get external screenX: t => int = "screenX" + @get external screenY: t => int = "screenY" + @get external shiftKey: t => bool = "shiftKey" +} + +module Pointer = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + /* UIEvent */ + @get @get + external detail: t => int = "detail" + + /* external view : t -> Dom.window = "view" */ + /* Should return DOMAbstractView/WindowProxy */ + + /* MouseEvent */ + @get external screenX: t => int = "screenX" + @get external screenY: t => int = "screenY" + @get external clientX: t => int = "clientX" + @get external clientY: t => int = "clientY" + @get external pageX: t => int = "pageX" + @get external pageY: t => int = "pageY" + @get external movementX: t => int = "movementX" + @get external movementY: t => int = "movementY" + @get external ctrlKey: t => bool = "ctrlKey" + @get external shiftKey: t => bool = "shiftKey" + @get external altKey: t => bool = "altKey" + @get external metaKey: t => bool = "metaKey" + + @get external getModifierState: (t => string) => bool = "getModifierState" + + @get external button: t => int = "button" + @get external buttons: t => int = "buttons" + + @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget" + /* Should return Dom.eventTarget */ + + /* PointerEvent */ + /* external pointerId : t -> Dom.eventPointerId = "pointerId" [@@bs.get] */ + @get external width: t => float = "width" + @get external height: t => float = "height" + @get external pressure: t => float = "pressure" + @get external tangentialPressure: t => float = "tangentialPressure" + @get external tiltX: t => int = "tiltX" + @get external tiltY: t => int = "tiltY" + @get external twist: t => int = "twist" + @get external pointerType: t => string = "pointerType" + @get external isPrimary: t => bool = "isPrimary" +} + +module Selection = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) +} + +module Touch = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external altKey: t => bool = "altKey" + @get external changedTouches: t => {..} = "changedTouches" + /* Should return Dom.touchList */ + + @get external ctrlKey: t => bool = "ctrlKey" + + @send external getModifierState: (t => string) => bool = "getModifierState" + + @get external metaKey: t => bool = "metaKey" + @get external shiftKey: t => bool = "shiftKey" + @get external targetTouches: t => {..} = "targetTouches" + /* Should return Dom.touchList */ + + @get external touches: t => {..} = "touches" + /* Should return Dom.touchList */ +} + +module UI = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external detail: t => int = "detail" + /* external view : t -> Dom.window = "view" [@@bs.get] */ + /* Should return DOMAbstractView/WindowProxy */ +} + +module Wheel = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external deltaMode: t => int = "deltaMode" + @get external deltaX: t => float = "deltaX" + @get external deltaY: t => float = "deltaY" + @get external deltaZ: t => float = "deltaZ" +} + +module Media = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) +} + +module Image = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) +} + +module Animation = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external animationName: t => string = "animationName" + @get external pseudoElement: t => string = "pseudoElement" + @get external elapsedTime: t => float = "elapsedTime" +} + +module Transition = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external propertyName: t => string = "propertyName" + @get external pseudoElement: t => string = "pseudoElement" + @get external elapsedTime: t => float = "elapsedTime" +} diff --git a/jscomp/others/jsxEventU.res b/jscomp/others/jsxEventU.res new file mode 100644 index 0000000000..449032f1cb --- /dev/null +++ b/jscomp/others/jsxEventU.res @@ -0,0 +1,350 @@ +/* Copyright (C) 2015-2016 Bloomberg Finance L.P. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/*** Internal: use JsxEvent directly. */ + +@@uncurried + +type synthetic<'a> + +module MakeEventWithType = ( + Type: { + type t + }, +) => { + @get external bubbles: Type.t => bool = "bubbles" + @get external cancelable: Type.t => bool = "cancelable" + @get external currentTarget: Type.t => {..} = "currentTarget" + + /* Should return Dom.eventTarget */ + @get external defaultPrevented: Type.t => bool = "defaultPrevented" + @get external eventPhase: Type.t => int = "eventPhase" + @get external isTrusted: Type.t => bool = "isTrusted" + @get external nativeEvent: Type.t => {..} = "nativeEvent" + + /* Should return Dom.event */ + @send external preventDefault: Type.t => unit = "preventDefault" + + @send external isDefaultPrevented: Type.t => bool = "isDefaultPrevented" + + @send external stopPropagation: Type.t => unit = "stopPropagation" + + @send external isPropagationStopped: Type.t => bool = "isPropagationStopped" + + @get external target: Type.t => {..} = "target" + + /* Should return Dom.eventTarget */ + @get external timeStamp: Type.t => float = "timeStamp" + @get external type_: Type.t => string = "type" + @send external persist: Type.t => unit = "persist" +} + +module Synthetic = { + type tag + type t = synthetic + + @get external bubbles: synthetic<'a> => bool = "bubbles" + @get external cancelable: synthetic<'a> => bool = "cancelable" + @get external currentTarget: synthetic<'a> => {..} = "currentTarget" + /* Should return Dom.eventTarget */ + + @get external defaultPrevented: synthetic<'a> => bool = "defaultPrevented" + + @get external eventPhase: synthetic<'a> => int = "eventPhase" + @get external isTrusted: synthetic<'a> => bool = "isTrusted" + @get external nativeEvent: synthetic<'a> => {..} = "nativeEvent" + + /* Should return Dom.event */ + @send external preventDefault: synthetic<'a> => unit = "preventDefault" + + @send external isDefaultPrevented: synthetic<'a> => bool = "isDefaultPrevented" + + @send external stopPropagation: synthetic<'a> => unit = "stopPropagation" + + @send external isPropagationStopped: synthetic<'a> => bool = "isPropagationStopped" + + @get external target: synthetic<'a> => {..} = "target" + + /* Should return Dom.eventTarget */ + @get external timeStamp: synthetic<'a> => float = "timeStamp" + @get external type_: synthetic<'a> => string = "type" + @send external persist: synthetic<'a> => unit = "persist" +} + +/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */ +external toSyntheticEvent: synthetic<'a> => Synthetic.t = "%identity" + +module Clipboard = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external clipboardData: t => {..} = "clipboardData" + /* Should return Dom.dataTransfer */ +} + +module Composition = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external data: t => string = "data" +} + +module Keyboard = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external altKey: t => bool = "altKey" + @get external charCode: t => int = "charCode" + @get external ctrlKey: t => bool = "ctrlKey" + + @send external getModifierState: (t, string) => bool = "getModifierState" + + @get external key: t => string = "key" + @get external keyCode: t => int = "keyCode" + @get external locale: t => string = "locale" + @get external location: t => int = "location" + @get external metaKey: t => bool = "metaKey" + @get external repeat: t => bool = "repeat" + @get external shiftKey: t => bool = "shiftKey" + @get external which: t => int = "which" +} + +module Focus = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget" + /* Should return Dom.eventTarget */ +} + +module Form = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) +} + +module Mouse = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external altKey: t => bool = "altKey" + @get external button: t => int = "button" + @get external buttons: t => int = "buttons" + @get external clientX: t => int = "clientX" + @get external clientY: t => int = "clientY" + @get external ctrlKey: t => bool = "ctrlKey" + + @get external getModifierState: (t => string) => bool = "getModifierState" + + @get external metaKey: t => bool = "metaKey" + @get external movementX: t => int = "movementX" + @get external movementY: t => int = "movementY" + @get external pageX: t => int = "pageX" + @get external pageY: t => int = "pageY" + + @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget" + + /* Should return Dom.eventTarget */ + @get external screenX: t => int = "screenX" + @get external screenY: t => int = "screenY" + @get external shiftKey: t => bool = "shiftKey" +} + +module Pointer = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + /* UIEvent */ + @get @get + external detail: t => int = "detail" + + /* external view : t -> Dom.window = "view" */ + /* Should return DOMAbstractView/WindowProxy */ + + /* MouseEvent */ + @get external screenX: t => int = "screenX" + @get external screenY: t => int = "screenY" + @get external clientX: t => int = "clientX" + @get external clientY: t => int = "clientY" + @get external pageX: t => int = "pageX" + @get external pageY: t => int = "pageY" + @get external movementX: t => int = "movementX" + @get external movementY: t => int = "movementY" + @get external ctrlKey: t => bool = "ctrlKey" + @get external shiftKey: t => bool = "shiftKey" + @get external altKey: t => bool = "altKey" + @get external metaKey: t => bool = "metaKey" + + @get external getModifierState: (t => string) => bool = "getModifierState" + + @get external button: t => int = "button" + @get external buttons: t => int = "buttons" + + @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget" + /* Should return Dom.eventTarget */ + + /* PointerEvent */ + /* external pointerId : t -> Dom.eventPointerId = "pointerId" [@@bs.get] */ + @get external width: t => float = "width" + @get external height: t => float = "height" + @get external pressure: t => float = "pressure" + @get external tangentialPressure: t => float = "tangentialPressure" + @get external tiltX: t => int = "tiltX" + @get external tiltY: t => int = "tiltY" + @get external twist: t => int = "twist" + @get external pointerType: t => string = "pointerType" + @get external isPrimary: t => bool = "isPrimary" +} + +module Selection = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) +} + +module Touch = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external altKey: t => bool = "altKey" + @get external changedTouches: t => {..} = "changedTouches" + /* Should return Dom.touchList */ + + @get external ctrlKey: t => bool = "ctrlKey" + + @send external getModifierState: (t => string) => bool = "getModifierState" + + @get external metaKey: t => bool = "metaKey" + @get external shiftKey: t => bool = "shiftKey" + @get external targetTouches: t => {..} = "targetTouches" + /* Should return Dom.touchList */ + + @get external touches: t => {..} = "touches" + /* Should return Dom.touchList */ +} + +module UI = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external detail: t => int = "detail" + /* external view : t -> Dom.window = "view" [@@bs.get] */ + /* Should return DOMAbstractView/WindowProxy */ +} + +module Wheel = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external deltaMode: t => int = "deltaMode" + @get external deltaX: t => float = "deltaX" + @get external deltaY: t => float = "deltaY" + @get external deltaZ: t => float = "deltaZ" +} + +module Media = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) +} + +module Image = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) +} + +module Animation = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external animationName: t => string = "animationName" + @get external pseudoElement: t => string = "pseudoElement" + @get external elapsedTime: t => float = "elapsedTime" +} + +module Transition = { + type tag + type t = synthetic + + include MakeEventWithType({ + type t = t + }) + + @get external propertyName: t => string = "propertyName" + @get external pseudoElement: t => string = "pseudoElement" + @get external elapsedTime: t => float = "elapsedTime" +} diff --git a/jscomp/others/jsxPPXReactSupport.res b/jscomp/others/jsxPPXReactSupportC.res similarity index 98% rename from jscomp/others/jsxPPXReactSupport.res rename to jscomp/others/jsxPPXReactSupportC.res index 9f0b3c207f..9049fc47df 100644 --- a/jscomp/others/jsxPPXReactSupport.res +++ b/jscomp/others/jsxPPXReactSupportC.res @@ -22,6 +22,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +module Jsx = JsxC + %%private( @val external propsWithKey: (@as(json`{}`) _, 'props, {"key": string}) => 'props = "Object.assign" @@ -45,4 +47,4 @@ let createElementWithKey = (~key=?, component, props) => createElement(component, addKeyProp(~key?, props)) let createElementVariadicWithKey = (~key=?, component, props, elements) => - createElementVariadic(component, addKeyProp(~key?, props), elements) \ No newline at end of file + createElementVariadic(component, addKeyProp(~key?, props), elements) diff --git a/jscomp/others/jsxPPXReactSupportU.res b/jscomp/others/jsxPPXReactSupportU.res new file mode 100644 index 0000000000..f35c1911c3 --- /dev/null +++ b/jscomp/others/jsxPPXReactSupportU.res @@ -0,0 +1,52 @@ +/* Copyright (C) 2022- Authors of ReScript + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +module Jsx = JsxU + +%%private( + @val + external propsWithKey: (@as(json`{}`) _, 'props, {"key": string}) => 'props = "Object.assign" + + @inline + let addKeyProp = (~key: option=?, p: 'props): 'props => + switch key { + | Some(key) => propsWithKey(p, {"key": key}) + | None => p + } +) + +@@uncurried // Can't move this up as @inline not working with uncurried + +@module("react") +external createElement: (Jsx.component<'props>, 'props) => Jsx.element = "createElement" + +@variadic @module("react") +external createElementVariadic: (Jsx.component<'props>, 'props, array) => Jsx.element = + "createElement" + +let createElementWithKey = (~key=?, component, props) => + createElement(component, addKeyProp(~key?, props)) + +let createElementVariadicWithKey = (~key=?, component, props, elements) => + createElementVariadic(component, addKeyProp(~key?, props), elements) diff --git a/jscomp/others/jsxU.res b/jscomp/others/jsxU.res new file mode 100644 index 0000000000..70f3c67430 --- /dev/null +++ b/jscomp/others/jsxU.res @@ -0,0 +1,20 @@ +/*** Internal: use Jsx directly. */ + +@@uncurried + +type element +type ref + +@val external null: element = "null" + +external float: float => element = "%identity" +external int: int => element = "%identity" +external string: string => element = "%identity" + +external array: array => element = "%identity" + +type componentLike<'props, 'return> = 'props => 'return +type component<'props> = componentLike<'props, element> + +/* this function exists to prepare for making `component` abstract */ +external component: componentLike<'props, element> => component<'props> = "%identity" diff --git a/jscomp/others/release.ninja b/jscomp/others/release.ninja index aa597b742f..a6335e32c2 100644 --- a/jscomp/others/release.ninja +++ b/jscomp/others/release.ninja @@ -64,12 +64,16 @@ o others/js_vector.cmj : cc_cmi others/js_vector.ml | others/belt_internals.cmi o others/js_vector.cmi : cc others/js_vector.mli | others/belt_internals.cmi others/js.cmi $bsc o others/js_weakmap.cmi others/js_weakmap.cmj : cc others/js_weakmap.ml | others/belt_internals.cmi others/js.cmi $bsc o others/js_weakset.cmi others/js_weakset.cmj : cc others/js_weakset.ml | others/belt_internals.cmi others/js.cmi $bsc -o others/jsx.cmi others/jsx.cmj : cc others/jsx.res | others/belt_internals.cmi others/js.cmi $bsc -o others/jsxDOM.cmi others/jsxDOM.cmj : cc others/jsxDOM.res | others/belt_internals.cmi others/js.cmi others/jsx.cmj others/jsxDOMStyle.cmj others/jsxEvent.cmj $bsc +o others/jsxC.cmi others/jsxC.cmj : cc others/jsxC.res | others/belt_internals.cmi others/js.cmi $bsc +o others/jsxDOMC.cmi others/jsxDOMC.cmj : cc others/jsxDOMC.res | others/belt_internals.cmi others/js.cmi others/jsxC.cmj others/jsxDOMStyle.cmj others/jsxEventC.cmj $bsc o others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj : cc others/jsxDOMStyle.res | others/belt_internals.cmi others/js.cmi $bsc -o others/jsxEvent.cmi others/jsxEvent.cmj : cc others/jsxEvent.ml | others/belt_internals.cmi others/js.cmi $bsc -o others/jsxPPXReactSupport.cmi others/jsxPPXReactSupport.cmj : cc others/jsxPPXReactSupport.res | others/belt_internals.cmi others/js.cmi others/jsx.cmj $bsc -o js_pkg : phony others/js_OO.cmi others/js_OO.cmj others/js_array.cmi others/js_array.cmj others/js_array2.cmi others/js_array2.cmj others/js_bigint.cmi others/js_bigint.cmj others/js_cast.cmi others/js_cast.cmj others/js_console.cmi others/js_console.cmj others/js_date.cmi others/js_date.cmj others/js_dict.cmi others/js_dict.cmj others/js_exn.cmi others/js_exn.cmj others/js_float.cmi others/js_float.cmj others/js_global.cmi others/js_global.cmj others/js_int.cmi others/js_int.cmj others/js_json.cmi others/js_json.cmj others/js_list.cmi others/js_list.cmj others/js_map.cmi others/js_map.cmj others/js_mapperRt.cmi others/js_mapperRt.cmj others/js_math.cmi others/js_math.cmj others/js_null.cmi others/js_null.cmj others/js_null_undefined.cmi others/js_null_undefined.cmj others/js_obj.cmi others/js_obj.cmj others/js_option.cmi others/js_option.cmj others/js_promise.cmi others/js_promise.cmj others/js_promise2.cmi others/js_promise2.cmj others/js_re.cmi others/js_re.cmj others/js_result.cmi others/js_result.cmj others/js_set.cmi others/js_set.cmj others/js_string.cmi others/js_string.cmj others/js_string2.cmi others/js_string2.cmj others/js_typed_array.cmi others/js_typed_array.cmj others/js_typed_array2.cmi others/js_typed_array2.cmj others/js_types.cmi others/js_types.cmj others/js_undefined.cmi others/js_undefined.cmj others/js_vector.cmi others/js_vector.cmj others/js_weakmap.cmi others/js_weakmap.cmj others/js_weakset.cmi others/js_weakset.cmj others/jsx.cmi others/jsx.cmj others/jsxDOM.cmi others/jsxDOM.cmj others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj others/jsxEvent.cmi others/jsxEvent.cmj others/jsxPPXReactSupport.cmi others/jsxPPXReactSupport.cmj +o others/jsxDOMU.cmi others/jsxDOMU.cmj : cc others/jsxDOMU.res | others/belt_internals.cmi others/js.cmi others/jsxDOMStyle.cmj others/jsxEventU.cmj others/jsxU.cmj $bsc +o others/jsxEventC.cmi others/jsxEventC.cmj : cc others/jsxEventC.res | others/belt_internals.cmi others/js.cmi $bsc +o others/jsxEventU.cmi others/jsxEventU.cmj : cc others/jsxEventU.res | others/belt_internals.cmi others/js.cmi $bsc +o others/jsxPPXReactSupportC.cmi others/jsxPPXReactSupportC.cmj : cc others/jsxPPXReactSupportC.res | others/belt_internals.cmi others/js.cmi others/jsxC.cmj $bsc +o others/jsxPPXReactSupportU.cmi others/jsxPPXReactSupportU.cmj : cc others/jsxPPXReactSupportU.res | others/belt_internals.cmi others/js.cmi others/jsxU.cmj $bsc +o others/jsxU.cmi others/jsxU.cmj : cc others/jsxU.res | others/belt_internals.cmi others/js.cmi $bsc +o js_pkg : phony others/js_OO.cmi others/js_OO.cmj others/js_array.cmi others/js_array.cmj others/js_array2.cmi others/js_array2.cmj others/js_bigint.cmi others/js_bigint.cmj others/js_cast.cmi others/js_cast.cmj others/js_console.cmi others/js_console.cmj others/js_date.cmi others/js_date.cmj others/js_dict.cmi others/js_dict.cmj others/js_exn.cmi others/js_exn.cmj others/js_float.cmi others/js_float.cmj others/js_global.cmi others/js_global.cmj others/js_int.cmi others/js_int.cmj others/js_json.cmi others/js_json.cmj others/js_list.cmi others/js_list.cmj others/js_map.cmi others/js_map.cmj others/js_mapperRt.cmi others/js_mapperRt.cmj others/js_math.cmi others/js_math.cmj others/js_null.cmi others/js_null.cmj others/js_null_undefined.cmi others/js_null_undefined.cmj others/js_obj.cmi others/js_obj.cmj others/js_option.cmi others/js_option.cmj others/js_promise.cmi others/js_promise.cmj others/js_promise2.cmi others/js_promise2.cmj others/js_re.cmi others/js_re.cmj others/js_result.cmi others/js_result.cmj others/js_set.cmi others/js_set.cmj others/js_string.cmi others/js_string.cmj others/js_string2.cmi others/js_string2.cmj others/js_typed_array.cmi others/js_typed_array.cmj others/js_typed_array2.cmi others/js_typed_array2.cmj others/js_types.cmi others/js_types.cmj others/js_undefined.cmi others/js_undefined.cmj others/js_vector.cmi others/js_vector.cmj others/js_weakmap.cmi others/js_weakmap.cmj others/js_weakset.cmi others/js_weakset.cmj others/jsxC.cmi others/jsxC.cmj others/jsxDOMC.cmi others/jsxDOMC.cmj others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj others/jsxDOMU.cmi others/jsxDOMU.cmj others/jsxEventC.cmi others/jsxEventC.cmj others/jsxEventU.cmi others/jsxEventU.cmj others/jsxPPXReactSupportC.cmi others/jsxPPXReactSupportC.cmj others/jsxPPXReactSupportU.cmi others/jsxPPXReactSupportU.cmj others/jsxU.cmi others/jsxU.cmj o others/belt_Array.cmj : cc_cmi others/belt_Array.ml | others/belt.cmi others/belt_Array.cmi others/belt_internals.cmi others/js.cmi others/js.cmj others/js_math.cmj $bsc js_pkg o others/belt_Array.cmi : cc others/belt_Array.mli | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg o others/belt_Float.cmj : cc_cmi others/belt_Float.ml | others/belt.cmi others/belt_Float.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg diff --git a/jscomp/stdlib-406/pervasives.res b/jscomp/stdlib-406/pervasives.res index c678e23c23..4ccc65b7ab 100644 --- a/jscomp/stdlib-406/pervasives.res +++ b/jscomp/stdlib-406/pervasives.res @@ -13,7 +13,16 @@ /* */ /* ************************************************************************ */ -/* type 'a option = None | Some of 'a */ +module Jsx = JsxC +module JsxEvent = JsxEventC +module JsxDOM = JsxDOMC +module JsxPPXReactSupport = JsxPPXReactSupportC + +module JsxModules = { + module Jsx = JsxC + module JsxEvent = JsxEventC + module JsxDOM = JsxDOMC +} /* Internal */ external __unsafe_cast: 'a => 'b = "%identity" diff --git a/jscomp/stdlib-406/pervasives.resi b/jscomp/stdlib-406/pervasives.resi index afd5a82568..705a7623a5 100644 --- a/jscomp/stdlib-406/pervasives.resi +++ b/jscomp/stdlib-406/pervasives.resi @@ -24,57 +24,70 @@ name, without prefixing them by [Pervasives]. ") +module Jsx = JsxC +module JsxEvent = JsxEventC +module JsxDOM = JsxDOMC +module JsxPPXReactSupport = JsxPPXReactSupportC + +/* For autocomplete */ +module JsxModules: { + module Jsx = JsxC + module JsxEvent = JsxEventC + module JsxDOM = JsxDOMC + // skip JsxPPXReactSupport as it's not user-facing +} + /* Internal */ external __unsafe_cast: 'a => 'b = "%identity" @@ocaml.text(" {1 Exceptions} ") -@ocaml.doc(" Raise the given exception value ") +/** Raise the given exception value */ external raise: exn => 'a = "%raise" -@ocaml.doc(" A faster version [raise] which does not record the backtrace. +/** A faster version [raise] which does not record the backtrace. @since 4.02.0 -") +*/ external raise_notrace: exn => 'a = "%raise_notrace" -@ocaml.doc(" Raise exception [Invalid_argument] with the given string. ") +/** Raise exception [Invalid_argument] with the given string. */ let invalid_arg: string => 'a -@ocaml.doc(" Raise exception [Failure] with the given string. ") +/** Raise exception [Failure] with the given string. */ let failwith: string => 'a -@ocaml.doc(" The [Exit] exception is not raised by any library function. It is - provided for use in your programs. ") +/** The [Exit] exception is not raised by any library function. It is + provided for use in your programs. */ exception Exit @@ocaml.text(" {1 Comparisons} ") -@ocaml.doc(" [e1 = e2] tests for structural equality of [e1] and [e2]. +/** [e1 = e2] tests for structural equality of [e1] and [e2]. Mutable structures (e.g. references and arrays) are equal if and only if their current contents are structurally equal, even if the two mutable objects are not the same physical object. Equality between functional values raises [Invalid_argument]. Equality between cyclic data structures may not terminate. - Left-associative operator at precedence level 4/11. ") + Left-associative operator at precedence level 4/11. */ external \"=": ('a, 'a) => bool = "%equal" -@ocaml.doc(" Negation of {!Pervasives.( = )}. - Left-associative operator at precedence level 4/11. ") +/** Negation of {!Pervasives.( = )}. + Left-associative operator at precedence level 4/11. */ external \"<>": ('a, 'a) => bool = "%notequal" -@ocaml.doc(" See {!Pervasives.( >= )}. - Left-associative operator at precedence level 4/11. ") +/** See {!Pervasives.( >= )}. + Left-associative operator at precedence level 4/11. */ external \"<": ('a, 'a) => bool = "%lessthan" -@ocaml.doc(" See {!Pervasives.( >= )}. - Left-associative operator at precedence level 4/11. ") +/** See {!Pervasives.( >= )}. + Left-associative operator at precedence level 4/11. */ external \">": ('a, 'a) => bool = "%greaterthan" -@ocaml.doc(" See {!Pervasives.( >= )}. - Left-associative operator at precedence level 4/11. ") +/** See {!Pervasives.( >= )}. + Left-associative operator at precedence level 4/11. */ external \"<=": ('a, 'a) => bool = "%lessequal" -@ocaml.doc(" Structural ordering functions. These functions coincide with +/** Structural ordering functions. These functions coincide with the usual orderings over integers, characters, strings, byte sequences and floating-point numbers, and extend them to a total ordering over all types. @@ -82,10 +95,10 @@ external \"<=": ('a, 'a) => bool = "%lessequal" of [( = )], mutable structures are compared by contents. Comparison between functional values raises [Invalid_argument]. Comparison between cyclic structures may not terminate. - Left-associative operator at precedence level 4/11. ") + Left-associative operator at precedence level 4/11. */ external \">=": ('a, 'a) => bool = "%greaterequal" -@ocaml.doc(" [compare x y] returns [0] if [x] is equal to [y], +/** [compare x y] returns [0] if [x] is equal to [y], a negative integer if [x] is less than [y], and a positive integer if [x] is greater than [y]. The ordering implemented by [compare] is compatible with the comparison predicates [=], [<] and [>] @@ -101,20 +114,20 @@ external \">=": ('a, 'a) => bool = "%greaterequal" The [compare] function can be used as the comparison function required by the {!Set.Make} and {!Map.Make} functors, as well as - the {!List.sort} and {!Array.sort} functions. ") + the {!List.sort} and {!Array.sort} functions. */ external compare: ('a, 'a) => int = "%compare" -@ocaml.doc(" Return the smaller of the two arguments. +/** Return the smaller of the two arguments. The result is unspecified if one of the arguments contains - the float value [nan]. ") + the float value [nan]. */ external min: ('a, 'a) => 'a = "%bs_min" -@ocaml.doc(" Return the greater of the two arguments. +/** Return the greater of the two arguments. The result is unspecified if one of the arguments contains - the float value [nan]. ") + the float value [nan]. */ external max: ('a, 'a) => 'a = "%bs_max" -@ocaml.doc(" [e1 == e2] tests for physical equality of [e1] and [e2]. +/** [e1 == e2] tests for physical equality of [e1] and [e2]. On mutable types such as references, arrays, byte sequences, records with mutable fields and objects with mutable instance variables, [e1 == e2] is true if and only if physical modification of [e1] @@ -122,106 +135,106 @@ external max: ('a, 'a) => 'a = "%bs_max" On non-mutable types, the behavior of [( == )] is implementation-dependent; however, it is guaranteed that [e1 == e2] implies [compare e1 e2 = 0]. - Left-associative operator at precedence level 4/11. ") + Left-associative operator at precedence level 4/11. */ external \"==": ('a, 'a) => bool = "%eq" -@ocaml.doc(" Negation of {!Pervasives.( == )}. - Left-associative operator at precedence level 4/11. ") +/** Negation of {!Pervasives.( == )}. + Left-associative operator at precedence level 4/11. */ external \"!=": ('a, 'a) => bool = "%noteq" @@ocaml.text(" {1 Boolean operations} ") -@ocaml.doc(" The boolean negation. ") +/** The boolean negation. */ external not: bool => bool = "%boolnot" -@ocaml.doc(" The boolean 'and'. Evaluation is sequential, left-to-right: +/** The boolean 'and'. Evaluation is sequential, left-to-right: in [e1 && e2], [e1] is evaluated first, and if it returns [false], [e2] is not evaluated at all. - Right-associative operator at precedence level 3/11. ") + Right-associative operator at precedence level 3/11. */ external \"&&": (bool, bool) => bool = "%sequand" -@ocaml.doc(" The boolean 'or'. Evaluation is sequential, left-to-right: +/** The boolean 'or'. Evaluation is sequential, left-to-right: in [e1 || e2], [e1] is evaluated first, and if it returns [true], [e2] is not evaluated at all. Right-associative operator at precedence level 2/11. -") +*/ external \"||": (bool, bool) => bool = "%sequor" @@ocaml.text(" {1 Debugging} ") -@ocaml.doc(" [__LOC__] returns the location at which this expression appears in +/** [__LOC__] returns the location at which this expression appears in the file currently being parsed by the compiler, with the standard error format of OCaml: \"File %S, line %d, characters %d-%d\". @since 4.02.0 -") +*/ external __LOC__: string = "%loc_LOC" -@ocaml.doc(" [__FILE__] returns the name of the file currently being +/** [__FILE__] returns the name of the file currently being parsed by the compiler. @since 4.02.0 -") +*/ external __FILE__: string = "%loc_FILE" -@ocaml.doc(" [__LINE__] returns the line number at which this expression +/** [__LINE__] returns the line number at which this expression appears in the file currently being parsed by the compiler. @since 4.02.0 -") +*/ external __LINE__: int = "%loc_LINE" -@ocaml.doc(" [__MODULE__] returns the module name of the file being +/** [__MODULE__] returns the module name of the file being parsed by the compiler. @since 4.02.0 -") +*/ external __MODULE__: string = "%loc_MODULE" -@ocaml.doc(" [__POS__] returns a tuple [(file,lnum,cnum,enum)], corresponding +/** [__POS__] returns a tuple [(file,lnum,cnum,enum)], corresponding to the location at which this expression appears in the file currently being parsed by the compiler. [file] is the current filename, [lnum] the line number, [cnum] the character position in the line and [enum] the last character position in the line. @since 4.02.0 - ") + */ external __POS__: (string, int, int, int) = "%loc_POS" -@ocaml.doc(" [__LOC_OF__ expr] returns a pair [(loc, expr)] where [loc] is the +/** [__LOC_OF__ expr] returns a pair [(loc, expr)] where [loc] is the location of [expr] in the file currently being parsed by the compiler, with the standard error format of OCaml: \"File %S, line %d, characters %d-%d\". @since 4.02.0 -") +*/ external __LOC_OF__: 'a => (string, 'a) = "%loc_LOC" -@ocaml.doc(" [__LINE__ expr] returns a pair [(line, expr)], where [line] is the +/** [__LINE__ expr] returns a pair [(line, expr)], where [line] is the line number at which the expression [expr] appears in the file currently being parsed by the compiler. @since 4.02.0 - ") + */ external __LINE_OF__: 'a => (int, 'a) = "%loc_LINE" -@ocaml.doc(" [__POS_OF__ expr] returns a pair [(loc,expr)], where [loc] is a +/** [__POS_OF__ expr] returns a pair [(loc,expr)], where [loc] is a tuple [(file,lnum,cnum,enum)] corresponding to the location at which the expression [expr] appears in the file currently being parsed by the compiler. [file] is the current filename, [lnum] the line number, [cnum] the character position in the line and [enum] the last character position in the line. @since 4.02.0 - ") + */ external __POS_OF__: 'a => ((string, int, int, int), 'a) = "%loc_POS" @@ocaml.text(" {1 Composition operators} ") -@ocaml.doc(" Reverse-application operator: [x |> f |> g] is exactly equivalent +/** Reverse-application operator: [x |> f |> g] is exactly equivalent to [g (f (x))]. Left-associative operator at precedence level 4/11. @since 4.01 - ") + */ external \"|>": ('a, 'a => 'b) => 'b = "%revapply" -@ocaml.doc(" Application operator: [g @@ f @@ x] is exactly equivalent to +/** Application operator: [g @@ f @@ x] is exactly equivalent to [g (f (x))]. Right-associative operator at precedence level 5/11. @since 4.01 -") +*/ external \"@@": ('a => 'b, 'a) => 'b = "%apply" @@ocaml.text(" {1 Integer arithmetic} ") @@ -230,100 +243,100 @@ external \"@@": ('a => 'b, 'a) => 'b = "%apply" All operations are taken modulo 2{^31} (or 2{^63}). They do not fail on overflow. ") -@ocaml.doc(" Unary negation. You can also write [- e] instead of [~- e]. +/** Unary negation. You can also write [- e] instead of [~- e]. Unary operator at precedence level 9/11 for [- e] - and 11/11 for [~- e]. ") + and 11/11 for [~- e]. */ external \"~-": int => int = "%negint" -@ocaml.doc(" Unary addition. You can also write [+ e] instead of [~+ e]. +/** Unary addition. You can also write [+ e] instead of [~+ e]. Unary operator at precedence level 9/11 for [+ e] and 11/11 for [~+ e]. @since 3.12.0 -") +*/ external \"~+": int => int = "%identity" -@ocaml.doc(" [succ x] is [x + 1]. ") +/** [succ x] is [x + 1]. */ external succ: int => int = "%succint" -@ocaml.doc(" [pred x] is [x - 1]. ") +/** [pred x] is [x - 1]. */ external pred: int => int = "%predint" -@ocaml.doc(" Integer addition. - Left-associative operator at precedence level 6/11. ") +/** Integer addition. + Left-associative operator at precedence level 6/11. */ external \"+": (int, int) => int = "%addint" -@ocaml.doc(" Integer subtraction. - Left-associative operator at precedence level 6/11. ") +/** Integer subtraction. + Left-associative operator at precedence level 6/11. */ external \"-": (int, int) => int = "%subint" -@ocaml.doc(" Integer multiplication. - Left-associative operator at precedence level 7/11. ") +/** Integer multiplication. + Left-associative operator at precedence level 7/11. */ external \"*": (int, int) => int = "%mulint" -@ocaml.doc(" Integer division. +/** Integer division. Raise [Division_by_zero] if the second argument is 0. Integer division rounds the real quotient of its arguments towards zero. More precisely, if [x >= 0] and [y > 0], [x / y] is the greatest integer less than or equal to the real quotient of [x] by [y]. Moreover, [(- x) / y = x / (- y) = - (x / y)]. - Left-associative operator at precedence level 7/11. ") + Left-associative operator at precedence level 7/11. */ external \"/": (int, int) => int = "%divint" -@ocaml.doc(" Integer remainder. If [y] is not zero, the result +/** Integer remainder. If [y] is not zero, the result of [x mod y] satisfies the following properties: [x = (x / y) * y + x mod y] and [abs(x mod y) <= abs(y) - 1]. If [y = 0], [x mod y] raises [Division_by_zero]. Note that [x mod y] is negative only if [x < 0]. Raise [Division_by_zero] if [y] is zero. - Left-associative operator at precedence level 7/11. ") + Left-associative operator at precedence level 7/11. */ external mod: (int, int) => int = "%modint" -@ocaml.doc(" Return the absolute value of the argument. Note that this may be - negative if the argument is [min_int]. ") +/** Return the absolute value of the argument. Note that this may be + negative if the argument is [min_int]. */ let abs: int => int -@ocaml.doc(" The greatest representable integer. ") +/** The greatest representable integer. */ let max_int: int -@ocaml.doc(" The smallest representable integer. ") +/** The smallest representable integer. */ let min_int: int @@ocaml.text(" {2 Bitwise operations} ") -@ocaml.doc(" Bitwise logical and. - Left-associative operator at precedence level 7/11. ") +/** Bitwise logical and. + Left-associative operator at precedence level 7/11. */ external land: (int, int) => int = "%andint" -@ocaml.doc(" Bitwise logical or. - Left-associative operator at precedence level 7/11. ") +/** Bitwise logical or. + Left-associative operator at precedence level 7/11. */ external lor: (int, int) => int = "%orint" -@ocaml.doc(" Bitwise logical exclusive or. - Left-associative operator at precedence level 7/11. ") +/** Bitwise logical exclusive or. + Left-associative operator at precedence level 7/11. */ external lxor: (int, int) => int = "%xorint" -@ocaml.doc(" Bitwise logical negation. ") +/** Bitwise logical negation. */ let lnot: int => int -@ocaml.doc(" [n lsl m] shifts [n] to the left by [m] bits. +/** [n lsl m] shifts [n] to the left by [m] bits. The result is unspecified if [m < 0] or [m >= bitsize], where [bitsize] is [32] on a 32-bit platform and [64] on a 64-bit platform. - Right-associative operator at precedence level 8/11. ") + Right-associative operator at precedence level 8/11. */ external lsl: (int, int) => int = "%lslint" -@ocaml.doc(" [n lsr m] shifts [n] to the right by [m] bits. +/** [n lsr m] shifts [n] to the right by [m] bits. This is a logical shift: zeroes are inserted regardless of the sign of [n]. The result is unspecified if [m < 0] or [m >= bitsize]. - Right-associative operator at precedence level 8/11. ") + Right-associative operator at precedence level 8/11. */ external lsr: (int, int) => int = "%lsrint" -@ocaml.doc(" [n asr m] shifts [n] to the right by [m] bits. +/** [n asr m] shifts [n] to the right by [m] bits. This is an arithmetic shift: the sign bit of [n] is replicated. The result is unspecified if [m < 0] or [m >= bitsize]. - Right-associative operator at precedence level 8/11. ") + Right-associative operator at precedence level 8/11. */ external asr: (int, int) => int = "%asrint" @@ocaml.text(" {1 Floating-point arithmetic} @@ -340,217 +353,215 @@ external asr: (int, int) => int = "%asrint" as argument returns [nan] as result. ") -@ocaml.doc(" Unary negation. You can also write [-. e] instead of [~-. e]. +/** Unary negation. You can also write [-. e] instead of [~-. e]. Unary operator at precedence level 9/11 for [-. e] - and 11/11 for [~-. e]. ") + and 11/11 for [~-. e]. */ external \"~-.": float => float = "%negfloat" -@ocaml.doc(" Unary addition. You can also write [+. e] instead of [~+. e]. +/** Unary addition. You can also write [+. e] instead of [~+. e]. Unary operator at precedence level 9/11 for [+. e] and 11/11 for [~+. e]. @since 3.12.0 -") +*/ external \"~+.": float => float = "%identity" -@ocaml.doc(" Floating-point addition. - Left-associative operator at precedence level 6/11. ") +/** Floating-point addition. + Left-associative operator at precedence level 6/11. */ external \"+.": (float, float) => float = "%addfloat" -@ocaml.doc(" Floating-point subtraction. - Left-associative operator at precedence level 6/11. ") +/** Floating-point subtraction. + Left-associative operator at precedence level 6/11. */ external \"-.": (float, float) => float = "%subfloat" -@ocaml.doc(" Floating-point multiplication. - Left-associative operator at precedence level 7/11. ") +/** Floating-point multiplication. + Left-associative operator at precedence level 7/11. */ external \"*.": (float, float) => float = "%mulfloat" -@ocaml.doc(" Floating-point division. - Left-associative operator at precedence level 7/11. ") +/** Floating-point division. + Left-associative operator at precedence level 7/11. */ external \"/.": (float, float) => float = "%divfloat" -@val @scope("Math") @ocaml.doc(" Exponentiation. ") +@val @scope("Math") /** Exponentiation. */ external \"**": (float, float) => float = "pow" -@val @scope("Math") @ocaml.doc(" Square root. ") +@val @scope("Math") /** Square root. */ external sqrt: float => float = "sqrt" -@val @scope("Math") @ocaml.doc(" Exponential. ") +@val @scope("Math") /** Exponential. */ external exp: float => float = "exp" -@val @scope("Math") @ocaml.doc(" Natural logarithm. ") +@val @scope("Math") /** Natural logarithm. */ external log: float => float = "log" -@val @scope("Math") @ocaml.doc(" Base 10 logarithm. ") +@val @scope("Math") /** Base 10 logarithm. */ external log10: float => float = "log10" -@ocaml.doc(" [expm1 x] computes [exp x -. 1.0], giving numerically-accurate results +/** [expm1 x] computes [exp x -. 1.0], giving numerically-accurate results even if [x] is close to [0.0]. @since 3.12.0 -") +*/ external expm1: float => float = "?expm1_float" @val @scope("Math") -@ocaml.doc(" [log1p x] computes [log(1.0 +. x)] (natural logarithm), +/** [log1p x] computes [log(1.0 +. x)] (natural logarithm), giving numerically-accurate results even if [x] is close to [0.0]. @since 3.12.0 -") +*/ external log1p: float => float = "log1p" -@val @scope("Math") @ocaml.doc(" Cosine. Argument is in radians. ") +@val @scope("Math") /** Cosine. Argument is in radians. */ external cos: float => float = "cos" -@val @scope("Math") @ocaml.doc(" Sine. Argument is in radians. ") +@val @scope("Math") /** Sine. Argument is in radians. */ external sin: float => float = "sin" -@val @scope("Math") @ocaml.doc(" Tangent. Argument is in radians. ") +@val @scope("Math") /** Tangent. Argument is in radians. */ external tan: float => float = "tan" @val @scope("Math") -@ocaml.doc(" Arc cosine. The argument must fall within the range [[-1.0, 1.0]]. - Result is in radians and is between [0.0] and [pi]. ") +/** Arc cosine. The argument must fall within the range [[-1.0, 1.0]]. + Result is in radians and is between [0.0] and [pi]. */ external acos: float => float = "acos" @val @scope("Math") -@ocaml.doc(" Arc sine. The argument must fall within the range [[-1.0, 1.0]]. - Result is in radians and is between [-pi/2] and [pi/2]. ") +/** Arc sine. The argument must fall within the range [[-1.0, 1.0]]. + Result is in radians and is between [-pi/2] and [pi/2]. */ external asin: float => float = "asin" -@val -@scope("Math") -@ocaml.doc(" Arc tangent. - Result is in radians and is between [-pi/2] and [pi/2]. ") +@val @scope("Math") /** Arc tangent. + Result is in radians and is between [-pi/2] and [pi/2]. */ external atan: float => float = "atan" @val @scope("Math") -@ocaml.doc(" [atan2 y x] returns the arc tangent of [y /. x]. The signs of [x] +/** [atan2 y x] returns the arc tangent of [y /. x]. The signs of [x] and [y] are used to determine the quadrant of the result. - Result is in radians and is between [-pi] and [pi]. ") + Result is in radians and is between [-pi] and [pi]. */ external atan2: (float, float) => float = "atan2" -@ocaml.doc(" [hypot x y] returns [sqrt(x *. x + y *. y)], that is, the length +/** [hypot x y] returns [sqrt(x *. x + y *. y)], that is, the length of the hypotenuse of a right-angled triangle with sides of length [x] and [y], or, equivalently, the distance of the point [(x,y)] to origin. - @since 4.00.0 ") + @since 4.00.0 */ external hypot: (float, float) => float = "?hypot_float" -@val @scope("Math") @ocaml.doc(" Hyperbolic cosine. Argument is in radians. ") +@val @scope("Math") /** Hyperbolic cosine. Argument is in radians. */ external cosh: float => float = "cosh" -@val @scope("Math") @ocaml.doc(" Hyperbolic sine. Argument is in radians. ") +@val @scope("Math") /** Hyperbolic sine. Argument is in radians. */ external sinh: float => float = "sinh" -@val @scope("Math") @ocaml.doc(" Hyperbolic tangent. Argument is in radians. ") +@val @scope("Math") /** Hyperbolic tangent. Argument is in radians. */ external tanh: float => float = "tanh" @val @scope("Math") -@ocaml.doc(" Round above to an integer value. +/** Round above to an integer value. [ceil f] returns the least integer value greater than or equal to [f]. - The result is returned as a float. ") + The result is returned as a float. */ external ceil: float => float = "ceil" @val @scope("Math") -@ocaml.doc(" Round below to an integer value. +/** Round below to an integer value. [floor f] returns the greatest integer value less than or equal to [f]. - The result is returned as a float. ") + The result is returned as a float. */ external floor: float => float = "floor" -@val @scope("Math") @ocaml.doc(" [abs_float f] returns the absolute value of [f]. ") +@val @scope("Math") /** [abs_float f] returns the absolute value of [f]. */ external abs_float: float => float = "abs" -@ocaml.doc(" [copysign x y] returns a float whose absolute value is that of [x] +/** [copysign x y] returns a float whose absolute value is that of [x] and whose sign is that of [y]. If [x] is [nan], returns [nan]. If [y] is [nan], returns either [x] or [-. x], but it is not specified which. - @since 4.00.0 ") + @since 4.00.0 */ external copysign: (float, float) => float = "?copysign_float" -@ocaml.doc(" [mod_float a b] returns the remainder of [a] with respect to +/** [mod_float a b] returns the remainder of [a] with respect to [b]. The returned value is [a -. n *. b], where [n] - is the quotient [a /. b] rounded towards zero to an integer. ") + is the quotient [a /. b] rounded towards zero to an integer. */ external mod_float: (float, float) => float = "?fmod_float" -@ocaml.doc(" [frexp f] returns the pair of the significant +/** [frexp f] returns the pair of the significant and the exponent of [f]. When [f] is zero, the significant [x] and the exponent [n] of [f] are equal to zero. When [f] is non-zero, they are defined by - [f = x *. 2 ** n] and [0.5 <= x < 1.0]. ") + [f = x *. 2 ** n] and [0.5 <= x < 1.0]. */ external frexp: float => (float, int) = "?frexp_float" -@ocaml.doc(" [ldexp x n] returns [x *. 2 ** n]. ") +/** [ldexp x n] returns [x *. 2 ** n]. */ external ldexp: (float, int) => float = "?ldexp_float" -@ocaml.doc(" [modf f] returns the pair of the fractional and integral - part of [f]. ") +/** [modf f] returns the pair of the fractional and integral + part of [f]. */ external modf: float => (float, float) = "?modf_float" -@ocaml.doc(" Same as {!Pervasives.float_of_int}. ") +/** Same as {!Pervasives.float_of_int}. */ external float: int => float = "%floatofint" -@ocaml.doc(" Convert an integer to floating-point. ") +/** Convert an integer to floating-point. */ external float_of_int: int => float = "%floatofint" -@ocaml.doc(" Same as {!Pervasives.int_of_float}. ") +/** Same as {!Pervasives.int_of_float}. */ external truncate: float => int = "%intoffloat" -@ocaml.doc(" Truncate the given floating-point number to an integer. +/** Truncate the given floating-point number to an integer. The result is unspecified if the argument is [nan] or falls outside the - range of representable integers. ") + range of representable integers. */ external int_of_float: float => int = "%intoffloat" -@ocaml.doc(" Positive infinity. ") +/** Positive infinity. */ let infinity: float -@ocaml.doc(" Negative infinity. ") +/** Negative infinity. */ let neg_infinity: float @val @scope("Number") -@ocaml.doc(" A special floating-point value denoting the result of an +/** A special floating-point value denoting the result of an undefined operation such as [0.0 /. 0.0]. Stands for 'not a number'. Any floating-point operation with [nan] as argument returns [nan] as result. As for floating-point comparisons, [=], [<], [<=], [>] and [>=] return [false] and [<>] returns [true] - if one or both of their arguments is [nan]. ") + if one or both of their arguments is [nan]. */ external nan: float = "NaN" /* we could also use [0. /. 0.] */ -@ocaml.doc(" The largest positive finite value of type [float]. ") +/** The largest positive finite value of type [float]. */ let max_float: float -@ocaml.doc(" The smallest positive, non-zero, non-denormalized value of type [float]. ") +/** The smallest positive, non-zero, non-denormalized value of type [float]. */ let min_float: float -@ocaml.doc(" The difference between [1.0] and the smallest exactly representable - floating-point number greater than [1.0]. ") +/** The difference between [1.0] and the smallest exactly representable + floating-point number greater than [1.0]. */ let epsilon_float: float -@ocaml.doc(" The five classes of floating-point numbers, as determined by - the {!Pervasives.classify_float} function. ") +/** The five classes of floating-point numbers, as determined by + the {!Pervasives.classify_float} function. */ type fpclass = - | @ocaml.doc(" Normal number, none of the below ") FP_normal - | @ocaml.doc(" Number very close to 0.0, has reduced precision ") FP_subnormal - | @ocaml.doc(" Number is 0.0 or -0.0 ") FP_zero - | @ocaml.doc(" Number is positive or negative infinity ") FP_infinite - | @ocaml.doc(" Not a number: result of an undefined operation ") FP_nan - -@ocaml.doc(" Return the class of the given floating-point number: - normal, subnormal, zero, infinite, or not a number. ") + | /** Normal number, none of the below */ FP_normal + | /** Number very close to 0.0, has reduced precision */ FP_subnormal + | /** Number is 0.0 or -0.0 */ FP_zero + | /** Number is positive or negative infinity */ FP_infinite + | /** Not a number: result of an undefined operation */ FP_nan + +/** Return the class of the given floating-point number: + normal, subnormal, zero, infinite, or not a number. */ let classify_float: float => fpclass -@ocaml.doc(" {1 String operations} +/** {1 String operations} More string operations are provided in module {!String}. -") -@ocaml.doc(" String concatenation. - Right-associative operator at precedence level 5/11. ") +*/ +/** String concatenation. + Right-associative operator at precedence level 5/11. */ external \"^": (string, string) => string = "#string_append" @@ocaml.text(" {1 Character operations} @@ -558,47 +569,47 @@ external \"^": (string, string) => string = "#string_append" More character operations are provided in module {!Char}. ") -@ocaml.doc(" Return the ASCII code of the argument. ") +/** Return the ASCII code of the argument. */ external int_of_char: char => int = "%identity" -@ocaml.doc(" Return the character with the given ASCII code. +/** Return the character with the given ASCII code. Raise [Invalid_argument \"char_of_int\"] if the argument is - outside the range 0--255. ") + outside the range 0--255. */ let char_of_int: int => char @@ocaml.text(" {1 Unit operations} ") -@ocaml.doc(" Discard the value of its argument and return [()]. +/** Discard the value of its argument and return [()]. For instance, [ignore(f x)] discards the result of the side-effecting function [f]. It is equivalent to [f x; ()], except that the latter may generate a compiler warning; writing [ignore(f x)] instead - avoids the warning. ") + avoids the warning. */ external ignore: 'a => unit = "%ignore" @@ocaml.text(" {1 String conversion functions} ") -@ocaml.doc(" Return the string representation of a boolean. As the returned values +/** Return the string representation of a boolean. As the returned values may be shared, the user should not modify them directly. -") +*/ let string_of_bool: bool => string -@ocaml.doc(" Convert the given string to a boolean. +/** Convert the given string to a boolean. Raise [Invalid_argument \"bool_of_string\"] if the string is not - [\"true\"] or [\"false\"]. ") + [\"true\"] or [\"false\"]. */ let bool_of_string: string => bool -@ocaml.doc(" Convert the given string to a boolean. +/** Convert the given string to a boolean. Return [None] if the string is not [\"true\"] or [\"false\"]. @since 4.05 -") +*/ let bool_of_string_opt: string => option -@val @ocaml.doc(" Return the string representation of an integer, in decimal. ") +@val /** Return the string representation of an integer, in decimal. */ external string_of_int: int => string = "String" -@ocaml.doc(" Convert the given string to an integer. +/** Convert the given string to an integer. The string is read in decimal (by default, or if the string begins with [0u]), in hexadecimal (if it begins with [0x] or [0X]), in octal (if it begins with [0o] or [0O]), or in binary @@ -613,21 +624,21 @@ external string_of_int: int => string = "String" and is ignored. Raise [Failure \"int_of_string\"] if the given string is not a valid representation of an integer, or if the integer represented - exceeds the range of integers representable in type [int]. ") + exceeds the range of integers representable in type [int]. */ external int_of_string: string => int = "?int_of_string" -@ocaml.doc(" Same as [int_of_string], but returns [None] instead of raising. +/** Same as [int_of_string], but returns [None] instead of raising. @since 4.05 -") +*/ let int_of_string_opt: string => option @ocaml.deprecated( "Please use Js.Float.toString instead, string_of_float generates unparseable floats" ) -@ocaml.doc(" Return the string representation of a floating-point number. ") +/** Return the string representation of a floating-point number. */ let string_of_float: float => string -@ocaml.doc(" Convert the given string to a float. The string is read in decimal +/** Convert the given string to a float. The string is read in decimal (by default) or in hexadecimal (marked by [0x] or [0X]). The format of decimal floating-point numbers is [ [-] dd.ddd (e|E) [+|-] dd ], where [d] stands for a decimal digit. @@ -641,20 +652,20 @@ let string_of_float: float => string Depending on the execution platforms, other representations of floating-point numbers can be accepted, but should not be relied upon. Raise [Failure \"float_of_string\"] if the given string is not a valid - representation of a float. ") + representation of a float. */ external float_of_string: string => float = "?float_of_string" -@ocaml.doc(" Same as [float_of_string], but returns [None] instead of raising. +/** Same as [float_of_string], but returns [None] instead of raising. @since 4.05 -") +*/ let float_of_string_opt: string => option @@ocaml.text(" {1 Pair operations} ") -@ocaml.doc(" Return the first component of a pair. ") +/** Return the first component of a pair. */ external fst: (('a, 'b)) => 'a = "%field0" -@ocaml.doc(" Return the second component of a pair. ") +/** Return the second component of a pair. */ external snd: (('a, 'b)) => 'b = "%field1" @@ocaml.text(" {1 List operations} @@ -663,89 +674,89 @@ external snd: (('a, 'b)) => 'b = "%field1" ") @ocaml.deprecated("Use Belt.List.concat instead") -@ocaml.doc(" List concatenation. Tail-recursive (length of the first argument). - Right-associative operator at precedence level 5/11. ") +/** List concatenation. Tail-recursive (length of the first argument). + Right-associative operator at precedence level 5/11. */ let \"@": (list<'a>, list<'a>) => list<'a> type int32 = int -@ocaml.doc(" Print a string on standard output. ") +/** Print a string on standard output. */ let print_string: string => unit -@ocaml.doc(" Print an integer, in decimal, on standard output. ") +/** Print an integer, in decimal, on standard output. */ let print_int: int => unit -@ocaml.doc(" Print a floating-point number, in decimal, on standard output. ") +/** Print a floating-point number, in decimal, on standard output. */ let print_float: float => unit -@ocaml.doc(" Print a floating-point number, in decimal, on standard output. ") +/** Print a floating-point number, in decimal, on standard output. */ @val @scope("console") -@ocaml.doc(" Print a string, followed by a newline character, on - standard output and flush standard output. ") +/** Print a string, followed by a newline character, on + standard output and flush standard output. */ external print_endline: string => unit = "log" -@ocaml.doc(" Print a newline character on standard output, and flush +/** Print a newline character on standard output, and flush standard output. This can be used to simulate line - buffering of standard output. ") + buffering of standard output. */ let print_newline: unit => unit @val @scope("console") -@ocaml.doc(" Print a string, followed by a newline character on standard - error and flush standard error. ") +/** Print a string, followed by a newline character on standard + error and flush standard error. */ external prerr_endline: string => unit = "error" -@ocaml.doc(" Print a newline character on standard error, and flush - standard error. ") +/** Print a newline character on standard error, and flush + standard error. */ let prerr_newline: unit => unit @@ocaml.text(" {1 References} ") -@ocaml.doc(" The type of references (mutable indirection cells) containing - a value of type ['a]. ") +/** The type of references (mutable indirection cells) containing + a value of type ['a]. */ type ref<'a> = {mutable contents: 'a} -@ocaml.doc(" Return a fresh reference containing the given value. ") +/** Return a fresh reference containing the given value. */ external ref: 'a => ref<'a> = "%makemutable" -@ocaml.doc(" [!r] returns the current contents of reference [r]. +/** [!r] returns the current contents of reference [r]. Equivalent to [fun r -> r.contents]. - Unary operator at precedence level 11/11.") + Unary operator at precedence level 11/11.*/ external \"!": ref<'a> => 'a = "%bs_ref_field0" -@ocaml.doc(" [r := a] stores the value of [a] in reference [r]. +/** [r := a] stores the value of [a] in reference [r]. Equivalent to [fun r v -> r.contents <- v]. - Right-associative operator at precedence level 1/11. ") + Right-associative operator at precedence level 1/11. */ external \":=": (ref<'a>, 'a) => unit = "%bs_ref_setfield0" -@ocaml.doc(" Increment the integer contained in the given reference. - Equivalent to [fun r -> r := succ !r]. ") +/** Increment the integer contained in the given reference. + Equivalent to [fun r -> r := succ !r]. */ external incr: ref => unit = "%incr" -@ocaml.doc(" Decrement the integer contained in the given reference. - Equivalent to [fun r -> r := pred !r]. ") +/** Decrement the integer contained in the given reference. + Equivalent to [fun r -> r := pred !r]. */ external decr: ref => unit = "%decr" @@ocaml.text(" {1 Result type} ") -@ocaml.doc(" @since 4.03.0 ") +/** @since 4.03.0 */ type result<'a, 'b> = Belt.Result.t<'a, 'b> = | Ok('a) | Error('b) @@ocaml.text(" {1 Program termination} ") -@ocaml.doc(" Terminate the process, returning the given status code +/** Terminate the process, returning the given status code to the operating system: usually 0 to indicate no errors, and a small positive integer to indicate failure. All open output channels are flushed with [flush_all]. An implicit [exit 0] is performed each time a program terminates normally. An implicit [exit 2] is performed if the program - terminates early because of an uncaught exception. ") + terminates early because of an uncaught exception. */ let exit: int => 'a -@ocaml.doc(" Register the given function to be called at program termination +/** Register the given function to be called at program termination time. The functions registered with [at_exit] will be called when the program does any of the following: - executes {!Pervasives.exit} @@ -753,7 +764,7 @@ let exit: int => 'a exception - executes the C function [caml_shutdown]. The functions are called in 'last in, first out' order: the - function most recently added with [at_exit] is called first. ") + function most recently added with [at_exit] is called first. */ let at_exit: (unit => unit) => unit @@ocaml.text("/*") diff --git a/jscomp/stdlib-406/pervasivesU.res b/jscomp/stdlib-406/pervasivesU.res index 3c1600b87d..237d0dabc0 100644 --- a/jscomp/stdlib-406/pervasivesU.res +++ b/jscomp/stdlib-406/pervasivesU.res @@ -15,23 +15,14 @@ @@uncurried -module Jsx = { - type element - type ref - - @val external null: element = "null" - - external float: float => element = "%identity" - external int: int => element = "%identity" - external string: string => element = "%identity" - - external array: array => element = "%identity" - - type componentLike<'props, 'return> = 'props => 'return - type component<'props> = componentLike<'props, element> - - /* this function exists to prepare for making `component` abstract */ - external component: componentLike<'props, element> => component<'props> = "%identity" +module Jsx = JsxU +module JsxEvent = JsxEventU +module JsxDOM = JsxDOMU +module JsxPPXReactSupport = JsxPPXReactSupportU +module JsxModules = { + module Jsx = JsxU + module JsxEvent = JsxEventU + module JsxDOM = JsxDOMU } /* Internal */ diff --git a/jscomp/stdlib-406/pervasivesU.resi b/jscomp/stdlib-406/pervasivesU.resi index 249e9c313b..b1457626aa 100644 --- a/jscomp/stdlib-406/pervasivesU.resi +++ b/jscomp/stdlib-406/pervasivesU.resi @@ -26,76 +26,70 @@ @@uncurried -module Jsx: { - type element - type ref - - @val external null: element = "null" - - external float: float => element = "%identity" - external int: int => element = "%identity" - external string: string => element = "%identity" - - external array: array => element = "%identity" - - type componentLike<'props, 'return> = 'props => 'return - type component<'props> = componentLike<'props, element> - - /* this function exists to prepare for making `component` abstract */ - external component: componentLike<'props, element> => component<'props> = "%identity" +module Jsx = JsxU +module JsxEvent = JsxEventU +module JsxDOM = JsxDOMU +module JsxPPXReactSupport = JsxPPXReactSupportU + +/* For autocomplete */ +module JsxModules: { + module Jsx = JsxU + module JsxEvent = JsxEventU + module JsxDOM = JsxDOMU + // skip JsxPPXReactSupport as it's not user-facing } /* Internal */ external __unsafe_cast: 'a => 'b = "%identity" -@@ocaml.text(" {1 Exceptions} ") +/*** {1 Exceptions} */ -@ocaml.doc(" Raise the given exception value ") +/** Raise the given exception value */ external raise: exn => 'a = "%raise" -@ocaml.doc(" A faster version [raise] which does not record the backtrace. +/** A faster version [raise] which does not record the backtrace. @since 4.02.0 -") +*/ external raise_notrace: exn => 'a = "%raise_notrace" -@ocaml.doc(" Raise exception [Invalid_argument] with the given string. ") +/** Raise exception [Invalid_argument] with the given string. */ let invalid_arg: string => 'a -@ocaml.doc(" Raise exception [Failure] with the given string. ") +/** Raise exception [Failure] with the given string. */ let failwith: string => 'a -@ocaml.doc(" The [Exit] exception is not raised by any library function. It is - provided for use in your programs. ") +/** The [Exit] exception is not raised by any library function. It is + provided for use in your programs. */ exception Exit -@@ocaml.text(" {1 Comparisons} ") +/*** {1 Comparisons} */ -@ocaml.doc(" [e1 = e2] tests for structural equality of [e1] and [e2]. +/** [e1 = e2] tests for structural equality of [e1] and [e2]. Mutable structures (e.g. references and arrays) are equal if and only if their current contents are structurally equal, even if the two mutable objects are not the same physical object. Equality between functional values raises [Invalid_argument]. Equality between cyclic data structures may not terminate. - Left-associative operator at precedence level 4/11. ") + Left-associative operator at precedence level 4/11. */ external \"=": ('a, 'a) => bool = "%equal" -@ocaml.doc(" Negation of {!Pervasives.( = )}. - Left-associative operator at precedence level 4/11. ") +/** Negation of {!Pervasives.( = )}. + Left-associative operator at precedence level 4/11. */ external \"<>": ('a, 'a) => bool = "%notequal" -@ocaml.doc(" See {!Pervasives.( >= )}. - Left-associative operator at precedence level 4/11. ") +/** See {!Pervasives.( >= )}. + Left-associative operator at precedence level 4/11. */ external \"<": ('a, 'a) => bool = "%lessthan" -@ocaml.doc(" See {!Pervasives.( >= )}. - Left-associative operator at precedence level 4/11. ") +/** See {!Pervasives.( >= )}. + Left-associative operator at precedence level 4/11. */ external \">": ('a, 'a) => bool = "%greaterthan" -@ocaml.doc(" See {!Pervasives.( >= )}. - Left-associative operator at precedence level 4/11. ") +/** See {!Pervasives.( >= )}. + Left-associative operator at precedence level 4/11. */ external \"<=": ('a, 'a) => bool = "%lessequal" -@ocaml.doc(" Structural ordering functions. These functions coincide with +/** Structural ordering functions. These functions coincide with the usual orderings over integers, characters, strings, byte sequences and floating-point numbers, and extend them to a total ordering over all types. @@ -103,10 +97,10 @@ external \"<=": ('a, 'a) => bool = "%lessequal" of [( = )], mutable structures are compared by contents. Comparison between functional values raises [Invalid_argument]. Comparison between cyclic structures may not terminate. - Left-associative operator at precedence level 4/11. ") + Left-associative operator at precedence level 4/11. */ external \">=": ('a, 'a) => bool = "%greaterequal" -@ocaml.doc(" [compare x y] returns [0] if [x] is equal to [y], +/** [compare x y] returns [0] if [x] is equal to [y], a negative integer if [x] is less than [y], and a positive integer if [x] is greater than [y]. The ordering implemented by [compare] is compatible with the comparison predicates [=], [<] and [>] @@ -122,20 +116,20 @@ external \">=": ('a, 'a) => bool = "%greaterequal" The [compare] function can be used as the comparison function required by the {!Set.Make} and {!Map.Make} functors, as well as - the {!List.sort} and {!Array.sort} functions. ") + the {!List.sort} and {!Array.sort} functions. */ external compare: ('a, 'a) => int = "%compare" -@ocaml.doc(" Return the smaller of the two arguments. +/** Return the smaller of the two arguments. The result is unspecified if one of the arguments contains - the float value [nan]. ") + the float value [nan]. */ external min: ('a, 'a) => 'a = "%bs_min" -@ocaml.doc(" Return the greater of the two arguments. +/** Return the greater of the two arguments. The result is unspecified if one of the arguments contains - the float value [nan]. ") + the float value [nan]. */ external max: ('a, 'a) => 'a = "%bs_max" -@ocaml.doc(" [e1 == e2] tests for physical equality of [e1] and [e2]. +/** [e1 == e2] tests for physical equality of [e1] and [e2]. On mutable types such as references, arrays, byte sequences, records with mutable fields and objects with mutable instance variables, [e1 == e2] is true if and only if physical modification of [e1] @@ -143,211 +137,211 @@ external max: ('a, 'a) => 'a = "%bs_max" On non-mutable types, the behavior of [( == )] is implementation-dependent; however, it is guaranteed that [e1 == e2] implies [compare e1 e2 = 0]. - Left-associative operator at precedence level 4/11. ") + Left-associative operator at precedence level 4/11. */ external \"==": ('a, 'a) => bool = "%eq" -@ocaml.doc(" Negation of {!Pervasives.( == )}. - Left-associative operator at precedence level 4/11. ") +/** Negation of {!Pervasives.( == )}. + Left-associative operator at precedence level 4/11. */ external \"!=": ('a, 'a) => bool = "%noteq" -@@ocaml.text(" {1 Boolean operations} ") +/*** {1 Boolean operations} */ -@ocaml.doc(" The boolean negation. ") +/** The boolean negation. */ external not: bool => bool = "%boolnot" -@ocaml.doc(" The boolean 'and'. Evaluation is sequential, left-to-right: +/** The boolean 'and'. Evaluation is sequential, left-to-right: in [e1 && e2], [e1] is evaluated first, and if it returns [false], [e2] is not evaluated at all. - Right-associative operator at precedence level 3/11. ") + Right-associative operator at precedence level 3/11. */ external \"&&": (bool, bool) => bool = "%sequand" -@ocaml.doc(" The boolean 'or'. Evaluation is sequential, left-to-right: +/** The boolean 'or'. Evaluation is sequential, left-to-right: in [e1 || e2], [e1] is evaluated first, and if it returns [true], [e2] is not evaluated at all. Right-associative operator at precedence level 2/11. -") +*/ external \"||": (bool, bool) => bool = "%sequor" -@@ocaml.text(" {1 Debugging} ") +/*** {1 Debugging} */ -@ocaml.doc(" [__LOC__] returns the location at which this expression appears in +/** [__LOC__] returns the location at which this expression appears in the file currently being parsed by the compiler, with the standard error format of OCaml: \"File %S, line %d, characters %d-%d\". @since 4.02.0 -") +*/ external __LOC__: string = "%loc_LOC" -@ocaml.doc(" [__FILE__] returns the name of the file currently being +/** [__FILE__] returns the name of the file currently being parsed by the compiler. @since 4.02.0 -") +*/ external __FILE__: string = "%loc_FILE" -@ocaml.doc(" [__LINE__] returns the line number at which this expression +/** [__LINE__] returns the line number at which this expression appears in the file currently being parsed by the compiler. @since 4.02.0 -") +*/ external __LINE__: int = "%loc_LINE" -@ocaml.doc(" [__MODULE__] returns the module name of the file being +/** [__MODULE__] returns the module name of the file being parsed by the compiler. @since 4.02.0 -") +*/ external __MODULE__: string = "%loc_MODULE" -@ocaml.doc(" [__POS__] returns a tuple [(file,lnum,cnum,enum)], corresponding +/** [__POS__] returns a tuple [(file,lnum,cnum,enum)], corresponding to the location at which this expression appears in the file currently being parsed by the compiler. [file] is the current filename, [lnum] the line number, [cnum] the character position in the line and [enum] the last character position in the line. @since 4.02.0 - ") + */ external __POS__: (string, int, int, int) = "%loc_POS" -@ocaml.doc(" [__LOC_OF__ expr] returns a pair [(loc, expr)] where [loc] is the +/** [__LOC_OF__ expr] returns a pair [(loc, expr)] where [loc] is the location of [expr] in the file currently being parsed by the compiler, with the standard error format of OCaml: \"File %S, line %d, characters %d-%d\". @since 4.02.0 -") +*/ external __LOC_OF__: 'a => (string, 'a) = "%loc_LOC" -@ocaml.doc(" [__LINE__ expr] returns a pair [(line, expr)], where [line] is the +/** [__LINE__ expr] returns a pair [(line, expr)], where [line] is the line number at which the expression [expr] appears in the file currently being parsed by the compiler. @since 4.02.0 - ") + */ external __LINE_OF__: 'a => (int, 'a) = "%loc_LINE" -@ocaml.doc(" [__POS_OF__ expr] returns a pair [(loc,expr)], where [loc] is a +/** [__POS_OF__ expr] returns a pair [(loc,expr)], where [loc] is a tuple [(file,lnum,cnum,enum)] corresponding to the location at which the expression [expr] appears in the file currently being parsed by the compiler. [file] is the current filename, [lnum] the line number, [cnum] the character position in the line and [enum] the last character position in the line. @since 4.02.0 - ") + */ external __POS_OF__: 'a => ((string, int, int, int), 'a) = "%loc_POS" -@@ocaml.text(" {1 Composition operators} ") +/*** {1 Composition operators} */ -@ocaml.doc(" Reverse-application operator: [x |> f |> g] is exactly equivalent +/** Reverse-application operator: [x |> f |> g] is exactly equivalent to [g (f (x))]. Left-associative operator at precedence level 4/11. @since 4.01 - ") + */ external \"|>": ('a, 'a => 'b) => 'b = "%revapply" -@ocaml.doc(" Application operator: [g @@ f @@ x] is exactly equivalent to +/** Application operator: [g @@ f @@ x] is exactly equivalent to [g (f (x))]. Right-associative operator at precedence level 5/11. @since 4.01 -") +*/ external \"@@": ('a => 'b, 'a) => 'b = "%apply" -@@ocaml.text(" {1 Integer arithmetic} ") +/*** {1 Integer arithmetic} */ -@@ocaml.text(" Integers are 31 bits wide (or 63 bits on 64-bit processors). +/*** Integers are 31 bits wide (or 63 bits on 64-bit processors). All operations are taken modulo 2{^31} (or 2{^63}). - They do not fail on overflow. ") + They do not fail on overflow. */ -@ocaml.doc(" Unary negation. You can also write [- e] instead of [~- e]. +/** Unary negation. You can also write [- e] instead of [~- e]. Unary operator at precedence level 9/11 for [- e] - and 11/11 for [~- e]. ") + and 11/11 for [~- e]. */ external \"~-": int => int = "%negint" -@ocaml.doc(" Unary addition. You can also write [+ e] instead of [~+ e]. +/** Unary addition. You can also write [+ e] instead of [~+ e]. Unary operator at precedence level 9/11 for [+ e] and 11/11 for [~+ e]. @since 3.12.0 -") +*/ external \"~+": int => int = "%identity" -@ocaml.doc(" [succ x] is [x + 1]. ") +/** [succ x] is [x + 1]. */ external succ: int => int = "%succint" -@ocaml.doc(" [pred x] is [x - 1]. ") +/** [pred x] is [x - 1]. */ external pred: int => int = "%predint" -@ocaml.doc(" Integer addition. - Left-associative operator at precedence level 6/11. ") +/** Integer addition. + Left-associative operator at precedence level 6/11. */ external \"+": (int, int) => int = "%addint" -@ocaml.doc(" Integer subtraction. - Left-associative operator at precedence level 6/11. ") +/** Integer subtraction. + Left-associative operator at precedence level 6/11. */ external \"-": (int, int) => int = "%subint" -@ocaml.doc(" Integer multiplication. - Left-associative operator at precedence level 7/11. ") +/** Integer multiplication. + Left-associative operator at precedence level 7/11. */ external \"*": (int, int) => int = "%mulint" -@ocaml.doc(" Integer division. +/** Integer division. Raise [Division_by_zero] if the second argument is 0. Integer division rounds the real quotient of its arguments towards zero. More precisely, if [x >= 0] and [y > 0], [x / y] is the greatest integer less than or equal to the real quotient of [x] by [y]. Moreover, [(- x) / y = x / (- y) = - (x / y)]. - Left-associative operator at precedence level 7/11. ") + Left-associative operator at precedence level 7/11. */ external \"/": (int, int) => int = "%divint" -@ocaml.doc(" Integer remainder. If [y] is not zero, the result +/** Integer remainder. If [y] is not zero, the result of [x mod y] satisfies the following properties: [x = (x / y) * y + x mod y] and [abs(x mod y) <= abs(y) - 1]. If [y = 0], [x mod y] raises [Division_by_zero]. Note that [x mod y] is negative only if [x < 0]. Raise [Division_by_zero] if [y] is zero. - Left-associative operator at precedence level 7/11. ") + Left-associative operator at precedence level 7/11. */ external mod: (int, int) => int = "%modint" -@ocaml.doc(" Return the absolute value of the argument. Note that this may be - negative if the argument is [min_int]. ") +/** Return the absolute value of the argument. Note that this may be + negative if the argument is [min_int]. */ let abs: int => int -@ocaml.doc(" The greatest representable integer. ") +/** The greatest representable integer. */ let max_int: int -@ocaml.doc(" The smallest representable integer. ") +/** The smallest representable integer. */ let min_int: int -@@ocaml.text(" {2 Bitwise operations} ") +/*** {2 Bitwise operations} */ -@ocaml.doc(" Bitwise logical and. - Left-associative operator at precedence level 7/11. ") +/** Bitwise logical and. + Left-associative operator at precedence level 7/11. */ external land: (int, int) => int = "%andint" -@ocaml.doc(" Bitwise logical or. - Left-associative operator at precedence level 7/11. ") +/** Bitwise logical or. + Left-associative operator at precedence level 7/11. */ external lor: (int, int) => int = "%orint" -@ocaml.doc(" Bitwise logical exclusive or. - Left-associative operator at precedence level 7/11. ") +/** Bitwise logical exclusive or. + Left-associative operator at precedence level 7/11. */ external lxor: (int, int) => int = "%xorint" -@ocaml.doc(" Bitwise logical negation. ") +/** Bitwise logical negation. */ let lnot: int => int -@ocaml.doc(" [n lsl m] shifts [n] to the left by [m] bits. +/** [n lsl m] shifts [n] to the left by [m] bits. The result is unspecified if [m < 0] or [m >= bitsize], where [bitsize] is [32] on a 32-bit platform and [64] on a 64-bit platform. - Right-associative operator at precedence level 8/11. ") + Right-associative operator at precedence level 8/11. */ external lsl: (int, int) => int = "%lslint" -@ocaml.doc(" [n lsr m] shifts [n] to the right by [m] bits. +/** [n lsr m] shifts [n] to the right by [m] bits. This is a logical shift: zeroes are inserted regardless of the sign of [n]. The result is unspecified if [m < 0] or [m >= bitsize]. - Right-associative operator at precedence level 8/11. ") + Right-associative operator at precedence level 8/11. */ external lsr: (int, int) => int = "%lsrint" -@ocaml.doc(" [n asr m] shifts [n] to the right by [m] bits. +/** [n asr m] shifts [n] to the right by [m] bits. This is an arithmetic shift: the sign bit of [n] is replicated. The result is unspecified if [m < 0] or [m >= bitsize]. - Right-associative operator at precedence level 8/11. ") + Right-associative operator at precedence level 8/11. */ external asr: (int, int) => int = "%asrint" -@@ocaml.text(" {1 Floating-point arithmetic} +/*** {1 Floating-point arithmetic} OCaml's floating-point numbers follow the IEEE 754 standard, using double precision (64 bits) numbers. @@ -359,267 +353,265 @@ external asr: (int, int) => int = "%asrint" floating-point computations as expected: for instance, [1.0 /. infinity] is [0.0], and any arithmetic operation with [nan] as argument returns [nan] as result. -") +*/ -@ocaml.doc(" Unary negation. You can also write [-. e] instead of [~-. e]. +/** Unary negation. You can also write [-. e] instead of [~-. e]. Unary operator at precedence level 9/11 for [-. e] - and 11/11 for [~-. e]. ") + and 11/11 for [~-. e]. */ external \"~-.": float => float = "%negfloat" -@ocaml.doc(" Unary addition. You can also write [+. e] instead of [~+. e]. +/** Unary addition. You can also write [+. e] instead of [~+. e]. Unary operator at precedence level 9/11 for [+. e] and 11/11 for [~+. e]. @since 3.12.0 -") +*/ external \"~+.": float => float = "%identity" -@ocaml.doc(" Floating-point addition. - Left-associative operator at precedence level 6/11. ") +/** Floating-point addition. + Left-associative operator at precedence level 6/11. */ external \"+.": (float, float) => float = "%addfloat" -@ocaml.doc(" Floating-point subtraction. - Left-associative operator at precedence level 6/11. ") +/** Floating-point subtraction. + Left-associative operator at precedence level 6/11. */ external \"-.": (float, float) => float = "%subfloat" -@ocaml.doc(" Floating-point multiplication. - Left-associative operator at precedence level 7/11. ") +/** Floating-point multiplication. + Left-associative operator at precedence level 7/11. */ external \"*.": (float, float) => float = "%mulfloat" -@ocaml.doc(" Floating-point division. - Left-associative operator at precedence level 7/11. ") +/** Floating-point division. + Left-associative operator at precedence level 7/11. */ external \"/.": (float, float) => float = "%divfloat" -@val @scope("Math") @ocaml.doc(" Exponentiation. ") +@val @scope("Math") /** Exponentiation. */ external \"**": (float, float) => float = "pow" -@val @scope("Math") @ocaml.doc(" Square root. ") +@val @scope("Math") /** Square root. */ external sqrt: float => float = "sqrt" -@val @scope("Math") @ocaml.doc(" Exponential. ") +@val @scope("Math") /** Exponential. */ external exp: float => float = "exp" -@val @scope("Math") @ocaml.doc(" Natural logarithm. ") +@val @scope("Math") /** Natural logarithm. */ external log: float => float = "log" -@val @scope("Math") @ocaml.doc(" Base 10 logarithm. ") +@val @scope("Math") /** Base 10 logarithm. */ external log10: float => float = "log10" -@ocaml.doc(" [expm1 x] computes [exp x -. 1.0], giving numerically-accurate results +/** [expm1 x] computes [exp x -. 1.0], giving numerically-accurate results even if [x] is close to [0.0]. @since 3.12.0 -") +*/ external expm1: float => float = "?expm1_float" @val @scope("Math") -@ocaml.doc(" [log1p x] computes [log(1.0 +. x)] (natural logarithm), +/** [log1p x] computes [log(1.0 +. x)] (natural logarithm), giving numerically-accurate results even if [x] is close to [0.0]. @since 3.12.0 -") +*/ external log1p: float => float = "log1p" -@val @scope("Math") @ocaml.doc(" Cosine. Argument is in radians. ") +@val @scope("Math") /** Cosine. Argument is in radians. */ external cos: float => float = "cos" -@val @scope("Math") @ocaml.doc(" Sine. Argument is in radians. ") +@val @scope("Math") /** Sine. Argument is in radians. */ external sin: float => float = "sin" -@val @scope("Math") @ocaml.doc(" Tangent. Argument is in radians. ") +@val @scope("Math") /** Tangent. Argument is in radians. */ external tan: float => float = "tan" @val @scope("Math") -@ocaml.doc(" Arc cosine. The argument must fall within the range [[-1.0, 1.0]]. - Result is in radians and is between [0.0] and [pi]. ") +/** Arc cosine. The argument must fall within the range [[-1.0, 1.0]]. + Result is in radians and is between [0.0] and [pi]. */ external acos: float => float = "acos" @val @scope("Math") -@ocaml.doc(" Arc sine. The argument must fall within the range [[-1.0, 1.0]]. - Result is in radians and is between [-pi/2] and [pi/2]. ") +/** Arc sine. The argument must fall within the range [[-1.0, 1.0]]. + Result is in radians and is between [-pi/2] and [pi/2]. */ external asin: float => float = "asin" -@val -@scope("Math") -@ocaml.doc(" Arc tangent. - Result is in radians and is between [-pi/2] and [pi/2]. ") +@val @scope("Math") /** Arc tangent. + Result is in radians and is between [-pi/2] and [pi/2]. */ external atan: float => float = "atan" @val @scope("Math") -@ocaml.doc(" [atan2 y x] returns the arc tangent of [y /. x]. The signs of [x] +/** [atan2 y x] returns the arc tangent of [y /. x]. The signs of [x] and [y] are used to determine the quadrant of the result. - Result is in radians and is between [-pi] and [pi]. ") + Result is in radians and is between [-pi] and [pi]. */ external atan2: (float, float) => float = "atan2" -@ocaml.doc(" [hypot x y] returns [sqrt(x *. x + y *. y)], that is, the length +/** [hypot x y] returns [sqrt(x *. x + y *. y)], that is, the length of the hypotenuse of a right-angled triangle with sides of length [x] and [y], or, equivalently, the distance of the point [(x,y)] to origin. - @since 4.00.0 ") + @since 4.00.0 */ external hypot: (float, float) => float = "?hypot_float" -@val @scope("Math") @ocaml.doc(" Hyperbolic cosine. Argument is in radians. ") +@val @scope("Math") /** Hyperbolic cosine. Argument is in radians. */ external cosh: float => float = "cosh" -@val @scope("Math") @ocaml.doc(" Hyperbolic sine. Argument is in radians. ") +@val @scope("Math") /** Hyperbolic sine. Argument is in radians. */ external sinh: float => float = "sinh" -@val @scope("Math") @ocaml.doc(" Hyperbolic tangent. Argument is in radians. ") +@val @scope("Math") /** Hyperbolic tangent. Argument is in radians. */ external tanh: float => float = "tanh" @val @scope("Math") -@ocaml.doc(" Round above to an integer value. +/** Round above to an integer value. [ceil f] returns the least integer value greater than or equal to [f]. - The result is returned as a float. ") + The result is returned as a float. */ external ceil: float => float = "ceil" @val @scope("Math") -@ocaml.doc(" Round below to an integer value. +/** Round below to an integer value. [floor f] returns the greatest integer value less than or equal to [f]. - The result is returned as a float. ") + The result is returned as a float. */ external floor: float => float = "floor" -@val @scope("Math") @ocaml.doc(" [abs_float f] returns the absolute value of [f]. ") +@val @scope("Math") /** [abs_float f] returns the absolute value of [f]. */ external abs_float: float => float = "abs" -@ocaml.doc(" [copysign x y] returns a float whose absolute value is that of [x] +/** [copysign x y] returns a float whose absolute value is that of [x] and whose sign is that of [y]. If [x] is [nan], returns [nan]. If [y] is [nan], returns either [x] or [-. x], but it is not specified which. - @since 4.00.0 ") + @since 4.00.0 */ external copysign: (float, float) => float = "?copysign_float" -@ocaml.doc(" [mod_float a b] returns the remainder of [a] with respect to +/** [mod_float a b] returns the remainder of [a] with respect to [b]. The returned value is [a -. n *. b], where [n] - is the quotient [a /. b] rounded towards zero to an integer. ") + is the quotient [a /. b] rounded towards zero to an integer. */ external mod_float: (float, float) => float = "?fmod_float" -@ocaml.doc(" [frexp f] returns the pair of the significant +/** [frexp f] returns the pair of the significant and the exponent of [f]. When [f] is zero, the significant [x] and the exponent [n] of [f] are equal to zero. When [f] is non-zero, they are defined by - [f = x *. 2 ** n] and [0.5 <= x < 1.0]. ") + [f = x *. 2 ** n] and [0.5 <= x < 1.0]. */ external frexp: float => (float, int) = "?frexp_float" -@ocaml.doc(" [ldexp x n] returns [x *. 2 ** n]. ") +/** [ldexp x n] returns [x *. 2 ** n]. */ external ldexp: (float, int) => float = "?ldexp_float" -@ocaml.doc(" [modf f] returns the pair of the fractional and integral - part of [f]. ") +/** [modf f] returns the pair of the fractional and integral + part of [f]. */ external modf: float => (float, float) = "?modf_float" -@ocaml.doc(" Same as {!Pervasives.float_of_int}. ") +/** Same as {!Pervasives.float_of_int}. */ external float: int => float = "%floatofint" -@ocaml.doc(" Convert an integer to floating-point. ") +/** Convert an integer to floating-point. */ external float_of_int: int => float = "%floatofint" -@ocaml.doc(" Same as {!Pervasives.int_of_float}. ") +/** Same as {!Pervasives.int_of_float}. */ external truncate: float => int = "%intoffloat" -@ocaml.doc(" Truncate the given floating-point number to an integer. +/** Truncate the given floating-point number to an integer. The result is unspecified if the argument is [nan] or falls outside the - range of representable integers. ") + range of representable integers. */ external int_of_float: float => int = "%intoffloat" -@ocaml.doc(" Positive infinity. ") +/** Positive infinity. */ let infinity: float -@ocaml.doc(" Negative infinity. ") +/** Negative infinity. */ let neg_infinity: float @val @scope("Number") -@ocaml.doc(" A special floating-point value denoting the result of an +/** A special floating-point value denoting the result of an undefined operation such as [0.0 /. 0.0]. Stands for 'not a number'. Any floating-point operation with [nan] as argument returns [nan] as result. As for floating-point comparisons, [=], [<], [<=], [>] and [>=] return [false] and [<>] returns [true] - if one or both of their arguments is [nan]. ") + if one or both of their arguments is [nan]. */ external nan: float = "NaN" /* we could also use [0. /. 0.] */ -@ocaml.doc(" The largest positive finite value of type [float]. ") +/** The largest positive finite value of type [float]. */ let max_float: float -@ocaml.doc(" The smallest positive, non-zero, non-denormalized value of type [float]. ") +/** The smallest positive, non-zero, non-denormalized value of type [float]. */ let min_float: float -@ocaml.doc(" The difference between [1.0] and the smallest exactly representable - floating-point number greater than [1.0]. ") +/** The difference between [1.0] and the smallest exactly representable + floating-point number greater than [1.0]. */ let epsilon_float: float -@ocaml.doc(" The five classes of floating-point numbers, as determined by - the {!Pervasives.classify_float} function. ") +/** The five classes of floating-point numbers, as determined by + the {!Pervasives.classify_float} function. */ type fpclass = - | @ocaml.doc(" Normal number, none of the below ") FP_normal - | @ocaml.doc(" Number very close to 0.0, has reduced precision ") FP_subnormal - | @ocaml.doc(" Number is 0.0 or -0.0 ") FP_zero - | @ocaml.doc(" Number is positive or negative infinity ") FP_infinite - | @ocaml.doc(" Not a number: result of an undefined operation ") FP_nan - -@ocaml.doc(" Return the class of the given floating-point number: - normal, subnormal, zero, infinite, or not a number. ") + | /** Normal number, none of the below */ FP_normal + | /** Number very close to 0.0, has reduced precision */ FP_subnormal + | /** Number is 0.0 or -0.0 */ FP_zero + | /** Number is positive or negative infinity */ FP_infinite + | /** Not a number: result of an undefined operation */ FP_nan + +/** Return the class of the given floating-point number: + normal, subnormal, zero, infinite, or not a number. */ let classify_float: float => fpclass -@ocaml.doc(" {1 String operations} +/** {1 String operations} More string operations are provided in module {!String}. -") -@ocaml.doc(" String concatenation. - Right-associative operator at precedence level 5/11. ") +*/ +/** String concatenation. + Right-associative operator at precedence level 5/11. */ external \"^": (string, string) => string = "#string_append" -@@ocaml.text(" {1 Character operations} +/*** {1 Character operations} More character operations are provided in module {!Char}. -") +*/ -@ocaml.doc(" Return the ASCII code of the argument. ") +/** Return the ASCII code of the argument. */ external int_of_char: char => int = "%identity" -@ocaml.doc(" Return the character with the given ASCII code. +/** Return the character with the given ASCII code. Raise [Invalid_argument \"char_of_int\"] if the argument is - outside the range 0--255. ") + outside the range 0--255. */ let char_of_int: int => char -@@ocaml.text(" {1 Unit operations} ") +/*** {1 Unit operations} */ -@ocaml.doc(" Discard the value of its argument and return [()]. +/** Discard the value of its argument and return [()]. For instance, [ignore(f x)] discards the result of the side-effecting function [f]. It is equivalent to [f x; ()], except that the latter may generate a compiler warning; writing [ignore(f x)] instead - avoids the warning. ") + avoids the warning. */ external ignore: 'a => unit = "%ignore" -@@ocaml.text(" {1 String conversion functions} ") +/*** {1 String conversion functions} */ -@ocaml.doc(" Return the string representation of a boolean. As the returned values +/** Return the string representation of a boolean. As the returned values may be shared, the user should not modify them directly. -") +*/ let string_of_bool: bool => string -@ocaml.doc(" Convert the given string to a boolean. +/** Convert the given string to a boolean. Raise [Invalid_argument \"bool_of_string\"] if the string is not - [\"true\"] or [\"false\"]. ") + [\"true\"] or [\"false\"]. */ let bool_of_string: string => bool -@ocaml.doc(" Convert the given string to a boolean. +/** Convert the given string to a boolean. Return [None] if the string is not [\"true\"] or [\"false\"]. @since 4.05 -") +*/ let bool_of_string_opt: string => option -@val @ocaml.doc(" Return the string representation of an integer, in decimal. ") +@val /** Return the string representation of an integer, in decimal. */ external string_of_int: int => string = "String" -@ocaml.doc(" Convert the given string to an integer. +/** Convert the given string to an integer. The string is read in decimal (by default, or if the string begins with [0u]), in hexadecimal (if it begins with [0x] or [0X]), in octal (if it begins with [0o] or [0O]), or in binary @@ -634,21 +626,21 @@ external string_of_int: int => string = "String" and is ignored. Raise [Failure \"int_of_string\"] if the given string is not a valid representation of an integer, or if the integer represented - exceeds the range of integers representable in type [int]. ") + exceeds the range of integers representable in type [int]. */ external int_of_string: string => int = "?int_of_string" -@ocaml.doc(" Same as [int_of_string], but returns [None] instead of raising. +/** Same as [int_of_string], but returns [None] instead of raising. @since 4.05 -") +*/ let int_of_string_opt: string => option @ocaml.deprecated( "Please use Js.Float.toString instead, string_of_float generates unparseable floats" ) -@ocaml.doc(" Return the string representation of a floating-point number. ") +/** Return the string representation of a floating-point number. */ let string_of_float: float => string -@ocaml.doc(" Convert the given string to a float. The string is read in decimal +/** Convert the given string to a float. The string is read in decimal (by default) or in hexadecimal (marked by [0x] or [0X]). The format of decimal floating-point numbers is [ [-] dd.ddd (e|E) [+|-] dd ], where [d] stands for a decimal digit. @@ -662,111 +654,111 @@ let string_of_float: float => string Depending on the execution platforms, other representations of floating-point numbers can be accepted, but should not be relied upon. Raise [Failure \"float_of_string\"] if the given string is not a valid - representation of a float. ") + representation of a float. */ external float_of_string: string => float = "?float_of_string" -@ocaml.doc(" Same as [float_of_string], but returns [None] instead of raising. +/** Same as [float_of_string], but returns [None] instead of raising. @since 4.05 -") +*/ let float_of_string_opt: string => option -@@ocaml.text(" {1 Pair operations} ") +/*** {1 Pair operations} */ -@ocaml.doc(" Return the first component of a pair. ") +/** Return the first component of a pair. */ external fst: (('a, 'b)) => 'a = "%field0" -@ocaml.doc(" Return the second component of a pair. ") +/** Return the second component of a pair. */ external snd: (('a, 'b)) => 'b = "%field1" -@@ocaml.text(" {1 List operations} +/*** {1 List operations} More list operations are provided in module {!List}. -") +*/ @ocaml.deprecated("Use Belt.List.concat instead") -@ocaml.doc(" List concatenation. Tail-recursive (length of the first argument). - Right-associative operator at precedence level 5/11. ") +/** List concatenation. Tail-recursive (length of the first argument). + Right-associative operator at precedence level 5/11. */ let \"@": (list<'a>, list<'a>) => list<'a> type int32 = int -@ocaml.doc(" Print a string on standard output. ") +/** Print a string on standard output. */ let print_string: string => unit -@ocaml.doc(" Print an integer, in decimal, on standard output. ") +/** Print an integer, in decimal, on standard output. */ let print_int: int => unit -@ocaml.doc(" Print a floating-point number, in decimal, on standard output. ") +/** Print a floating-point number, in decimal, on standard output. */ let print_float: float => unit -@ocaml.doc(" Print a floating-point number, in decimal, on standard output. ") +/** Print a floating-point number, in decimal, on standard output. */ @val @scope("console") -@ocaml.doc(" Print a string, followed by a newline character, on - standard output and flush standard output. ") +/** Print a string, followed by a newline character, on + standard output and flush standard output. */ external print_endline: string => unit = "log" -@ocaml.doc(" Print a newline character on standard output, and flush +/** Print a newline character on standard output, and flush standard output. This can be used to simulate line - buffering of standard output. ") + buffering of standard output. */ let print_newline: unit => unit @val @scope("console") -@ocaml.doc(" Print a string, followed by a newline character on standard - error and flush standard error. ") +/** Print a string, followed by a newline character on standard + error and flush standard error. */ external prerr_endline: string => unit = "error" -@ocaml.doc(" Print a newline character on standard error, and flush - standard error. ") +/** Print a newline character on standard error, and flush + standard error. */ let prerr_newline: unit => unit -@@ocaml.text(" {1 References} ") +/*** {1 References} */ -@ocaml.doc(" The type of references (mutable indirection cells) containing - a value of type ['a]. ") +/** The type of references (mutable indirection cells) containing + a value of type ['a]. */ type ref<'a> = {mutable contents: 'a} -@ocaml.doc(" Return a fresh reference containing the given value. ") +/** Return a fresh reference containing the given value. */ external ref: 'a => ref<'a> = "%makemutable" -@ocaml.doc(" [!r] returns the current contents of reference [r]. +/** [!r] returns the current contents of reference [r]. Equivalent to [fun r -> r.contents]. - Unary operator at precedence level 11/11.") + Unary operator at precedence level 11/11.*/ external \"!": ref<'a> => 'a = "%bs_ref_field0" -@ocaml.doc(" [r := a] stores the value of [a] in reference [r]. +/** [r := a] stores the value of [a] in reference [r]. Equivalent to [fun r v -> r.contents <- v]. - Right-associative operator at precedence level 1/11. ") + Right-associative operator at precedence level 1/11. */ external \":=": (ref<'a>, 'a) => unit = "%bs_ref_setfield0" -@ocaml.doc(" Increment the integer contained in the given reference. - Equivalent to [fun r -> r := succ !r]. ") +/** Increment the integer contained in the given reference. + Equivalent to [fun r -> r := succ !r]. */ external incr: ref => unit = "%incr" -@ocaml.doc(" Decrement the integer contained in the given reference. - Equivalent to [fun r -> r := pred !r]. ") +/** Decrement the integer contained in the given reference. + Equivalent to [fun r -> r := pred !r]. */ external decr: ref => unit = "%decr" -@@ocaml.text(" {1 Result type} ") +/*** {1 Result type} */ -@ocaml.doc(" @since 4.03.0 ") +/** @since 4.03.0 */ type result<'a, 'b> = Belt.Result.t<'a, 'b> = | Ok('a) | Error('b) -@@ocaml.text(" {1 Program termination} ") +/*** {1 Program termination} */ -@ocaml.doc(" Terminate the process, returning the given status code +/** Terminate the process, returning the given status code to the operating system: usually 0 to indicate no errors, and a small positive integer to indicate failure. All open output channels are flushed with [flush_all]. An implicit [exit 0] is performed each time a program terminates normally. An implicit [exit 2] is performed if the program - terminates early because of an uncaught exception. ") + terminates early because of an uncaught exception. */ let exit: int => 'a -@ocaml.doc(" Register the given function to be called at program termination +/** Register the given function to be called at program termination time. The functions registered with [at_exit] will be called when the program does any of the following: - executes {!Pervasives.exit} @@ -774,9 +766,7 @@ let exit: int => 'a exception - executes the C function [caml_shutdown]. The functions are called in 'last in, first out' order: the - function most recently added with [at_exit] is called first. ") + function most recently added with [at_exit] is called first. */ let at_exit: (unit => unit) => unit -@@ocaml.text("/*") - let valid_float_lexem: string => string diff --git a/jscomp/test/flow_parser_reg_test.js b/jscomp/test/flow_parser_reg_test.js index 2f240c5f70..25a2a439d3 100644 --- a/jscomp/test/flow_parser_reg_test.js +++ b/jscomp/test/flow_parser_reg_test.js @@ -3211,78 +3211,71 @@ function token(env, lexbuf) { }; } -function __ocaml_lex_template_tail_rec(_env, lexbuf, ___ocaml_lex_state) { +function regexp_class(env, buf, lexbuf) { + var ___ocaml_lex_state = 326; while(true) { var __ocaml_lex_state = ___ocaml_lex_state; - var env = _env; var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); switch (__ocaml_lex_state$1) { case 0 : - Lexing.new_line(lexbuf); - ___ocaml_lex_state = 393; - continue ; + return env; case 1 : - unicode_fix_cols(lexbuf); - ___ocaml_lex_state = 393; - continue ; case 2 : - var start = from_lb(env.lex_source, lexbuf); - var buf = $$Buffer.create(127); - var match = line_comment(env, buf, lexbuf); - var env$1 = save_comment(match[0], start, match[1], buf, true); - ___ocaml_lex_state = 393; - _env = env$1; - continue ; + break; case 3 : - var start$1 = from_lb(env.lex_source, lexbuf); - var buf$1 = $$Buffer.create(127); - var match$1 = comment(env, buf$1, lexbuf); - var env$2 = save_comment(match$1[0], start$1, match$1[1], buf$1, true); - ___ocaml_lex_state = 393; - _env = env$2; - continue ; + var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + $$Buffer.add_char(buf, c); + return env; case 4 : - var start$2 = from_lb(env.lex_source, lexbuf); - var cooked = $$Buffer.create(127); - var raw = $$Buffer.create(127); - var literal = $$Buffer.create(127); - $$Buffer.add_string(literal, "}"); - var match$2 = template_part(env, start$2, cooked, raw, literal, lexbuf); + var c$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + $$Buffer.add_char(buf, c$1); + return regexp_class(env, buf, lexbuf); + default: + Curry._1(lexbuf.refill_buff, lexbuf); + ___ocaml_lex_state = __ocaml_lex_state$1; + continue ; + } + var s = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_start_pos + 2 | 0); + $$Buffer.add_string(buf, s); + return regexp_class(env, buf, lexbuf); + }; +} + +function line_comment(env, buf, lexbuf) { + var ___ocaml_lex_state = 287; + while(true) { + var __ocaml_lex_state = ___ocaml_lex_state; + var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); + switch (__ocaml_lex_state$1) { + case 0 : return [ - match$2[0], - { - TAG: /* T_TEMPLATE_PART */2, - _0: [ - match$2[1], - { - cooked: $$Buffer.contents(cooked), - raw: $$Buffer.contents(raw), - literal: $$Buffer.contents(literal) - }, - match$2[2] - ] - } + env, + from_lb(env.lex_source, lexbuf) ]; - case 5 : - var env$3 = lex_error(env, from_lb(env.lex_source, lexbuf), { - TAG: /* UnexpectedToken */1, - _0: "ILLEGAL" - }); + case 1 : + var match = from_lb(env.lex_source, lexbuf); + var match$1 = match._end; + Lexing.new_line(lexbuf); + var _end_line = match$1.line; + var _end_column = match$1.column - 1 | 0; + var _end_offset = match$1.offset - 1 | 0; + var _end = { + line: _end_line, + column: _end_column, + offset: _end_offset + }; return [ - env$3, + env, { - TAG: /* T_TEMPLATE_PART */2, - _0: [ - from_lb(env$3.lex_source, lexbuf), - { - cooked: "", - raw: "", - literal: "" - }, - true - ] + source: match.source, + start: match.start, + _end: _end } ]; + case 2 : + var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + $$Buffer.add_char(buf, c); + return line_comment(env, buf, lexbuf); default: Curry._1(lexbuf.refill_buff, lexbuf); ___ocaml_lex_state = __ocaml_lex_state$1; @@ -3357,41 +3350,50 @@ function template_part(env, start, cooked, raw, literal, lexbuf) { }; } -function line_comment(env, buf, lexbuf) { - var ___ocaml_lex_state = 287; +function string_quote(env, q, buf, raw, octal, lexbuf) { + var ___ocaml_lex_state = 247; while(true) { var __ocaml_lex_state = ___ocaml_lex_state; var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); switch (__ocaml_lex_state$1) { case 0 : - return [ - env, - from_lb(env.lex_source, lexbuf) - ]; + var q$p = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + $$Buffer.add_char(raw, q$p); + if (q === q$p) { + return [ + env, + from_lb(env.lex_source, lexbuf), + octal + ]; + } else { + $$Buffer.add_char(buf, q$p); + return string_quote(env, q, buf, raw, octal, lexbuf); + } case 1 : - var match = from_lb(env.lex_source, lexbuf); - var match$1 = match._end; - Lexing.new_line(lexbuf); - var _end_line = match$1.line; - var _end_column = match$1.column - 1 | 0; - var _end_offset = match$1.offset - 1 | 0; - var _end = { - line: _end_line, - column: _end_column, - offset: _end_offset - }; + var e = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + $$Buffer.add_char(raw, e); + var match = string_escape(env, buf, lexbuf); + var octal$1 = match[1] || octal; + $$Buffer.add_string(raw, Lexing.lexeme(lexbuf)); + return string_quote(match[0], q, buf, raw, octal$1, lexbuf); + case 2 : + var x = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); + $$Buffer.add_string(raw, x); + var env$1 = lex_error(env, from_lb(env.lex_source, lexbuf), { + TAG: /* UnexpectedToken */1, + _0: "ILLEGAL" + }); + $$Buffer.add_string(buf, x); return [ - env, - { - source: match.source, - start: match.start, - _end: _end - } + env$1, + from_lb(env$1.lex_source, lexbuf), + octal ]; - case 2 : - var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - $$Buffer.add_char(buf, c); - return line_comment(env, buf, lexbuf); + case 3 : + var x$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + $$Buffer.add_char(raw, x$1); + $$Buffer.add_char(buf, x$1); + return string_quote(env, q, buf, raw, octal, lexbuf); default: Curry._1(lexbuf.refill_buff, lexbuf); ___ocaml_lex_state = __ocaml_lex_state$1; @@ -3448,327 +3450,362 @@ function comment(env, buf, lexbuf) { }; } -function string_quote(env, q, buf, raw, octal, lexbuf) { - var ___ocaml_lex_state = 247; +function type_token(env, lexbuf) { + lexbuf.lex_mem = Caml_array.make(26, -1); + Caml_array.set(lexbuf.lex_mem, 17, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 16, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 15, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 14, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 13, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 12, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 11, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 10, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 9, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 8, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 7, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 6, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 5, lexbuf.lex_curr_pos); + Caml_array.set(lexbuf.lex_mem, 4, lexbuf.lex_curr_pos); + var ___ocaml_lex_state = 133; while(true) { var __ocaml_lex_state = ___ocaml_lex_state; - var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); + var __ocaml_lex_state$1 = Lexing.new_engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); switch (__ocaml_lex_state$1) { case 0 : - var q$p = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - $$Buffer.add_char(raw, q$p); - if (q === q$p) { - return [ - env, - from_lb(env.lex_source, lexbuf), - octal - ]; - } else { - $$Buffer.add_char(buf, q$p); - return string_quote(env, q, buf, raw, octal, lexbuf); - } + Lexing.new_line(lexbuf); + return type_token(env, lexbuf); case 1 : - var e = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - $$Buffer.add_char(raw, e); - var match = string_escape(env, buf, lexbuf); - var octal$1 = match[1] || octal; - $$Buffer.add_string(raw, Lexing.lexeme(lexbuf)); - return string_quote(match[0], q, buf, raw, octal$1, lexbuf); + unicode_fix_cols(lexbuf); + return type_token(env, lexbuf); case 2 : - var x = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); - $$Buffer.add_string(raw, x); - var env$1 = lex_error(env, from_lb(env.lex_source, lexbuf), { - TAG: /* UnexpectedToken */1, - _0: "ILLEGAL" - }); - $$Buffer.add_string(buf, x); - return [ - env$1, - from_lb(env$1.lex_source, lexbuf), - octal - ]; + var start = from_lb(env.lex_source, lexbuf); + var buf = $$Buffer.create(127); + var match = comment(env, buf, lexbuf); + var env$1 = save_comment(match[0], start, match[1], buf, true); + return type_token(env$1, lexbuf); case 3 : - var x$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - $$Buffer.add_char(raw, x$1); - $$Buffer.add_char(buf, x$1); - return string_quote(env, q, buf, raw, octal, lexbuf); - default: - Curry._1(lexbuf.refill_buff, lexbuf); - ___ocaml_lex_state = __ocaml_lex_state$1; - continue ; - } - }; -} - -function string_escape(env, buf, lexbuf) { - var ___ocaml_lex_state = 252; - while(true) { - var __ocaml_lex_state = ___ocaml_lex_state; - var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); - switch (__ocaml_lex_state$1) { - case 0 : - return [ - env, - false - ]; - case 1 : - $$Buffer.add_string(buf, "\\"); - return [ - env, - false - ]; - case 2 : - var a = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0); - var b = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 2 | 0); - var code = (hexa_to_int(a) << 4) + hexa_to_int(b) | 0; - List.iter((function (param) { - return $$Buffer.add_char(buf, param); - }), utf16to8(code)); - return [ - env, - false - ]; - case 3 : - var a$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - var b$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0); - var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 2 | 0); - var code$1 = ((oct_to_int(a$1) << 6) + (oct_to_int(b$1) << 3) | 0) + oct_to_int(c) | 0; - if (code$1 < 256) { - List.iter((function (param) { - return $$Buffer.add_char(buf, param); - }), utf16to8(code$1)); - } else { - var code$2 = (oct_to_int(a$1) << 3) + oct_to_int(b$1) | 0; - List.iter((function (param) { - return $$Buffer.add_char(buf, param); - }), utf16to8(code$2)); - $$Buffer.add_char(buf, c); + var sp = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 2 | 0, Caml_array.get(lexbuf.lex_mem, 0)); + var escape_type = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); + var pattern = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); + if (env.lex_enable_comment_syntax) { + var env$2; + if (env.lex_in_comment_syntax) { + var loc = from_lb(env.lex_source, lexbuf); + env$2 = unexpected_error(env, loc, pattern); + } else { + env$2 = env; + } + var env$3 = in_comment_syntax(true, env$2); + if (escape_type === ":") { + return [ + env$3, + /* T_COLON */77 + ]; + } else { + return type_token(env$3, lexbuf); + } } - return [ - env, - true - ]; + var start$1 = from_lb(env.lex_source, lexbuf); + var buf$1 = $$Buffer.create(127); + $$Buffer.add_string(buf$1, sp); + $$Buffer.add_string(buf$1, escape_type); + var match$1 = comment(env, buf$1, lexbuf); + var env$4 = save_comment(match$1[0], start$1, match$1[1], buf$1, true); + return type_token(env$4, lexbuf); case 4 : - var a$2 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - var b$2 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0); - var code$3 = (oct_to_int(a$2) << 3) + oct_to_int(b$2) | 0; - List.iter((function (param) { - return $$Buffer.add_char(buf, param); - }), utf16to8(code$3)); + if (env.lex_in_comment_syntax) { + var env$5 = in_comment_syntax(false, env); + return type_token(env$5, lexbuf); + } + yyback(1, lexbuf); return [ env, - true + /* T_MULT */97 ]; case 5 : - $$Buffer.add_char(buf, Char.chr(0)); - return [ - env, - false - ]; + var start$2 = from_lb(env.lex_source, lexbuf); + var buf$2 = $$Buffer.create(127); + var match$2 = line_comment(env, buf$2, lexbuf); + var env$6 = save_comment(match$2[0], start$2, match$2[1], buf$2, true); + return type_token(env$6, lexbuf); case 6 : - $$Buffer.add_char(buf, Char.chr(8)); + var quote = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + var start$3 = from_lb(env.lex_source, lexbuf); + var buf$3 = $$Buffer.create(127); + var raw = $$Buffer.create(127); + $$Buffer.add_char(raw, quote); + var match$3 = string_quote(env, quote, buf$3, raw, false, lexbuf); return [ - env, - false + match$3[0], + { + TAG: /* T_STRING */1, + _0: [ + btwn(start$3, match$3[1]), + $$Buffer.contents(buf$3), + $$Buffer.contents(raw), + match$3[2] + ] + } ]; case 7 : - $$Buffer.add_char(buf, Char.chr(12)); - return [ - env, - false - ]; + var neg = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); + var w = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); + return illegal_number(env, lexbuf, w, mk_num_singleton(/* BINARY */0, num, neg)); case 8 : - $$Buffer.add_char(buf, Char.chr(10)); + var neg$1 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$1 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); return [ env, - false + mk_num_singleton(/* BINARY */0, num$1, neg$1) ]; case 9 : - $$Buffer.add_char(buf, Char.chr(13)); - return [ - env, - false - ]; + var neg$2 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$2 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); + var w$1 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); + return illegal_number(env, lexbuf, w$1, mk_num_singleton(/* OCTAL */2, num$2, neg$2)); case 10 : - $$Buffer.add_char(buf, Char.chr(9)); + var neg$3 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$3 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); return [ env, - false + mk_num_singleton(/* OCTAL */2, num$3, neg$3) ]; case 11 : - $$Buffer.add_char(buf, Char.chr(11)); - return [ - env, - false - ]; + var neg$4 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$4 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); + var w$2 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); + return illegal_number(env, lexbuf, w$2, mk_num_singleton(/* LEGACY_OCTAL */1, num$4, neg$4)); case 12 : - var a$3 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - var code$4 = oct_to_int(a$3); - List.iter((function (param) { - return $$Buffer.add_char(buf, param); - }), utf16to8(code$4)); + var neg$5 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$5 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); return [ env, - true + mk_num_singleton(/* LEGACY_OCTAL */1, num$5, neg$5) ]; case 13 : - var a$4 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0); - var b$3 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 2 | 0); - var c$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 3 | 0); - var d = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 4 | 0); - var code$5 = (((hexa_to_int(a$4) << 12) + (hexa_to_int(b$3) << 8) | 0) + (hexa_to_int(c$1) << 4) | 0) + hexa_to_int(d) | 0; - List.iter((function (param) { - return $$Buffer.add_char(buf, param); - }), utf16to8(code$5)); - return [ - env, - false - ]; + var neg$6 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$6 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); + var w$3 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); + var match$4; + try { + match$4 = [ + env, + mk_num_singleton(/* NORMAL */3, num$6, neg$6) + ]; + } + catch (exn){ + if (Sys.win32) { + var loc$1 = from_lb(env.lex_source, lexbuf); + var env$7 = lex_error(env, loc$1, /* WindowsFloatOfString */59); + match$4 = [ + env$7, + { + TAG: /* T_NUMBER_SINGLETON_TYPE */5, + _0: /* NORMAL */3, + _1: 789.0 + } + ]; + } else { + throw exn; + } + } + return illegal_number(match$4[0], lexbuf, w$3, match$4[1]); case 14 : - var hex_code = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 2 | 0, lexbuf.lex_curr_pos - 1 | 0); - var code$6 = Caml_format.int_of_string("0x" + hex_code); - var env$1 = code$6 > 1114111 ? lex_error(env, from_lb(env.lex_source, lexbuf), { - TAG: /* UnexpectedToken */1, - _0: "ILLEGAL" - }) : env; - List.iter((function (param) { - return $$Buffer.add_char(buf, param); - }), utf16to8(code$6)); - return [ - env$1, - false - ]; + var neg$7 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$7 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); + try { + return [ + env, + mk_num_singleton(/* NORMAL */3, num$7, neg$7) + ]; + } + catch (exn$1){ + if (Sys.win32) { + var loc$2 = from_lb(env.lex_source, lexbuf); + var env$8 = lex_error(env, loc$2, /* WindowsFloatOfString */59); + return [ + env$8, + { + TAG: /* T_NUMBER_SINGLETON_TYPE */5, + _0: /* NORMAL */3, + _1: 789.0 + } + ]; + } + throw exn$1; + } case 15 : - var c$2 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - var env$2 = lex_error(env, from_lb(env.lex_source, lexbuf), { - TAG: /* UnexpectedToken */1, - _0: "ILLEGAL" - }); - $$Buffer.add_char(buf, c$2); - return [ - env$2, - false - ]; + var neg$8 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$8 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); + var w$4 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); + return illegal_number(env, lexbuf, w$4, mk_num_singleton(/* NORMAL */3, num$8, neg$8)); case 16 : - Lexing.new_line(lexbuf); + var neg$9 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$9 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); return [ env, - false + mk_num_singleton(/* NORMAL */3, num$9, neg$9) ]; case 17 : - var c$3 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - $$Buffer.add_char(buf, c$3); + var neg$10 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); + var num$10 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); + var w$5 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); + return illegal_number(env, lexbuf, w$5, mk_num_singleton(/* NORMAL */3, num$10, neg$10)); + case 18 : + var neg$11 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), Caml_array.get(lexbuf.lex_mem, 0)); + var num$11 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 3), Caml_array.get(lexbuf.lex_mem, 2)); return [ env, - false + mk_num_singleton(/* NORMAL */3, num$11, neg$11) ]; - default: - Curry._1(lexbuf.refill_buff, lexbuf); - ___ocaml_lex_state = __ocaml_lex_state$1; - continue ; - } - }; -} - -function __ocaml_lex_jsx_tag_rec(_env, lexbuf, ___ocaml_lex_state) { - while(true) { - var __ocaml_lex_state = ___ocaml_lex_state; - var env = _env; - var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); - switch (__ocaml_lex_state$1) { - case 0 : + case 19 : + var word = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); + unicode_fix_cols(lexbuf); + try { + return [ + env, + Hashtbl.find(type_keywords, word) + ]; + } + catch (raw_exn){ + var exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn); + if (exn$2.RE_EXN_ID === "Not_found") { + return [ + env, + /* T_IDENTIFIER */0 + ]; + } + throw exn$2; + } + case 22 : return [ env, - /* T_EOF */105 + /* T_LCURLY */1 ]; - case 1 : - Lexing.new_line(lexbuf); - ___ocaml_lex_state = 333; - continue ; - case 2 : - unicode_fix_cols(lexbuf); - ___ocaml_lex_state = 333; - continue ; - case 3 : - var start = from_lb(env.lex_source, lexbuf); - var buf = $$Buffer.create(127); - var match = line_comment(env, buf, lexbuf); - var env$1 = save_comment(match[0], start, match[1], buf, true); - ___ocaml_lex_state = 333; - _env = env$1; - continue ; - case 4 : - var start$1 = from_lb(env.lex_source, lexbuf); - var buf$1 = $$Buffer.create(127); - var match$1 = comment(env, buf$1, lexbuf); - var env$2 = save_comment(match$1[0], start$1, match$1[1], buf$1, true); - ___ocaml_lex_state = 333; - _env = env$2; - continue ; - case 5 : + case 23 : return [ env, - /* T_LESS_THAN */89 + /* T_RCURLY */2 ]; - case 6 : + case 24 : return [ env, - /* T_DIV */96 + /* T_LPAREN */3 ]; - case 7 : + case 25 : + return [ + env, + /* T_RPAREN */4 + ]; + case 26 : + return [ + env, + /* T_ELLIPSIS */11 + ]; + case 27 : + return [ + env, + /* T_PERIOD */9 + ]; + case 28 : + return [ + env, + /* T_SEMICOLON */7 + ]; + case 29 : + return [ + env, + /* T_COMMA */8 + ]; + case 20 : + case 32 : + return [ + env, + /* T_LBRACKET */5 + ]; + case 21 : + case 33 : + return [ + env, + /* T_RBRACKET */6 + ]; + case 34 : + return [ + env, + /* T_LESS_THAN */89 + ]; + case 35 : return [ env, /* T_GREATER_THAN */90 ]; - case 8 : + case 31 : + case 37 : return [ env, - /* T_LCURLY */1 + /* T_PLING */76 ]; - case 9 : + case 38 : + return [ + env, + /* T_MULT */97 + ]; + case 30 : + case 39 : return [ env, /* T_COLON */77 ]; - case 10 : + case 40 : return [ env, - /* T_PERIOD */9 + /* T_BIT_OR */80 ]; - case 11 : + case 41 : + return [ + env, + /* T_BIT_AND */82 + ]; + case 42 : + return [ + env, + /* T_TYPEOF */44 + ]; + case 43 : + return [ + env, + /* T_ARROW */10 + ]; + case 36 : + case 44 : return [ env, /* T_ASSIGN */75 ]; - case 12 : - unicode_fix_cols(lexbuf); + case 45 : return [ env, - /* T_JSX_IDENTIFIER */106 + /* T_PLUS */94 ]; - case 13 : - var quote = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - var start$2 = from_lb(env.lex_source, lexbuf); - var buf$2 = $$Buffer.create(127); - var raw = $$Buffer.create(127); - $$Buffer.add_char(raw, quote); - var mode = quote === /* '\'' */39 ? /* JSX_SINGLE_QUOTED_TEXT */0 : /* JSX_DOUBLE_QUOTED_TEXT */1; - var match$2 = jsx_text(env, mode, buf$2, raw, lexbuf); - $$Buffer.add_char(raw, quote); - var value = $$Buffer.contents(buf$2); - var raw$1 = $$Buffer.contents(raw); + case 46 : return [ - match$2[0], - { - TAG: /* T_JSX_TEXT */4, - _0: [ - btwn(start$2, match$2[1]), - value, - raw$1 - ] - } + env, + /* T_MINUS */95 ]; - case 14 : + case 47 : + var env$9; + if (env.lex_in_comment_syntax) { + var loc$3 = from_lb(env.lex_source, lexbuf); + env$9 = lex_error(env, loc$3, /* UnexpectedEOS */4); + } else { + env$9 = env; + } + return [ + env$9, + /* T_EOF */105 + ]; + case 48 : return [ env, /* T_ERROR */104 @@ -3781,68 +3818,148 @@ function __ocaml_lex_jsx_tag_rec(_env, lexbuf, ___ocaml_lex_state) { }; } -function jsx_text(env, mode, buf, raw, lexbuf) { - var ___ocaml_lex_state = 371; +function __ocaml_lex_template_tail_rec(_env, lexbuf, ___ocaml_lex_state) { while(true) { var __ocaml_lex_state = ___ocaml_lex_state; + var env = _env; var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); switch (__ocaml_lex_state$1) { case 0 : - var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - switch (mode) { - case /* JSX_SINGLE_QUOTED_TEXT */0 : - if (c === 39) { - return [ - env, - from_lb(env.lex_source, lexbuf) - ]; - } - break; - case /* JSX_DOUBLE_QUOTED_TEXT */1 : - if (c === 34) { - return [ - env, - from_lb(env.lex_source, lexbuf) - ]; - } - break; - case /* JSX_CHILD_TEXT */2 : - var exit = 0; - if (!(c !== 60 && c !== 123)) { - exit = 2; - } - if (exit === 2) { - back(lexbuf); - return [ - env, - from_lb(env.lex_source, lexbuf) - ]; - } - break; - - } - $$Buffer.add_char(raw, c); - $$Buffer.add_char(buf, c); - return jsx_text(env, mode, buf, raw, lexbuf); + Lexing.new_line(lexbuf); + ___ocaml_lex_state = 393; + continue ; case 1 : - var env$1 = lex_error(env, from_lb(env.lex_source, lexbuf), { - TAG: /* UnexpectedToken */1, - _0: "ILLEGAL" - }); - return [ - env$1, - from_lb(env$1.lex_source, lexbuf) - ]; + unicode_fix_cols(lexbuf); + ___ocaml_lex_state = 393; + continue ; case 2 : - var lt = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); - $$Buffer.add_string(raw, lt); - $$Buffer.add_string(buf, lt); - Lexing.new_line(lexbuf); - return jsx_text(env, mode, buf, raw, lexbuf); + var start = from_lb(env.lex_source, lexbuf); + var buf = $$Buffer.create(127); + var match = line_comment(env, buf, lexbuf); + var env$1 = save_comment(match[0], start, match[1], buf, true); + ___ocaml_lex_state = 393; + _env = env$1; + continue ; case 3 : - var n = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 3 | 0, lexbuf.lex_curr_pos - 1 | 0); - var s = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); - $$Buffer.add_string(raw, s); + var start$1 = from_lb(env.lex_source, lexbuf); + var buf$1 = $$Buffer.create(127); + var match$1 = comment(env, buf$1, lexbuf); + var env$2 = save_comment(match$1[0], start$1, match$1[1], buf$1, true); + ___ocaml_lex_state = 393; + _env = env$2; + continue ; + case 4 : + var start$2 = from_lb(env.lex_source, lexbuf); + var cooked = $$Buffer.create(127); + var raw = $$Buffer.create(127); + var literal = $$Buffer.create(127); + $$Buffer.add_string(literal, "}"); + var match$2 = template_part(env, start$2, cooked, raw, literal, lexbuf); + return [ + match$2[0], + { + TAG: /* T_TEMPLATE_PART */2, + _0: [ + match$2[1], + { + cooked: $$Buffer.contents(cooked), + raw: $$Buffer.contents(raw), + literal: $$Buffer.contents(literal) + }, + match$2[2] + ] + } + ]; + case 5 : + var env$3 = lex_error(env, from_lb(env.lex_source, lexbuf), { + TAG: /* UnexpectedToken */1, + _0: "ILLEGAL" + }); + return [ + env$3, + { + TAG: /* T_TEMPLATE_PART */2, + _0: [ + from_lb(env$3.lex_source, lexbuf), + { + cooked: "", + raw: "", + literal: "" + }, + true + ] + } + ]; + default: + Curry._1(lexbuf.refill_buff, lexbuf); + ___ocaml_lex_state = __ocaml_lex_state$1; + continue ; + } + }; +} + +function jsx_text(env, mode, buf, raw, lexbuf) { + var ___ocaml_lex_state = 371; + while(true) { + var __ocaml_lex_state = ___ocaml_lex_state; + var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); + switch (__ocaml_lex_state$1) { + case 0 : + var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + switch (mode) { + case /* JSX_SINGLE_QUOTED_TEXT */0 : + if (c === 39) { + return [ + env, + from_lb(env.lex_source, lexbuf) + ]; + } + break; + case /* JSX_DOUBLE_QUOTED_TEXT */1 : + if (c === 34) { + return [ + env, + from_lb(env.lex_source, lexbuf) + ]; + } + break; + case /* JSX_CHILD_TEXT */2 : + var exit = 0; + if (!(c !== 60 && c !== 123)) { + exit = 2; + } + if (exit === 2) { + back(lexbuf); + return [ + env, + from_lb(env.lex_source, lexbuf) + ]; + } + break; + + } + $$Buffer.add_char(raw, c); + $$Buffer.add_char(buf, c); + return jsx_text(env, mode, buf, raw, lexbuf); + case 1 : + var env$1 = lex_error(env, from_lb(env.lex_source, lexbuf), { + TAG: /* UnexpectedToken */1, + _0: "ILLEGAL" + }); + return [ + env$1, + from_lb(env$1.lex_source, lexbuf) + ]; + case 2 : + var lt = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); + $$Buffer.add_string(raw, lt); + $$Buffer.add_string(buf, lt); + Lexing.new_line(lexbuf); + return jsx_text(env, mode, buf, raw, lexbuf); + case 3 : + var n = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 3 | 0, lexbuf.lex_curr_pos - 1 | 0); + var s = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); + $$Buffer.add_string(raw, s); var code = Caml_format.int_of_string("0x" + n); List.iter((function (param) { return $$Buffer.add_char(buf, param); @@ -4646,156 +4763,167 @@ function jsx_text(env, mode, buf, raw, lexbuf) { }; } -function regexp_class(env, buf, lexbuf) { - var ___ocaml_lex_state = 326; - while(true) { - var __ocaml_lex_state = ___ocaml_lex_state; - var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); - switch (__ocaml_lex_state$1) { - case 0 : - return env; - case 1 : - case 2 : - break; - case 3 : - var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - $$Buffer.add_char(buf, c); - return env; - case 4 : - var c$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - $$Buffer.add_char(buf, c$1); - return regexp_class(env, buf, lexbuf); - default: - Curry._1(lexbuf.refill_buff, lexbuf); - ___ocaml_lex_state = __ocaml_lex_state$1; - continue ; - } - var s = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_start_pos + 2 | 0); - $$Buffer.add_string(buf, s); - return regexp_class(env, buf, lexbuf); - }; -} - -function regexp_body(env, buf, lexbuf) { - var ___ocaml_lex_state = 314; +function string_escape(env, buf, lexbuf) { + var ___ocaml_lex_state = 252; while(true) { var __ocaml_lex_state = ___ocaml_lex_state; var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); switch (__ocaml_lex_state$1) { case 0 : - var loc = from_lb(env.lex_source, lexbuf); - var env$1 = lex_error(env, loc, /* UnterminatedRegExp */13); return [ - env$1, - "" + env, + false ]; case 1 : - var loc$1 = from_lb(env.lex_source, lexbuf); - var env$2 = lex_error(env, loc$1, /* UnterminatedRegExp */13); + $$Buffer.add_string(buf, "\\"); return [ - env$2, - "" + env, + false ]; case 2 : - var s = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_start_pos + 2 | 0); - $$Buffer.add_string(buf, s); - return regexp_body(env, buf, lexbuf); + var a = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0); + var b = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 2 | 0); + var code = (hexa_to_int(a) << 4) + hexa_to_int(b) | 0; + List.iter((function (param) { + return $$Buffer.add_char(buf, param); + }), utf16to8(code)); + return [ + env, + false + ]; case 3 : - var flags = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 1 | 0, lexbuf.lex_curr_pos); + var a$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + var b$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0); + var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 2 | 0); + var code$1 = ((oct_to_int(a$1) << 6) + (oct_to_int(b$1) << 3) | 0) + oct_to_int(c) | 0; + if (code$1 < 256) { + List.iter((function (param) { + return $$Buffer.add_char(buf, param); + }), utf16to8(code$1)); + } else { + var code$2 = (oct_to_int(a$1) << 3) + oct_to_int(b$1) | 0; + List.iter((function (param) { + return $$Buffer.add_char(buf, param); + }), utf16to8(code$2)); + $$Buffer.add_char(buf, c); + } return [ env, - flags + true ]; case 4 : + var a$2 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + var b$2 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0); + var code$3 = (oct_to_int(a$2) << 3) + oct_to_int(b$2) | 0; + List.iter((function (param) { + return $$Buffer.add_char(buf, param); + }), utf16to8(code$3)); return [ env, - "" + true ]; case 5 : - var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - $$Buffer.add_char(buf, c); - var env$3 = regexp_class(env, buf, lexbuf); - return regexp_body(env$3, buf, lexbuf); + $$Buffer.add_char(buf, Char.chr(0)); + return [ + env, + false + ]; case 6 : - var loc$2 = from_lb(env.lex_source, lexbuf); - var env$4 = lex_error(env, loc$2, /* UnterminatedRegExp */13); + $$Buffer.add_char(buf, Char.chr(8)); return [ - env$4, - "" + env, + false ]; case 7 : - var c$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - $$Buffer.add_char(buf, c$1); - return regexp_body(env, buf, lexbuf); - default: - Curry._1(lexbuf.refill_buff, lexbuf); - ___ocaml_lex_state = __ocaml_lex_state$1; - continue ; - } - }; -} - -function __ocaml_lex_regexp_rec(_env, lexbuf, ___ocaml_lex_state) { - while(true) { - var __ocaml_lex_state = ___ocaml_lex_state; - var env = _env; - var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); - switch (__ocaml_lex_state$1) { - case 0 : + $$Buffer.add_char(buf, Char.chr(12)); return [ env, - /* T_EOF */105 + false ]; - case 1 : - Lexing.new_line(lexbuf); - ___ocaml_lex_state = 291; - continue ; - case 2 : - unicode_fix_cols(lexbuf); - ___ocaml_lex_state = 291; - continue ; - case 3 : - var start = from_lb(env.lex_source, lexbuf); - var buf = $$Buffer.create(127); - var match = line_comment(env, buf, lexbuf); - var env$1 = save_comment(match[0], start, match[1], buf, true); - ___ocaml_lex_state = 291; - _env = env$1; - continue ; - case 4 : - var start$1 = from_lb(env.lex_source, lexbuf); - var buf$1 = $$Buffer.create(127); - var match$1 = comment(env, buf$1, lexbuf); - var env$2 = save_comment(match$1[0], start$1, match$1[1], buf$1, true); - ___ocaml_lex_state = 291; - _env = env$2; - continue ; - case 5 : - var start$2 = from_lb(env.lex_source, lexbuf); - var buf$2 = $$Buffer.create(127); - var match$2 = regexp_body(env, buf$2, lexbuf); - var env$3 = match$2[0]; - var end_ = from_lb(env$3.lex_source, lexbuf); - var loc = btwn(start$2, end_); + case 8 : + $$Buffer.add_char(buf, Char.chr(10)); return [ - env$3, - { - TAG: /* T_REGEXP */3, - _0: [ - loc, - $$Buffer.contents(buf$2), - match$2[1] - ] - } + env, + false ]; - case 6 : - var env$4 = lex_error(env, from_lb(env.lex_source, lexbuf), { + case 9 : + $$Buffer.add_char(buf, Char.chr(13)); + return [ + env, + false + ]; + case 10 : + $$Buffer.add_char(buf, Char.chr(9)); + return [ + env, + false + ]; + case 11 : + $$Buffer.add_char(buf, Char.chr(11)); + return [ + env, + false + ]; + case 12 : + var a$3 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + var code$4 = oct_to_int(a$3); + List.iter((function (param) { + return $$Buffer.add_char(buf, param); + }), utf16to8(code$4)); + return [ + env, + true + ]; + case 13 : + var a$4 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0); + var b$3 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 2 | 0); + var c$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 3 | 0); + var d = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 4 | 0); + var code$5 = (((hexa_to_int(a$4) << 12) + (hexa_to_int(b$3) << 8) | 0) + (hexa_to_int(c$1) << 4) | 0) + hexa_to_int(d) | 0; + List.iter((function (param) { + return $$Buffer.add_char(buf, param); + }), utf16to8(code$5)); + return [ + env, + false + ]; + case 14 : + var hex_code = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 2 | 0, lexbuf.lex_curr_pos - 1 | 0); + var code$6 = Caml_format.int_of_string("0x" + hex_code); + var env$1 = code$6 > 1114111 ? lex_error(env, from_lb(env.lex_source, lexbuf), { + TAG: /* UnexpectedToken */1, + _0: "ILLEGAL" + }) : env; + List.iter((function (param) { + return $$Buffer.add_char(buf, param); + }), utf16to8(code$6)); + return [ + env$1, + false + ]; + case 15 : + var c$2 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + var env$2 = lex_error(env, from_lb(env.lex_source, lexbuf), { TAG: /* UnexpectedToken */1, _0: "ILLEGAL" }); + $$Buffer.add_char(buf, c$2); return [ - env$4, - /* T_ERROR */104 + env$2, + false + ]; + case 16 : + Lexing.new_line(lexbuf); + return [ + env, + false + ]; + case 17 : + var c$3 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + $$Buffer.add_char(buf, c$3); + return [ + env, + false ]; default: Curry._1(lexbuf.refill_buff, lexbuf); @@ -4805,388 +4933,260 @@ function __ocaml_lex_regexp_rec(_env, lexbuf, ___ocaml_lex_state) { }; } -function type_token(env, lexbuf) { - lexbuf.lex_mem = Caml_array.make(26, -1); - Caml_array.set(lexbuf.lex_mem, 17, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 16, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 15, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 14, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 13, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 12, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 11, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 10, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 9, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 8, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 7, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 6, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 5, lexbuf.lex_curr_pos); - Caml_array.set(lexbuf.lex_mem, 4, lexbuf.lex_curr_pos); - var ___ocaml_lex_state = 133; +function __ocaml_lex_jsx_tag_rec(_env, lexbuf, ___ocaml_lex_state) { while(true) { var __ocaml_lex_state = ___ocaml_lex_state; - var __ocaml_lex_state$1 = Lexing.new_engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); + var env = _env; + var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); switch (__ocaml_lex_state$1) { case 0 : - Lexing.new_line(lexbuf); - return type_token(env, lexbuf); + return [ + env, + /* T_EOF */105 + ]; case 1 : - unicode_fix_cols(lexbuf); - return type_token(env, lexbuf); + Lexing.new_line(lexbuf); + ___ocaml_lex_state = 333; + continue ; case 2 : + unicode_fix_cols(lexbuf); + ___ocaml_lex_state = 333; + continue ; + case 3 : var start = from_lb(env.lex_source, lexbuf); var buf = $$Buffer.create(127); - var match = comment(env, buf, lexbuf); + var match = line_comment(env, buf, lexbuf); var env$1 = save_comment(match[0], start, match[1], buf, true); - return type_token(env$1, lexbuf); - case 3 : - var sp = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 2 | 0, Caml_array.get(lexbuf.lex_mem, 0)); - var escape_type = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); - var pattern = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); - if (env.lex_enable_comment_syntax) { - var env$2; - if (env.lex_in_comment_syntax) { - var loc = from_lb(env.lex_source, lexbuf); - env$2 = unexpected_error(env, loc, pattern); - } else { - env$2 = env; - } - var env$3 = in_comment_syntax(true, env$2); - if (escape_type === ":") { - return [ - env$3, - /* T_COLON */77 - ]; - } else { - return type_token(env$3, lexbuf); - } - } + ___ocaml_lex_state = 333; + _env = env$1; + continue ; + case 4 : var start$1 = from_lb(env.lex_source, lexbuf); var buf$1 = $$Buffer.create(127); - $$Buffer.add_string(buf$1, sp); - $$Buffer.add_string(buf$1, escape_type); var match$1 = comment(env, buf$1, lexbuf); - var env$4 = save_comment(match$1[0], start$1, match$1[1], buf$1, true); - return type_token(env$4, lexbuf); - case 4 : - if (env.lex_in_comment_syntax) { - var env$5 = in_comment_syntax(false, env); - return type_token(env$5, lexbuf); - } - yyback(1, lexbuf); + var env$2 = save_comment(match$1[0], start$1, match$1[1], buf$1, true); + ___ocaml_lex_state = 333; + _env = env$2; + continue ; + case 5 : return [ env, - /* T_MULT */97 + /* T_LESS_THAN */89 ]; - case 5 : - var start$2 = from_lb(env.lex_source, lexbuf); - var buf$2 = $$Buffer.create(127); - var match$2 = line_comment(env, buf$2, lexbuf); - var env$6 = save_comment(match$2[0], start$2, match$2[1], buf$2, true); - return type_token(env$6, lexbuf); case 6 : - var quote = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); - var start$3 = from_lb(env.lex_source, lexbuf); - var buf$3 = $$Buffer.create(127); - var raw = $$Buffer.create(127); - $$Buffer.add_char(raw, quote); - var match$3 = string_quote(env, quote, buf$3, raw, false, lexbuf); return [ - match$3[0], - { - TAG: /* T_STRING */1, - _0: [ - btwn(start$3, match$3[1]), - $$Buffer.contents(buf$3), - $$Buffer.contents(raw), - match$3[2] - ] - } + env, + /* T_DIV */96 ]; case 7 : - var neg = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); - var w = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); - return illegal_number(env, lexbuf, w, mk_num_singleton(/* BINARY */0, num, neg)); + return [ + env, + /* T_GREATER_THAN */90 + ]; case 8 : - var neg$1 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$1 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); return [ env, - mk_num_singleton(/* BINARY */0, num$1, neg$1) + /* T_LCURLY */1 ]; case 9 : - var neg$2 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$2 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); - var w$1 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); - return illegal_number(env, lexbuf, w$1, mk_num_singleton(/* OCTAL */2, num$2, neg$2)); + return [ + env, + /* T_COLON */77 + ]; case 10 : - var neg$3 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$3 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); return [ env, - mk_num_singleton(/* OCTAL */2, num$3, neg$3) + /* T_PERIOD */9 ]; case 11 : - var neg$4 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$4 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); - var w$2 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); - return illegal_number(env, lexbuf, w$2, mk_num_singleton(/* LEGACY_OCTAL */1, num$4, neg$4)); + return [ + env, + /* T_ASSIGN */75 + ]; case 12 : - var neg$5 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$5 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); + unicode_fix_cols(lexbuf); return [ env, - mk_num_singleton(/* LEGACY_OCTAL */1, num$5, neg$5) + /* T_JSX_IDENTIFIER */106 ]; case 13 : - var neg$6 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$6 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); - var w$3 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); - var match$4; - try { - match$4 = [ - env, - mk_num_singleton(/* NORMAL */3, num$6, neg$6) - ]; - } - catch (exn){ - if (Sys.win32) { - var loc$1 = from_lb(env.lex_source, lexbuf); - var env$7 = lex_error(env, loc$1, /* WindowsFloatOfString */59); - match$4 = [ - env$7, - { - TAG: /* T_NUMBER_SINGLETON_TYPE */5, - _0: /* NORMAL */3, - _1: 789.0 - } - ]; - } else { - throw exn; - } - } - return illegal_number(match$4[0], lexbuf, w$3, match$4[1]); + var quote = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + var start$2 = from_lb(env.lex_source, lexbuf); + var buf$2 = $$Buffer.create(127); + var raw = $$Buffer.create(127); + $$Buffer.add_char(raw, quote); + var mode = quote === /* '\'' */39 ? /* JSX_SINGLE_QUOTED_TEXT */0 : /* JSX_DOUBLE_QUOTED_TEXT */1; + var match$2 = jsx_text(env, mode, buf$2, raw, lexbuf); + $$Buffer.add_char(raw, quote); + var value = $$Buffer.contents(buf$2); + var raw$1 = $$Buffer.contents(raw); + return [ + match$2[0], + { + TAG: /* T_JSX_TEXT */4, + _0: [ + btwn(start$2, match$2[1]), + value, + raw$1 + ] + } + ]; case 14 : - var neg$7 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$7 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); - try { - return [ - env, - mk_num_singleton(/* NORMAL */3, num$7, neg$7) - ]; - } - catch (exn$1){ - if (Sys.win32) { - var loc$2 = from_lb(env.lex_source, lexbuf); - var env$8 = lex_error(env, loc$2, /* WindowsFloatOfString */59); - return [ - env$8, - { - TAG: /* T_NUMBER_SINGLETON_TYPE */5, - _0: /* NORMAL */3, - _1: 789.0 - } - ]; - } - throw exn$1; - } - case 15 : - var neg$8 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$8 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); - var w$4 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); - return illegal_number(env, lexbuf, w$4, mk_num_singleton(/* NORMAL */3, num$8, neg$8)); - case 16 : - var neg$9 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$9 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos); return [ env, - mk_num_singleton(/* NORMAL */3, num$9, neg$9) + /* T_ERROR */104 ]; - case 17 : - var neg$10 = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0)); - var num$10 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1)); - var w$5 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), lexbuf.lex_curr_pos); - return illegal_number(env, lexbuf, w$5, mk_num_singleton(/* NORMAL */3, num$10, neg$10)); - case 18 : - var neg$11 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), Caml_array.get(lexbuf.lex_mem, 0)); - var num$11 = Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 3), Caml_array.get(lexbuf.lex_mem, 2)); + default: + Curry._1(lexbuf.refill_buff, lexbuf); + ___ocaml_lex_state = __ocaml_lex_state$1; + continue ; + } + }; +} + +function __ocaml_lex_regexp_rec(_env, lexbuf, ___ocaml_lex_state) { + while(true) { + var __ocaml_lex_state = ___ocaml_lex_state; + var env = _env; + var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); + switch (__ocaml_lex_state$1) { + case 0 : return [ env, - mk_num_singleton(/* NORMAL */3, num$11, neg$11) + /* T_EOF */105 ]; - case 19 : - var word = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); + case 1 : + Lexing.new_line(lexbuf); + ___ocaml_lex_state = 291; + continue ; + case 2 : unicode_fix_cols(lexbuf); - try { - return [ - env, - Hashtbl.find(type_keywords, word) - ]; - } - catch (raw_exn){ - var exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn); - if (exn$2.RE_EXN_ID === "Not_found") { - return [ - env, - /* T_IDENTIFIER */0 - ]; - } - throw exn$2; - } - case 22 : + ___ocaml_lex_state = 291; + continue ; + case 3 : + var start = from_lb(env.lex_source, lexbuf); + var buf = $$Buffer.create(127); + var match = line_comment(env, buf, lexbuf); + var env$1 = save_comment(match[0], start, match[1], buf, true); + ___ocaml_lex_state = 291; + _env = env$1; + continue ; + case 4 : + var start$1 = from_lb(env.lex_source, lexbuf); + var buf$1 = $$Buffer.create(127); + var match$1 = comment(env, buf$1, lexbuf); + var env$2 = save_comment(match$1[0], start$1, match$1[1], buf$1, true); + ___ocaml_lex_state = 291; + _env = env$2; + continue ; + case 5 : + var start$2 = from_lb(env.lex_source, lexbuf); + var buf$2 = $$Buffer.create(127); + var match$2 = regexp_body(env, buf$2, lexbuf); + var env$3 = match$2[0]; + var end_ = from_lb(env$3.lex_source, lexbuf); + var loc = btwn(start$2, end_); return [ - env, - /* T_LCURLY */1 + env$3, + { + TAG: /* T_REGEXP */3, + _0: [ + loc, + $$Buffer.contents(buf$2), + match$2[1] + ] + } ]; - case 23 : + case 6 : + var env$4 = lex_error(env, from_lb(env.lex_source, lexbuf), { + TAG: /* UnexpectedToken */1, + _0: "ILLEGAL" + }); return [ - env, - /* T_RCURLY */2 + env$4, + /* T_ERROR */104 ]; - case 24 : + default: + Curry._1(lexbuf.refill_buff, lexbuf); + ___ocaml_lex_state = __ocaml_lex_state$1; + continue ; + } + }; +} + +function regexp_body(env, buf, lexbuf) { + var ___ocaml_lex_state = 314; + while(true) { + var __ocaml_lex_state = ___ocaml_lex_state; + var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); + switch (__ocaml_lex_state$1) { + case 0 : + var loc = from_lb(env.lex_source, lexbuf); + var env$1 = lex_error(env, loc, /* UnterminatedRegExp */13); return [ - env, - /* T_LPAREN */3 + env$1, + "" ]; - case 25 : + case 1 : + var loc$1 = from_lb(env.lex_source, lexbuf); + var env$2 = lex_error(env, loc$1, /* UnterminatedRegExp */13); return [ - env, - /* T_RPAREN */4 + env$2, + "" ]; - case 26 : + case 2 : + var s = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_start_pos + 2 | 0); + $$Buffer.add_string(buf, s); + return regexp_body(env, buf, lexbuf); + case 3 : + var flags = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 1 | 0, lexbuf.lex_curr_pos); return [ env, - /* T_ELLIPSIS */11 + flags ]; - case 27 : + case 4 : return [ env, - /* T_PERIOD */9 + "" ]; - case 28 : + case 5 : + var c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + $$Buffer.add_char(buf, c); + var env$3 = regexp_class(env, buf, lexbuf); + return regexp_body(env$3, buf, lexbuf); + case 6 : + var loc$2 = from_lb(env.lex_source, lexbuf); + var env$4 = lex_error(env, loc$2, /* UnterminatedRegExp */13); return [ - env, - /* T_SEMICOLON */7 + env$4, + "" ]; - case 29 : - return [ - env, - /* T_COMMA */8 - ]; - case 20 : - case 32 : - return [ - env, - /* T_LBRACKET */5 - ]; - case 21 : - case 33 : - return [ - env, - /* T_RBRACKET */6 - ]; - case 34 : - return [ - env, - /* T_LESS_THAN */89 - ]; - case 35 : - return [ - env, - /* T_GREATER_THAN */90 - ]; - case 31 : - case 37 : - return [ - env, - /* T_PLING */76 - ]; - case 38 : - return [ - env, - /* T_MULT */97 - ]; - case 30 : - case 39 : - return [ - env, - /* T_COLON */77 - ]; - case 40 : - return [ - env, - /* T_BIT_OR */80 - ]; - case 41 : - return [ - env, - /* T_BIT_AND */82 - ]; - case 42 : - return [ - env, - /* T_TYPEOF */44 - ]; - case 43 : - return [ - env, - /* T_ARROW */10 - ]; - case 36 : - case 44 : - return [ - env, - /* T_ASSIGN */75 - ]; - case 45 : - return [ - env, - /* T_PLUS */94 - ]; - case 46 : - return [ - env, - /* T_MINUS */95 - ]; - case 47 : - var env$9; - if (env.lex_in_comment_syntax) { - var loc$3 = from_lb(env.lex_source, lexbuf); - env$9 = lex_error(env, loc$3, /* UnexpectedEOS */4); - } else { - env$9 = env; - } - return [ - env$9, - /* T_EOF */105 - ]; - case 48 : - return [ - env, - /* T_ERROR */104 - ]; - default: - Curry._1(lexbuf.refill_buff, lexbuf); - ___ocaml_lex_state = __ocaml_lex_state$1; - continue ; - } - }; -} - -function jsx_child(env, start, buf, raw, lexbuf) { - var ___ocaml_lex_state = 364; - while(true) { - var __ocaml_lex_state = ___ocaml_lex_state; - var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); - switch (__ocaml_lex_state$1) { - case 0 : - var lt = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); - $$Buffer.add_string(raw, lt); - $$Buffer.add_string(buf, lt); - Lexing.new_line(lexbuf); - var match = jsx_text(env, /* JSX_CHILD_TEXT */2, buf, raw, lexbuf); - var value = $$Buffer.contents(buf); - var raw$1 = $$Buffer.contents(raw); + case 7 : + var c$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos); + $$Buffer.add_char(buf, c$1); + return regexp_body(env, buf, lexbuf); + default: + Curry._1(lexbuf.refill_buff, lexbuf); + ___ocaml_lex_state = __ocaml_lex_state$1; + continue ; + } + }; +} + +function jsx_child(env, start, buf, raw, lexbuf) { + var ___ocaml_lex_state = 364; + while(true) { + var __ocaml_lex_state = ___ocaml_lex_state; + var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf); + switch (__ocaml_lex_state$1) { + case 0 : + var lt = Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos); + $$Buffer.add_string(raw, lt); + $$Buffer.add_string(buf, lt); + Lexing.new_line(lexbuf); + var match = jsx_text(env, /* JSX_CHILD_TEXT */2, buf, raw, lexbuf); + var value = $$Buffer.contents(buf); + var raw$1 = $$Buffer.contents(raw); return [ match[0], { @@ -6719,116 +6719,6 @@ var Parse = Caml_module.init_mod([ ] }); -function union(env) { - maybe(env, /* T_BIT_OR */80); - var left = intersection(env); - return Curry._2(union_with, env, left); -} - -function param_list_or_type(env) { - token$4(env, /* T_LPAREN */3); - var token$5 = Curry._2(Parser_env_Peek.token, undefined, env); - var ret; - var exit = 0; - if (/* tag */typeof token$5 === "number") { - switch (token$5) { - case /* T_IDENTIFIER */0 : - ret = function_param_or_generic_type(env); - break; - case /* T_RPAREN */4 : - ret = { - TAG: /* ParamList */0, - _0: [ - undefined, - /* [] */0 - ] - }; - break; - case /* T_ELLIPSIS */11 : - case /* T_EOF */105 : - ret = { - TAG: /* ParamList */0, - _0: Curry._2(function_param_list_without_parens, env, /* [] */0) - }; - break; - default: - exit = 1; - } - } else { - exit = 1; - } - if (exit === 1) { - var match = primitive(token$5); - if (match !== undefined) { - var match$1 = Curry._2(Parser_env_Peek.token, 1, env); - var exit$1 = 0; - if (/* tag */typeof match$1 === "number") { - switch (match$1) { - case /* T_PLING */76 : - case /* T_COLON */77 : - exit$1 = 2; - break; - default: - ret = { - TAG: /* Type */1, - _0: union(env) - }; - } - } else { - ret = { - TAG: /* Type */1, - _0: union(env) - }; - } - if (exit$1 === 2) { - var match$2 = Curry._1(Parse.identifier_or_reserved_keyword, env); - var name = match$2[0]; - if (!env.parse_options.types) { - error(env, /* UnexpectedTypeAnnotation */6); - } - var optional = maybe(env, /* T_PLING */76); - token$4(env, /* T_COLON */77); - var typeAnnotation = union(env); - if (Curry._2(Parser_env_Peek.token, undefined, env) !== /* T_RPAREN */4) { - token$4(env, /* T_COMMA */8); - } - var param_0 = btwn(name[0], typeAnnotation[0]); - var param_1 = { - name: name, - typeAnnotation: typeAnnotation, - optional: optional - }; - var param = [ - param_0, - param_1 - ]; - ret = { - TAG: /* ParamList */0, - _0: Curry._2(function_param_list_without_parens, env, { - hd: param, - tl: /* [] */0 - }) - }; - } - - } else { - ret = { - TAG: /* Type */1, - _0: union(env) - }; - } - } - token$4(env, /* T_RPAREN */4); - return ret; -} - -function function_param_list(env) { - token$4(env, /* T_LPAREN */3); - var ret = Curry._2(function_param_list_without_parens, env, /* [] */0); - token$4(env, /* T_RPAREN */4); - return ret; -} - function prefix(env) { var match = Curry._2(Parser_env_Peek.token, undefined, env); if (/* tag */typeof match !== "number") { @@ -6849,17 +6739,6 @@ function prefix(env) { ]; } -function postfix(env) { - var t = primary(env); - return postfix_with(env, t); -} - -function intersection(env) { - maybe(env, /* T_BIT_AND */82); - var left = prefix(env); - return Curry._2(intersection_with, env, left); -} - function rev_nonempty_acc(acc) { var end_loc; if (acc) { @@ -6896,112 +6775,27 @@ function rev_nonempty_acc(acc) { ]; } -function function_param_with_id(env, name) { - if (!env.parse_options.types) { - error(env, /* UnexpectedTypeAnnotation */6); - } - var optional = maybe(env, /* T_PLING */76); - token$4(env, /* T_COLON */77); - var typeAnnotation = union(env); - return [ - btwn(name[0], typeAnnotation[0]), - { - name: name, - typeAnnotation: typeAnnotation, - optional: optional - } - ]; +function intersection(env) { + maybe(env, /* T_BIT_AND */82); + var left = prefix(env); + return Curry._2(intersection_with, env, left); } -function generic_type_with_identifier(env, id) { - var match = Curry._2(raw_generic_with_identifier, env, id); - return [ - match[0], - { - TAG: /* Generic */4, - _0: match[1] - } - ]; -} - -function postfix_with(env, _t) { - while(true) { - var t = _t; - if (!(!Curry._1(Parser_env_Peek.is_line_terminator, env) && maybe(env, /* T_LBRACKET */5))) { - return t; - } - var end_loc = Curry._2(Parser_env_Peek.loc, undefined, env); - token$4(env, /* T_RBRACKET */6); - var loc = btwn(t[0], end_loc); - var t_1 = { - TAG: /* Array */3, - _0: t - }; - var t$1 = [ - loc, - t_1 - ]; - _t = t$1; - continue ; - }; +function function_param_list(env) { + token$4(env, /* T_LPAREN */3); + var ret = Curry._2(function_param_list_without_parens, env, /* [] */0); + token$4(env, /* T_RPAREN */4); + return ret; } -function primitive(param) { - if (/* tag */typeof param !== "number") { - return ; - } - switch (param) { - case /* T_NULL */27 : - return /* Null */2; - case /* T_ANY_TYPE */107 : - return /* Any */0; - case /* T_BOOLEAN_TYPE */108 : - return /* Boolean */5; - case /* T_NUMBER_TYPE */109 : - return /* Number */3; - case /* T_STRING_TYPE */110 : - return /* String */4; - case /* T_VOID_TYPE */111 : - return /* Void */1; - default: - return ; - } +function union(env) { + maybe(env, /* T_BIT_OR */80); + var left = intersection(env); + return Curry._2(union_with, env, left); } -function function_param_or_generic_type(env) { - var id = Curry._2(Parse.identifier, undefined, env); - var match = Curry._2(Parser_env_Peek.token, undefined, env); - var exit = 0; - if (/* tag */typeof match === "number") { - switch (match) { - case /* T_PLING */76 : - case /* T_COLON */77 : - exit = 2; - break; - default: - exit = 1; - } - } else { - exit = 1; - } - switch (exit) { - case 1 : - return { - TAG: /* Type */1, - _0: Curry._2(union_with, env, Curry._2(intersection_with, env, postfix_with(env, generic_type_with_identifier(env, id)))) - }; - case 2 : - var param = function_param_with_id(env, id); - maybe(env, /* T_COMMA */8); - return { - TAG: /* ParamList */0, - _0: Curry._2(function_param_list_without_parens, env, { - hd: param, - tl: /* [] */0 - }) - }; - - } +function generic(env) { + return Curry._2(raw_generic_with_identifier, env, Curry._2(Parse.identifier, undefined, env)); } function primary(env) { @@ -7196,178 +6990,218 @@ function primary(env) { } } -function generic(env) { - return Curry._2(raw_generic_with_identifier, env, Curry._2(Parse.identifier, undefined, env)); +function primitive(param) { + if (/* tag */typeof param !== "number") { + return ; + } + switch (param) { + case /* T_NULL */27 : + return /* Null */2; + case /* T_ANY_TYPE */107 : + return /* Any */0; + case /* T_BOOLEAN_TYPE */108 : + return /* Boolean */5; + case /* T_NUMBER_TYPE */109 : + return /* Number */3; + case /* T_STRING_TYPE */110 : + return /* String */4; + case /* T_VOID_TYPE */111 : + return /* Void */1; + default: + return ; + } } -function identifier(env, _param) { +function function_param_with_id(env, name) { + if (!env.parse_options.types) { + error(env, /* UnexpectedTypeAnnotation */6); + } + var optional = maybe(env, /* T_PLING */76); + token$4(env, /* T_COLON */77); + var typeAnnotation = union(env); + return [ + btwn(name[0], typeAnnotation[0]), + { + name: name, + typeAnnotation: typeAnnotation, + optional: optional + } + ]; +} + +function postfix_with(env, _t) { while(true) { - var param = _param; - var qualification = param[1]; - var q_loc = param[0]; - if (Curry._2(Parser_env_Peek.token, undefined, env) !== /* T_PERIOD */9) { - return [ - q_loc, - qualification - ]; + var t = _t; + if (!(!Curry._1(Parser_env_Peek.is_line_terminator, env) && maybe(env, /* T_LBRACKET */5))) { + return t; } - token$4(env, /* T_PERIOD */9); - var id = Curry._2(Parse.identifier, undefined, env); - var loc = btwn(q_loc, id[0]); - var qualification$1 = { - TAG: /* Qualified */1, - _0: [ - loc, - { - qualification: qualification, - id: id - } - ] + var end_loc = Curry._2(Parser_env_Peek.loc, undefined, env); + token$4(env, /* T_RBRACKET */6); + var loc = btwn(t[0], end_loc); + var t_1 = { + TAG: /* Array */3, + _0: t }; - _param = [ + var t$1 = [ loc, - qualification$1 + t_1 ]; + _t = t$1; continue ; }; } -function raw_generic_with_identifier(env, id) { - var id_0 = id[0]; - var id_1 = { - TAG: /* Unqualified */0, - _0: id - }; - var id$1 = [ - id_0, - id_1 - ]; - var match = identifier(env, id$1); - var id_loc = match[0]; - var typeParameters = Curry._1(type_parameter_instantiation, env); - var loc = typeParameters !== undefined ? btwn(id_loc, typeParameters[0]) : id_loc; +function generic_type_with_identifier(env, id) { + var match = Curry._2(raw_generic_with_identifier, env, id); return [ - loc, + match[0], { - id: match[1], - typeParameters: typeParameters + TAG: /* Generic */4, + _0: match[1] } ]; } -function params(env, allow_default, _require_default, _acc) { - while(true) { - var acc = _acc; - var require_default = _require_default; - var match = Curry._2(Parser_env_Peek.token, undefined, env); - var variance; - if (/* tag */typeof match === "number") { - switch (match) { - case /* T_PLUS */94 : - token$3(env); - variance = /* Plus */0; - break; - case /* T_MINUS */95 : - token$3(env); - variance = /* Minus */1; - break; - default: - variance = undefined; - } - } else { - variance = undefined; - } - var match$1 = Curry._2(Parse.identifier_with_type, env, /* StrictParamName */28); - var id = match$1[1]; - var loc = match$1[0]; - var match$2 = Curry._2(Parser_env_Peek.token, undefined, env); - var match$3; - if (allow_default) { - var exit = 0; - if (/* tag */typeof match$2 === "number" && match$2 === /* T_ASSIGN */75) { - token$3(env); - match$3 = [ - union(env), - true - ]; - } else { +function function_param_or_generic_type(env) { + var id = Curry._2(Parse.identifier, undefined, env); + var match = Curry._2(Parser_env_Peek.token, undefined, env); + var exit = 0; + if (/* tag */typeof match === "number") { + switch (match) { + case /* T_PLING */76 : + case /* T_COLON */77 : + exit = 2; + break; + default: exit = 1; - } - if (exit === 1) { - if (require_default) { - error_at(env, [ - loc, - /* MissingTypeParamDefault */58 - ]); - } - match$3 = [ - undefined, - require_default - ]; - } - - } else { - match$3 = [ - undefined, - false - ]; - } - var param_1 = { - name: id.name, - bound: id.typeAnnotation, - variance: variance, - default: match$3[0] - }; - var param = [ - loc, - param_1 - ]; - var acc$1 = { - hd: param, - tl: acc - }; - var match$4 = Curry._2(Parser_env_Peek.token, undefined, env); - if (/* tag */typeof match$4 === "number") { - switch (match$4) { - case /* T_GREATER_THAN */90 : - case /* T_EOF */105 : - return List.rev(acc$1); - default: - - } - } - token$4(env, /* T_COMMA */8); - if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_GREATER_THAN */90) { - return List.rev(acc$1); } - _acc = acc$1; - _require_default = match$3[1]; - continue ; - }; + } else { + exit = 1; + } + switch (exit) { + case 1 : + return { + TAG: /* Type */1, + _0: Curry._2(union_with, env, Curry._2(intersection_with, env, postfix_with(env, generic_type_with_identifier(env, id)))) + }; + case 2 : + var param = function_param_with_id(env, id); + maybe(env, /* T_COMMA */8); + return { + TAG: /* ParamList */0, + _0: Curry._2(function_param_list_without_parens, env, { + hd: param, + tl: /* [] */0 + }) + }; + + } } -function type_parameter_declaration(allow_default, env) { - var start_loc = Curry._2(Parser_env_Peek.loc, undefined, env); - if (Curry._2(Parser_env_Peek.token, undefined, env) !== /* T_LESS_THAN */89) { - return ; - } - if (!env.parse_options.types) { - error(env, /* UnexpectedTypeAnnotation */6); +function param_list_or_type(env) { + token$4(env, /* T_LPAREN */3); + var token$5 = Curry._2(Parser_env_Peek.token, undefined, env); + var ret; + var exit = 0; + if (/* tag */typeof token$5 === "number") { + switch (token$5) { + case /* T_IDENTIFIER */0 : + ret = function_param_or_generic_type(env); + break; + case /* T_RPAREN */4 : + ret = { + TAG: /* ParamList */0, + _0: [ + undefined, + /* [] */0 + ] + }; + break; + case /* T_ELLIPSIS */11 : + case /* T_EOF */105 : + ret = { + TAG: /* ParamList */0, + _0: Curry._2(function_param_list_without_parens, env, /* [] */0) + }; + break; + default: + exit = 1; + } + } else { + exit = 1; } - token$4(env, /* T_LESS_THAN */89); - var params$1 = params(env, allow_default, false, /* [] */0); - var loc = btwn(start_loc, Curry._2(Parser_env_Peek.loc, undefined, env)); - token$4(env, /* T_GREATER_THAN */90); - return [ - loc, - { - params: params$1 - } + if (exit === 1) { + var match = primitive(token$5); + if (match !== undefined) { + var match$1 = Curry._2(Parser_env_Peek.token, 1, env); + var exit$1 = 0; + if (/* tag */typeof match$1 === "number") { + switch (match$1) { + case /* T_PLING */76 : + case /* T_COLON */77 : + exit$1 = 2; + break; + default: + ret = { + TAG: /* Type */1, + _0: union(env) + }; + } + } else { + ret = { + TAG: /* Type */1, + _0: union(env) + }; + } + if (exit$1 === 2) { + var match$2 = Curry._1(Parse.identifier_or_reserved_keyword, env); + var name = match$2[0]; + if (!env.parse_options.types) { + error(env, /* UnexpectedTypeAnnotation */6); + } + var optional = maybe(env, /* T_PLING */76); + token$4(env, /* T_COLON */77); + var typeAnnotation = union(env); + if (Curry._2(Parser_env_Peek.token, undefined, env) !== /* T_RPAREN */4) { + token$4(env, /* T_COMMA */8); + } + var param_0 = btwn(name[0], typeAnnotation[0]); + var param_1 = { + name: name, + typeAnnotation: typeAnnotation, + optional: optional + }; + var param = [ + param_0, + param_1 ]; + ret = { + TAG: /* ParamList */0, + _0: Curry._2(function_param_list_without_parens, env, { + hd: param, + tl: /* [] */0 + }) + }; + } + + } else { + ret = { + TAG: /* Type */1, + _0: union(env) + }; + } + } + token$4(env, /* T_RPAREN */4); + return ret; } -function union_with(env, left) { - if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_BIT_OR */80) { +function postfix(env) { + var t = primary(env); + return postfix_with(env, t); +} + +function intersection_with(env, left) { + if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_BIT_AND */82) { var _acc = { hd: left, tl: /* [] */0 @@ -7375,10 +7209,10 @@ function union_with(env, left) { while(true) { var acc = _acc; var match = Curry._2(Parser_env_Peek.token, undefined, env); - if (/* tag */typeof match === "number" && match === /* T_BIT_OR */80) { - token$4(env, /* T_BIT_OR */80); + if (/* tag */typeof match === "number" && match === /* T_BIT_AND */82) { + token$4(env, /* T_BIT_AND */82); _acc = { - hd: intersection(env), + hd: prefix(env), tl: acc }; continue ; @@ -7387,7 +7221,7 @@ function union_with(env, left) { return [ match$1[0], { - TAG: /* Union */5, + TAG: /* Intersection */6, _0: match$1[1] } ]; @@ -7446,74 +7280,128 @@ function function_param_list_without_parens(env) { }; } -function intersection_with(env, left) { - if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_BIT_AND */82) { - var _acc = { - hd: left, - tl: /* [] */0 - }; - while(true) { - var acc = _acc; - var match = Curry._2(Parser_env_Peek.token, undefined, env); - if (/* tag */typeof match === "number" && match === /* T_BIT_AND */82) { - token$4(env, /* T_BIT_AND */82); - _acc = { - hd: prefix(env), - tl: acc - }; - continue ; - } - var match$1 = rev_nonempty_acc(acc); - return [ - match$1[0], - { - TAG: /* Intersection */6, - _0: match$1[1] - } - ]; - }; - } else { - return left; - } -} - -function types(env, _acc) { +function params(env, allow_default, _require_default, _acc) { while(true) { var acc = _acc; + var require_default = _require_default; var match = Curry._2(Parser_env_Peek.token, undefined, env); + var variance; if (/* tag */typeof match === "number") { switch (match) { - case /* T_RBRACKET */6 : - case /* T_EOF */105 : - return List.rev(acc); + case /* T_PLUS */94 : + token$3(env); + variance = /* Plus */0; + break; + case /* T_MINUS */95 : + token$3(env); + variance = /* Minus */1; + break; default: - + variance = undefined; } + } else { + variance = undefined; } - var acc_0 = union(env); - var acc$1 = { - hd: acc_0, - tl: acc - }; - if (Curry._2(Parser_env_Peek.token, undefined, env) !== /* T_RBRACKET */6) { - token$4(env, /* T_COMMA */8); - } - _acc = acc$1; - continue ; - }; -} - -function methodish(env, start_loc) { - var typeParameters = Curry._2(type_parameter_declaration, false, env); - var match = function_param_list(env); - token$4(env, /* T_COLON */77); - var returnType = union(env); - var loc = btwn(start_loc, returnType[0]); - return [ - loc, - { - params: match[1], - returnType: returnType, + var match$1 = Curry._2(Parse.identifier_with_type, env, /* StrictParamName */28); + var id = match$1[1]; + var loc = match$1[0]; + var match$2 = Curry._2(Parser_env_Peek.token, undefined, env); + var match$3; + if (allow_default) { + var exit = 0; + if (/* tag */typeof match$2 === "number" && match$2 === /* T_ASSIGN */75) { + token$3(env); + match$3 = [ + union(env), + true + ]; + } else { + exit = 1; + } + if (exit === 1) { + if (require_default) { + error_at(env, [ + loc, + /* MissingTypeParamDefault */58 + ]); + } + match$3 = [ + undefined, + require_default + ]; + } + + } else { + match$3 = [ + undefined, + false + ]; + } + var param_1 = { + name: id.name, + bound: id.typeAnnotation, + variance: variance, + default: match$3[0] + }; + var param = [ + loc, + param_1 + ]; + var acc$1 = { + hd: param, + tl: acc + }; + var match$4 = Curry._2(Parser_env_Peek.token, undefined, env); + if (/* tag */typeof match$4 === "number") { + switch (match$4) { + case /* T_GREATER_THAN */90 : + case /* T_EOF */105 : + return List.rev(acc$1); + default: + + } + } + token$4(env, /* T_COMMA */8); + if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_GREATER_THAN */90) { + return List.rev(acc$1); + } + _acc = acc$1; + _require_default = match$3[1]; + continue ; + }; +} + +function type_parameter_declaration(allow_default, env) { + var start_loc = Curry._2(Parser_env_Peek.loc, undefined, env); + if (Curry._2(Parser_env_Peek.token, undefined, env) !== /* T_LESS_THAN */89) { + return ; + } + if (!env.parse_options.types) { + error(env, /* UnexpectedTypeAnnotation */6); + } + token$4(env, /* T_LESS_THAN */89); + var params$1 = params(env, allow_default, false, /* [] */0); + var loc = btwn(start_loc, Curry._2(Parser_env_Peek.loc, undefined, env)); + token$4(env, /* T_GREATER_THAN */90); + return [ + loc, + { + params: params$1 + } + ]; +} + +function methodish(env, start_loc) { + var typeParameters = Curry._2(type_parameter_declaration, false, env); + var match = function_param_list(env); + token$4(env, /* T_COLON */77); + var returnType = union(env); + var loc = btwn(start_loc, returnType[0]); + return [ + loc, + { + params: match[1], + returnType: returnType, rest: match[0], typeParameters: typeParameters } @@ -7757,6 +7645,32 @@ function _object(allow_staticOpt, env) { ]; } +function types(env, _acc) { + while(true) { + var acc = _acc; + var match = Curry._2(Parser_env_Peek.token, undefined, env); + if (/* tag */typeof match === "number") { + switch (match) { + case /* T_RBRACKET */6 : + case /* T_EOF */105 : + return List.rev(acc); + default: + + } + } + var acc_0 = union(env); + var acc$1 = { + hd: acc_0, + tl: acc + }; + if (Curry._2(Parser_env_Peek.token, undefined, env) !== /* T_RBRACKET */6) { + token$4(env, /* T_COMMA */8); + } + _acc = acc$1; + continue ; + }; +} + function params$1(env, _acc) { while(true) { var acc = _acc; @@ -7800,6 +7714,92 @@ function type_parameter_instantiation(env) { ]; } +function identifier(env, _param) { + while(true) { + var param = _param; + var qualification = param[1]; + var q_loc = param[0]; + if (Curry._2(Parser_env_Peek.token, undefined, env) !== /* T_PERIOD */9) { + return [ + q_loc, + qualification + ]; + } + token$4(env, /* T_PERIOD */9); + var id = Curry._2(Parse.identifier, undefined, env); + var loc = btwn(q_loc, id[0]); + var qualification$1 = { + TAG: /* Qualified */1, + _0: [ + loc, + { + qualification: qualification, + id: id + } + ] + }; + _param = [ + loc, + qualification$1 + ]; + continue ; + }; +} + +function raw_generic_with_identifier(env, id) { + var id_0 = id[0]; + var id_1 = { + TAG: /* Unqualified */0, + _0: id + }; + var id$1 = [ + id_0, + id_1 + ]; + var match = identifier(env, id$1); + var id_loc = match[0]; + var typeParameters = Curry._1(type_parameter_instantiation, env); + var loc = typeParameters !== undefined ? btwn(id_loc, typeParameters[0]) : id_loc; + return [ + loc, + { + id: match[1], + typeParameters: typeParameters + } + ]; +} + +function union_with(env, left) { + if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_BIT_OR */80) { + var _acc = { + hd: left, + tl: /* [] */0 + }; + while(true) { + var acc = _acc; + var match = Curry._2(Parser_env_Peek.token, undefined, env); + if (/* tag */typeof match === "number" && match === /* T_BIT_OR */80) { + token$4(env, /* T_BIT_OR */80); + _acc = { + hd: intersection(env), + tl: acc + }; + continue ; + } + var match$1 = rev_nonempty_acc(acc); + return [ + match$1[0], + { + TAG: /* Union */5, + _0: match$1[1] + } + ]; + }; + } else { + return left; + } +} + var _type = union; function annotation(env) { @@ -11331,220 +11331,6 @@ function class_expression(env) { ]; } -function declare_function(env, start_loc) { - token$4(env, /* T_FUNCTION */13); - var id = Curry._2(Parse.identifier, undefined, env); - var start_sig_loc = Curry._2(Parser_env_Peek.loc, undefined, env); - var typeParameters = Curry._1(type_parameter_declaration$1, env); - var match = wrap(function_param_list, env); - token$4(env, /* T_COLON */77); - var returnType = wrap(_type, env); - var end_loc = returnType[0]; - var loc = btwn(start_sig_loc, end_loc); - var value_1 = { - TAG: /* Function */1, - _0: { - params: match[1], - returnType: returnType, - rest: match[0], - typeParameters: typeParameters - } - }; - var value = [ - loc, - value_1 - ]; - var typeAnnotation = [ - loc, - value - ]; - var init = id[1]; - var id_0 = btwn(id[0], end_loc); - var id_1 = { - name: init.name, - typeAnnotation: typeAnnotation, - optional: init.optional - }; - var id$1 = [ - id_0, - id_1 - ]; - var end_loc$1 = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); - var end_loc$2 = end_loc$1 !== undefined ? end_loc$1 : end_loc; - var predicate = Curry._1(Parse.predicate, env); - semicolon(env); - var loc$1 = btwn(start_loc, end_loc$2); - return [ - loc$1, - { - id: id$1, - predicate: predicate - } - ]; -} - -function export_specifiers_and_errs(env, _specifiers, _errs) { - while(true) { - var errs = _errs; - var specifiers = _specifiers; - var match = Curry._2(Parser_env_Peek.token, undefined, env); - if (/* tag */typeof match === "number") { - switch (match) { - case /* T_RCURLY */2 : - case /* T_EOF */105 : - return [ - List.rev(specifiers), - List.rev(errs) - ]; - default: - - } - } - var match$1 = Curry._1(Parse.identifier_or_reserved_keyword, env); - var id = match$1[0]; - var match$2; - if (Curry._2(Parser_env_Peek.value, undefined, env) === "as") { - contextual(env, "as"); - var match$3 = Curry._1(Parse.identifier_or_reserved_keyword, env); - var name = match$3[0]; - record_export(env, [ - name[0], - extract_ident_name(name) - ]); - match$2 = [ - name, - undefined, - name[0] - ]; - } else { - var loc = id[0]; - record_export(env, [ - loc, - extract_ident_name(id) - ]); - match$2 = [ - undefined, - match$1[1], - loc - ]; - } - var err = match$2[1]; - var loc$1 = btwn(id[0], match$2[2]); - var specifier_1 = { - id: id, - name: match$2[0] - }; - var specifier = [ - loc$1, - specifier_1 - ]; - if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_COMMA */8) { - token$4(env, /* T_COMMA */8); - } - var errs$1 = err !== undefined ? ({ - hd: err, - tl: errs - }) : errs; - _errs = errs$1; - _specifiers = { - hd: specifier, - tl: specifiers - }; - continue ; - }; -} - -function declare_var(env, start_loc) { - token$4(env, /* T_VAR */22); - var id = Curry._2(Parse.identifier_with_type, env, /* StrictVarName */27); - var loc = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); - var end_loc = loc !== undefined ? loc : id[0]; - var loc$1 = btwn(start_loc, end_loc); - semicolon(env); - return [ - loc$1, - { - id: id - } - ]; -} - -function export_source(env) { - contextual(env, "from"); - var match = Curry._2(Parser_env_Peek.token, undefined, env); - if (/* tag */typeof match !== "number" && match.TAG === /* T_STRING */1) { - var match$1 = match._0; - var octal = match$1[3]; - var raw = match$1[2]; - var value = match$1[1]; - var loc = match$1[0]; - if (octal) { - strict_error(env, /* StrictOctalLiteral */31); - } - token$4(env, { - TAG: /* T_STRING */1, - _0: [ - loc, - value, - raw, - octal - ] - }); - var value$1 = { - TAG: /* String */0, - _0: value - }; - return [ - loc, - { - value: value$1, - raw: raw - } - ]; - } - var raw$1 = Curry._2(Parser_env_Peek.value, undefined, env); - var value$2 = { - TAG: /* String */0, - _0: raw$1 - }; - var ret_0 = Curry._2(Parser_env_Peek.loc, undefined, env); - var ret_1 = { - value: value$2, - raw: raw$1 - }; - var ret = [ - ret_0, - ret_1 - ]; - error_unexpected(env); - return ret; -} - -function type_alias_helper(env) { - var start_loc = Curry._2(Parser_env_Peek.loc, undefined, env); - if (!env.parse_options.types) { - error(env, /* UnexpectedTypeAlias */5); - } - token$4(env, /* T_TYPE */59); - push_lex_mode(env, /* TYPE */1); - var id = Curry._2(Parse.identifier, undefined, env); - var typeParameters = Curry._1(type_parameter_declaration_with_defaults, env); - token$4(env, /* T_ASSIGN */75); - var right = wrap(_type, env); - var end_loc = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); - var end_loc$1 = end_loc !== undefined ? end_loc : right[0]; - semicolon(env); - pop_lex_mode(env); - return [ - btwn(start_loc, end_loc$1), - { - id: id, - typeParameters: typeParameters, - right: right - } - ]; -} - function declare(in_moduleOpt, env) { var in_module = in_moduleOpt !== undefined ? in_moduleOpt : false; if (!env.parse_options.types) { @@ -11691,58 +11477,224 @@ function declare(in_moduleOpt, env) { } } -function expression(env) { - var expression$1 = Curry._1(Parse.expression, env); - var loc = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); - var end_loc = loc !== undefined ? loc : expression$1[0]; +function type_alias_helper(env) { + var start_loc = Curry._2(Parser_env_Peek.loc, undefined, env); + if (!env.parse_options.types) { + error(env, /* UnexpectedTypeAlias */5); + } + token$4(env, /* T_TYPE */59); + push_lex_mode(env, /* TYPE */1); + var id = Curry._2(Parse.identifier, undefined, env); + var typeParameters = Curry._1(type_parameter_declaration_with_defaults, env); + token$4(env, /* T_ASSIGN */75); + var right = wrap(_type, env); + var end_loc = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); + var end_loc$1 = end_loc !== undefined ? end_loc : right[0]; semicolon(env); + pop_lex_mode(env); return [ - btwn(expression$1[0], end_loc), + btwn(start_loc, end_loc$1), { - TAG: /* Expression */1, - _0: { - expression: expression$1 - } + id: id, + typeParameters: typeParameters, + right: right } ]; } -function $$interface(env) { - if (!Curry._2(Parser_env_Peek.is_identifier, 1, env)) { - return expression(env); +function export_source(env) { + contextual(env, "from"); + var match = Curry._2(Parser_env_Peek.token, undefined, env); + if (/* tag */typeof match !== "number" && match.TAG === /* T_STRING */1) { + var match$1 = match._0; + var octal = match$1[3]; + var raw = match$1[2]; + var value = match$1[1]; + var loc = match$1[0]; + if (octal) { + strict_error(env, /* StrictOctalLiteral */31); + } + token$4(env, { + TAG: /* T_STRING */1, + _0: [ + loc, + value, + raw, + octal + ] + }); + var value$1 = { + TAG: /* String */0, + _0: value + }; + return [ + loc, + { + value: value$1, + raw: raw + } + ]; } - var match = Curry._1(interface_helper, env); - return [ - match[0], - { - TAG: /* InterfaceDeclaration */21, - _0: match[1] - } - ]; + var raw$1 = Curry._2(Parser_env_Peek.value, undefined, env); + var value$2 = { + TAG: /* String */0, + _0: raw$1 + }; + var ret_0 = Curry._2(Parser_env_Peek.loc, undefined, env); + var ret_1 = { + value: value$2, + raw: raw$1 + }; + var ret = [ + ret_0, + ret_1 + ]; + error_unexpected(env); + return ret; } -function declare_var_statement(env, start_loc) { - var match = declare_var(env, start_loc); +function declare_var(env, start_loc) { + token$4(env, /* T_VAR */22); + var id = Curry._2(Parse.identifier_with_type, env, /* StrictVarName */27); + var loc = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); + var end_loc = loc !== undefined ? loc : id[0]; + var loc$1 = btwn(start_loc, end_loc); + semicolon(env); return [ - match[0], + loc$1, { - TAG: /* DeclareVariable */22, - _0: match[1] + id: id } ]; } -function declare_function_statement(env, start_loc) { - var match = declare_function(env, start_loc); +function export_specifiers_and_errs(env, _specifiers, _errs) { + while(true) { + var errs = _errs; + var specifiers = _specifiers; + var match = Curry._2(Parser_env_Peek.token, undefined, env); + if (/* tag */typeof match === "number") { + switch (match) { + case /* T_RCURLY */2 : + case /* T_EOF */105 : + return [ + List.rev(specifiers), + List.rev(errs) + ]; + default: + + } + } + var match$1 = Curry._1(Parse.identifier_or_reserved_keyword, env); + var id = match$1[0]; + var match$2; + if (Curry._2(Parser_env_Peek.value, undefined, env) === "as") { + contextual(env, "as"); + var match$3 = Curry._1(Parse.identifier_or_reserved_keyword, env); + var name = match$3[0]; + record_export(env, [ + name[0], + extract_ident_name(name) + ]); + match$2 = [ + name, + undefined, + name[0] + ]; + } else { + var loc = id[0]; + record_export(env, [ + loc, + extract_ident_name(id) + ]); + match$2 = [ + undefined, + match$1[1], + loc + ]; + } + var err = match$2[1]; + var loc$1 = btwn(id[0], match$2[2]); + var specifier_1 = { + id: id, + name: match$2[0] + }; + var specifier = [ + loc$1, + specifier_1 + ]; + if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_COMMA */8) { + token$4(env, /* T_COMMA */8); + } + var errs$1 = err !== undefined ? ({ + hd: err, + tl: errs + }) : errs; + _errs = errs$1; + _specifiers = { + hd: specifier, + tl: specifiers + }; + continue ; + }; +} + +function declare_function(env, start_loc) { + token$4(env, /* T_FUNCTION */13); + var id = Curry._2(Parse.identifier, undefined, env); + var start_sig_loc = Curry._2(Parser_env_Peek.loc, undefined, env); + var typeParameters = Curry._1(type_parameter_declaration$1, env); + var match = wrap(function_param_list, env); + token$4(env, /* T_COLON */77); + var returnType = wrap(_type, env); + var end_loc = returnType[0]; + var loc = btwn(start_sig_loc, end_loc); + var value_1 = { + TAG: /* Function */1, + _0: { + params: match[1], + returnType: returnType, + rest: match[0], + typeParameters: typeParameters + } + }; + var value = [ + loc, + value_1 + ]; + var typeAnnotation = [ + loc, + value + ]; + var init = id[1]; + var id_0 = btwn(id[0], end_loc); + var id_1 = { + name: init.name, + typeAnnotation: typeAnnotation, + optional: init.optional + }; + var id$1 = [ + id_0, + id_1 + ]; + var end_loc$1 = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); + var end_loc$2 = end_loc$1 !== undefined ? end_loc$1 : end_loc; + var predicate = Curry._1(Parse.predicate, env); + semicolon(env); + var loc$1 = btwn(start_loc, end_loc$2); return [ - match[0], + loc$1, { - TAG: /* DeclareFunction */23, - _0: match[1] + id: id$1, + predicate: predicate } ]; } +function extract_ident_name(param) { + return param[1].name; +} + function type_alias(env) { if (!Curry._2(Parser_env_Peek.is_identifier, 1, env)) { return Curry._1(Parse.statement, env); @@ -11757,6 +11709,31 @@ function type_alias(env) { ]; } +function $$interface(env) { + if (!Curry._2(Parser_env_Peek.is_identifier, 1, env)) { + return expression(env); + } + var match = Curry._1(interface_helper, env); + return [ + match[0], + { + TAG: /* InterfaceDeclaration */21, + _0: match[1] + } + ]; +} + +function declare_var_statement(env, start_loc) { + var match = declare_var(env, start_loc); + return [ + match[0], + { + TAG: /* DeclareVariable */22, + _0: match[1] + } + ]; +} + function declare_export_declaration(allow_export_typeOpt, env) { var allow_export_type = allow_export_typeOpt !== undefined ? allow_export_typeOpt : false; if (!env.parse_options.types) { @@ -12054,8 +12031,31 @@ function declare_export_declaration(allow_export_typeOpt, env) { } } -function extract_ident_name(param) { - return param[1].name; +function declare_function_statement(env, start_loc) { + var match = declare_function(env, start_loc); + return [ + match[0], + { + TAG: /* DeclareFunction */23, + _0: match[1] + } + ]; +} + +function expression(env) { + var expression$1 = Curry._1(Parse.expression, env); + var loc = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); + var end_loc = loc !== undefined ? loc : expression$1[0]; + semicolon(env); + return [ + btwn(expression$1[0], end_loc), + { + TAG: /* Expression */1, + _0: { + expression: expression$1 + } + } + ]; } function supers(env, _acc) { @@ -13497,37 +13497,122 @@ function element_without_lt(env, start_loc) { ]; } -function statement(env) { - while(true) { - var match = Curry._2(Parser_env_Peek.token, undefined, env); - var exit = 0; - if (/* tag */typeof match === "number") { - switch (match) { - case /* T_LCURLY */1 : - var match$1 = Curry._1(Parse.block_body, env); +function statement_list_item(decoratorsOpt, env) { + var decorators = decoratorsOpt !== undefined ? decoratorsOpt : /* [] */0; + if (!Curry._2(Parser_env_Peek.is_class, undefined, env)) { + error_on_decorators(env)(decorators); + } + var match = Curry._2(Parser_env_Peek.token, undefined, env); + if (/* tag */typeof match === "number") { + switch (match) { + case /* T_CONST */25 : + return var_or_const(env); + case /* T_LET */26 : + var start_loc = Curry._2(Parser_env_Peek.loc, undefined, env); + token$4(env, /* T_LET */26); + if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_LPAREN */3) { + token$4(env, /* T_LPAREN */3); + var match$1 = helper(with_no_let(true, env), /* [] */0, /* [] */0); + var head = List.map((function (param) { + var match = param[1]; + return { + id: match.id, + init: match.init + }; + }), match$1[1]); + token$4(env, /* T_RPAREN */4); + var body = Curry._1(Parse.statement, env); + var end_loc = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); + var end_loc$1 = end_loc !== undefined ? end_loc : match$1[0]; + semicolon(env); + List.iter((function (param) { + return error_at(env, param); + }), match$1[2]); return [ - match$1[0], + btwn(start_loc, end_loc$1), { - TAG: /* Block */0, - _0: match$1[1] + TAG: /* Let */17, + _0: { + head: head, + body: body + } } ]; - case /* T_SEMICOLON */7 : - var loc = Curry._2(Parser_env_Peek.loc, undefined, env); - token$4(env, /* T_SEMICOLON */7); - return [ - loc, - /* Empty */0 - ]; - case /* T_IF */14 : - return _if(env); - case /* T_RETURN */17 : - if (!env.in_function) { - error(env, /* IllegalReturn */23); - } - var start_loc = Curry._2(Parser_env_Peek.loc, undefined, env); - token$4(env, /* T_RETURN */17); - var argument = Curry._2(Parser_env_Peek.token, undefined, env) === /* T_SEMICOLON */7 || Curry._1(Parser_env_Peek.is_implicit_semicolon, env) ? undefined : Curry._1(Parse.expression, env); + } + var match$2 = helper(with_no_let(true, env), /* [] */0, /* [] */0); + var declaration = { + TAG: /* VariableDeclaration */19, + _0: { + declarations: match$2[1], + kind: /* Let */1 + } + }; + var end_loc$2 = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); + var end_loc$3 = end_loc$2 !== undefined ? end_loc$2 : match$2[0]; + semicolon(env); + List.iter((function (param) { + return error_at(env, param); + }), match$2[2]); + return [ + btwn(start_loc, end_loc$3), + declaration + ]; + default: + + } + } + if (Curry._2(Parser_env_Peek.is_function, undefined, env)) { + return _function(env); + } + if (Curry._2(Parser_env_Peek.is_class, undefined, env)) { + return class_declaration$1(env, decorators); + } + if (/* tag */typeof match !== "number") { + return statement(env); + } + switch (match) { + case /* T_INTERFACE */51 : + return $$interface(env); + case /* T_DECLARE */58 : + return declare(undefined, env); + case /* T_TYPE */59 : + return type_alias(env); + default: + return statement(env); + } +} + +function statement(env) { + while(true) { + var match = Curry._2(Parser_env_Peek.token, undefined, env); + var exit = 0; + if (/* tag */typeof match === "number") { + switch (match) { + case /* T_LCURLY */1 : + var match$1 = Curry._1(Parse.block_body, env); + return [ + match$1[0], + { + TAG: /* Block */0, + _0: match$1[1] + } + ]; + case /* T_SEMICOLON */7 : + var loc = Curry._2(Parser_env_Peek.loc, undefined, env); + token$4(env, /* T_SEMICOLON */7); + return [ + loc, + /* Empty */0 + ]; + case /* T_IF */14 : + return _if(env); + case /* T_RETURN */17 : + if (!env.in_function) { + error(env, /* IllegalReturn */23); + } + var start_loc = Curry._2(Parser_env_Peek.loc, undefined, env); + token$4(env, /* T_RETURN */17); + var argument = Curry._2(Parser_env_Peek.token, undefined, env) === /* T_SEMICOLON */7 || Curry._1(Parser_env_Peek.is_implicit_semicolon, env) ? undefined : Curry._1(Parse.expression, env); var loc$1 = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); var end_loc = loc$1 !== undefined ? loc$1 : ( argument !== undefined ? argument[0] : start_loc @@ -14600,94 +14685,26 @@ function module_item(env) { } } -function statement_list_item(decoratorsOpt, env) { - var decorators = decoratorsOpt !== undefined ? decoratorsOpt : /* [] */0; - if (!Curry._2(Parser_env_Peek.is_class, undefined, env)) { - error_on_decorators(env)(decorators); - } - var match = Curry._2(Parser_env_Peek.token, undefined, env); - if (/* tag */typeof match === "number") { - switch (match) { - case /* T_CONST */25 : - return var_or_const(env); - case /* T_LET */26 : - var start_loc = Curry._2(Parser_env_Peek.loc, undefined, env); - token$4(env, /* T_LET */26); - if (Curry._2(Parser_env_Peek.token, undefined, env) === /* T_LPAREN */3) { - token$4(env, /* T_LPAREN */3); - var match$1 = helper(with_no_let(true, env), /* [] */0, /* [] */0); - var head = List.map((function (param) { - var match = param[1]; - return { - id: match.id, - init: match.init - }; - }), match$1[1]); - token$4(env, /* T_RPAREN */4); - var body = Curry._1(Parse.statement, env); - var end_loc = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); - var end_loc$1 = end_loc !== undefined ? end_loc : match$1[0]; - semicolon(env); - List.iter((function (param) { - return error_at(env, param); - }), match$1[2]); - return [ - btwn(start_loc, end_loc$1), - { - TAG: /* Let */17, - _0: { - head: head, - body: body - } - } - ]; - } - var match$2 = helper(with_no_let(true, env), /* [] */0, /* [] */0); - var declaration = { - TAG: /* VariableDeclaration */19, - _0: { - declarations: match$2[1], - kind: /* Let */1 - } - }; - var end_loc$2 = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env); - var end_loc$3 = end_loc$2 !== undefined ? end_loc$2 : match$2[0]; - semicolon(env); - List.iter((function (param) { - return error_at(env, param); - }), match$2[2]); - return [ - btwn(start_loc, end_loc$3), - declaration - ]; - default: - +function statement_list(term_fn, env) { + var _acc = /* [] */0; + while(true) { + var acc = _acc; + var t = Curry._2(Parser_env_Peek.token, undefined, env); + if (/* tag */typeof t === "number" && t === /* T_EOF */105) { + return List.rev(acc); } - } - if (Curry._2(Parser_env_Peek.is_function, undefined, env)) { - return _function(env); - } - if (Curry._2(Parser_env_Peek.is_class, undefined, env)) { - return class_declaration$1(env, decorators); - } - if (/* tag */typeof match !== "number") { - return statement(env); - } - switch (match) { - case /* T_INTERFACE */51 : - return $$interface(env); - case /* T_DECLARE */58 : - return declare(undefined, env); - case /* T_TYPE */59 : - return type_alias(env); - default: - return statement(env); - } + if (Curry._1(term_fn, t)) { + return List.rev(acc); + } + _acc = { + hd: statement_list_item(undefined, env), + tl: acc + }; + continue ; + }; } -var class_declaration$1 = class_declaration; - -function statement_list(_env, term_fn, item_fn, _param) { +function statement_list$1(_env, term_fn, item_fn, _param) { while(true) { var param = _param; var env = _env; @@ -14782,7 +14799,7 @@ function statement_list(_env, term_fn, item_fn, _param) { } function directives(env, term_fn, item_fn) { - var match = statement_list(env, term_fn, item_fn, [ + var match = statement_list$1(env, term_fn, item_fn, [ /* [] */0, /* [] */0 ]); @@ -14812,6 +14829,8 @@ function directives(env, term_fn, item_fn) { ]; } +var class_declaration$1 = class_declaration; + function module_body(term_fn, env) { var _acc = /* [] */0; while(true) { @@ -14831,54 +14850,6 @@ function module_body(term_fn, env) { }; } -function statement_list$1(term_fn, env) { - var _acc = /* [] */0; - while(true) { - var acc = _acc; - var t = Curry._2(Parser_env_Peek.token, undefined, env); - if (/* tag */typeof t === "number" && t === /* T_EOF */105) { - return List.rev(acc); - } - if (Curry._1(term_fn, t)) { - return List.rev(acc); - } - _acc = { - hd: statement_list_item(undefined, env), - tl: acc - }; - continue ; - }; -} - -function statement_list_with_directives(term_fn, env) { - var match = Curry._3(directives, env, term_fn, (function (eta) { - return statement_list_item(undefined, eta); - })); - var env$1 = match[0]; - var stmts = Curry._2(statement_list$1, term_fn, env$1); - var stmts$1 = List.fold_left((function (acc, stmt) { - return { - hd: stmt, - tl: acc - }; - }), stmts, match[1]); - return [ - stmts$1, - env$1.in_strict_mode - ]; -} - -function module_body_with_directives(env, term_fn) { - var match = Curry._3(directives, env, term_fn, module_item); - var stmts = Curry._2(module_body, term_fn, match[0]); - return List.fold_left((function (acc, stmt) { - return { - hd: stmt, - tl: acc - }; - }), stmts, match[1]); -} - function identifier$2(restricted_error, env) { var loc = Curry._2(Parser_env_Peek.loc, undefined, env); var name = Curry._2(Parser_env_Peek.value, undefined, env); @@ -14933,6 +14904,35 @@ function identifier$2(restricted_error, env) { ]; } +function module_body_with_directives(env, term_fn) { + var match = Curry._3(directives, env, term_fn, module_item); + var stmts = Curry._2(module_body, term_fn, match[0]); + return List.fold_left((function (acc, stmt) { + return { + hd: stmt, + tl: acc + }; + }), stmts, match[1]); +} + +function statement_list_with_directives(term_fn, env) { + var match = Curry._3(directives, env, term_fn, (function (eta) { + return statement_list_item(undefined, eta); + })); + var env$1 = match[0]; + var stmts = Curry._2(statement_list, term_fn, env$1); + var stmts$1 = List.fold_left((function (acc, stmt) { + return { + hd: stmt, + tl: acc + }; + }), stmts, match[1]); + return [ + stmts$1, + env$1.in_strict_mode + ]; +} + function program(env) { var stmts = module_body_with_directives(env, (function (param) { return false; @@ -15013,7 +15013,7 @@ function block_body(env) { var term_fn = function (t) { return t === /* T_RCURLY */2; }; - var body = Curry._2(statement_list$1, term_fn, env); + var body = Curry._2(statement_list, term_fn, env); var end_loc = Curry._2(Parser_env_Peek.loc, undefined, env); token$4(env, /* T_RCURLY */2); return [ @@ -15166,7 +15166,7 @@ Caml_module.update_mod({ program: program, statement: statement, statement_list_item: statement_list_item, - statement_list: statement_list$1, + statement_list: statement_list, statement_list_with_directives: statement_list_with_directives, module_body: module_body, expression: expression$1, @@ -15481,84 +15481,6 @@ function parse(content, options) { } } }; - var jsx_member_expression = function (param) { - var member_expression = param[1]; - var id = member_expression._object; - var _object; - _object = id.TAG === /* Identifier */0 ? jsx_identifier(id._0) : jsx_member_expression(id._0); - return node("JSXMemberExpression", param[0], [ - [ - "object", - _object - ], - [ - "property", - jsx_identifier(member_expression.property) - ] - ]); - }; - var jsx_namespaced_name = function (param) { - var namespaced_name = param[1]; - return node("JSXNamespacedName", param[0], [ - [ - "namespace", - jsx_identifier(namespaced_name.namespace) - ], - [ - "name", - jsx_identifier(namespaced_name.name) - ] - ]); - }; - var jsx_identifier = function (param) { - return node("JSXIdentifier", param[0], [[ - "name", - string(param[1].name) - ]]); - }; - var jsx_element = function (param) { - var element = param[1]; - return node("JSXElement", param[0], [ - [ - "openingElement", - jsx_opening(element.openingElement) - ], - [ - "closingElement", - option(jsx_closing, element.closingElement) - ], - [ - "children", - array_of_list(jsx_child, element.children) - ] - ]); - }; - var jsx_expression_container = function (param) { - var expr = param[1].expression; - var expression$1; - expression$1 = expr.TAG === /* Expression */0 ? expression(expr._0) : node("JSXEmptyExpression", expr._0, []); - return node("JSXExpressionContainer", param[0], [[ - "expression", - expression$1 - ]]); - }; - var identifier = function (param) { - var id = param[1]; - return node("Identifier", param[0], [ - [ - "name", - string(id.name) - ], - [ - "typeAnnotation", - option(type_annotation, id.typeAnnotation) - ], - [ - "optional", - bool(id.optional) - ] - ]); - }; var expression = function (param) { var arr = param[1]; var loc = param[0]; @@ -16066,699 +15988,140 @@ function parse(content, options) { } }; - var object_type_call_property = function (param) { - var callProperty = param[1]; - return node("ObjectTypeCallProperty", param[0], [ - [ - "value", - function_type(callProperty.value) - ], - [ - "static", - bool(callProperty.static) - ] - ]); - }; - var object_type_property = function (param) { - var prop = param[1]; - var lit = prop.key; - var key; - switch (lit.TAG | 0) { - case /* Literal */0 : - key = literal(lit._0); - break; - case /* Identifier */1 : - key = identifier(lit._0); - break; - case /* Computed */2 : - throw { - RE_EXN_ID: "Failure", - _1: "There should not be computed object type property keys", - Error: new Error() - }; - - } - return node("ObjectTypeProperty", param[0], [ + var identifier = function (param) { + var id = param[1]; + return node("Identifier", param[0], [ [ - "key", - key + "name", + string(id.name) ], [ - "value", - _type(prop.value) + "typeAnnotation", + option(type_annotation, id.typeAnnotation) ], [ "optional", - bool(prop.optional) - ], - [ - "static", - bool(prop.static) - ] - ]); - }; - var object_type_indexer = function (param) { - var indexer = param[1]; - return node("ObjectTypeIndexer", param[0], [ - [ - "id", - identifier(indexer.id) - ], - [ - "key", - _type(indexer.key) - ], - [ - "value", - _type(indexer.value) - ], - [ - "static", - bool(indexer.static) - ] - ]); - }; - var $$case = function (param) { - var c = param[1]; - return node("SwitchCase", param[0], [ - [ - "test", - option(expression, c.test) - ], - [ - "consequent", - array_of_list(statement, c.consequent) - ] - ]); - }; - var variable_declaration = function (param) { - var $$var = param[1]; - var match = $$var.kind; - var kind; - switch (match) { - case /* Var */0 : - kind = "var"; - break; - case /* Let */1 : - kind = "let"; - break; - case /* Const */2 : - kind = "const"; - break; - - } - return node("VariableDeclaration", param[0], [ - [ - "declarations", - array_of_list(variable_declarator, $$var.declarations) - ], - [ - "kind", - string(kind) + bool(id.optional) ] ]); }; - var interface_declaration = function (param) { - var i = param[1]; - return node("InterfaceDeclaration", param[0], [ - [ - "id", - identifier(i.id) - ], - [ - "typeParameters", - option(type_parameter_declaration, i.typeParameters) - ], - [ - "body", - object_type(i.body) - ], - [ - "extends", - array_of_list(interface_extends, i.extends) - ] - ]); + var type_annotation = function (param) { + return node("TypeAnnotation", param[0], [[ + "typeAnnotation", + _type(param[1]) + ]]); }; - var statement = function (param) { - var b = param[1]; + var literal = function (param) { + var lit = param[1]; + var raw = lit.raw; + var value = lit.value; var loc = param[0]; - if (/* tag */typeof b === "number") { - if (b === /* Empty */0) { - return node("EmptyStatement", loc, []); - } else { - return node("DebuggerStatement", loc, []); + var value_; + if (/* tag */typeof value === "number") { + value_ = $$null; + } else { + switch (value.TAG | 0) { + case /* String */0 : + value_ = string(value._0); + break; + case /* Boolean */1 : + value_ = bool(value._0); + break; + case /* Number */2 : + value_ = number$1(value._0); + break; + case /* RegExp */3 : + var match = value._0; + value_ = regexp$1(loc, match.pattern, match.flags); + break; + } } - switch (b.TAG | 0) { - case /* Block */0 : - return block([ - loc, - b._0 - ]); - case /* Expression */1 : - return node("ExpressionStatement", loc, [[ - "expression", - expression(b._0.expression) - ]]); - case /* If */2 : - var _if = b._0; - return node("IfStatement", loc, [ - [ - "test", - expression(_if.test) - ], - [ - "consequent", - statement(_if.consequent) - ], - [ - "alternate", - option(statement, _if.alternate) - ] - ]); - case /* Labeled */3 : - var labeled = b._0; - return node("LabeledStatement", loc, [ - [ - "label", - identifier(labeled.label) - ], - [ - "body", - statement(labeled.body) - ] - ]); - case /* Break */4 : - return node("BreakStatement", loc, [[ - "label", - option(identifier, b._0.label) - ]]); - case /* Continue */5 : - return node("ContinueStatement", loc, [[ - "label", - option(identifier, b._0.label) - ]]); - case /* With */6 : - var _with = b._0; - return node("WithStatement", loc, [ - [ - "object", - expression(_with._object) - ], - [ - "body", - statement(_with.body) - ] - ]); - case /* TypeAlias */7 : - return type_alias([ - loc, - b._0 - ]); - case /* Switch */8 : - var $$switch = b._0; - return node("SwitchStatement", loc, [ - [ - "discriminant", - expression($$switch.discriminant) - ], - [ - "cases", - array_of_list($$case, $$switch.cases) - ], - [ - "lexical", - bool($$switch.lexical) - ] - ]); - case /* Return */9 : - return node("ReturnStatement", loc, [[ - "argument", - option(expression, b._0.argument) - ]]); - case /* Throw */10 : - return node("ThrowStatement", loc, [[ - "argument", - expression(b._0.argument) - ]]); - case /* Try */11 : - var _try = b._0; - return node("TryStatement", loc, [ - [ - "block", - block(_try.block) - ], - [ - "handler", - option($$catch, _try.handler) - ], - [ - "guardedHandlers", - array_of_list($$catch, _try.guardedHandlers) - ], - [ - "finalizer", - option(block, _try.finalizer) - ] - ]); - case /* While */12 : - var _while = b._0; - return node("WhileStatement", loc, [ - [ - "test", - expression(_while.test) - ], - [ - "body", - statement(_while.body) - ] - ]); - case /* DoWhile */13 : - var dowhile = b._0; - return node("DoWhileStatement", loc, [ - [ - "body", - statement(dowhile.body) - ], - [ - "test", - expression(dowhile.test) - ] - ]); - case /* For */14 : - var _for = b._0; - var init = function (init$1) { - if (init$1.TAG === /* InitDeclaration */0) { - return variable_declaration(init$1._0); - } else { - return expression(init$1._0); - } - }; - return node("ForStatement", loc, [ - [ - "init", - option(init, _for.init) - ], - [ - "test", - option(expression, _for.test) - ], + var props; + var exit = 0; + if (/* tag */typeof value === "number" || value.TAG !== /* RegExp */3) { + exit = 1; + } else { + var match$1 = value._0; + var regex = obj([ + [ + "pattern", + string(match$1.pattern) + ], + [ + "flags", + string(match$1.flags) + ] + ]); + props = [ + [ + "value", + value_ + ], + [ + "raw", + string(raw) + ], + [ + "regex", + regex + ] + ]; + } + if (exit === 1) { + props = [ + [ + "value", + value_ + ], + [ + "raw", + string(raw) + ] + ]; + } + return node("Literal", loc, props); + }; + var pattern = function (param) { + var obj = param[1]; + var loc = param[0]; + switch (obj.TAG | 0) { + case /* Object */0 : + var obj$1 = obj._0; + return node("ObjectPattern", loc, [ [ - "update", - option(expression, _for.update) + "properties", + array_of_list(object_pattern_property, obj$1.properties) ], [ - "body", - statement(_for.body) + "typeAnnotation", + option(type_annotation, obj$1.typeAnnotation) ] ]); - case /* ForIn */15 : - var forin = b._0; - var left = forin.left; - var left$1; - left$1 = left.TAG === /* LeftDeclaration */0 ? variable_declaration(left._0) : expression(left._0); - return node("ForInStatement", loc, [ - [ - "left", - left$1 - ], - [ - "right", - expression(forin.right) - ], + case /* Array */1 : + var arr = obj._0; + return node("ArrayPattern", loc, [ [ - "body", - statement(forin.body) + "elements", + array_of_list((function (param) { + return option(array_pattern_element, param); + }), arr.elements) ], [ - "each", - bool(forin.each) + "typeAnnotation", + option(type_annotation, arr.typeAnnotation) ] ]); - case /* ForOf */16 : - var forof = b._0; - var left$2 = forof.left; - var left$3; - left$3 = left$2.TAG === /* LeftDeclaration */0 ? variable_declaration(left$2._0) : expression(left$2._0); - return node("ForOfStatement", loc, [ + case /* Assignment */2 : + var match = obj._0; + return node("AssignmentPattern", loc, [ [ "left", - left$3 + pattern(match.left) ], [ "right", - expression(forof.right) - ], - [ - "body", - statement(forof.body) - ] - ]); - case /* Let */17 : - var _let = b._0; - return node("LetStatement", loc, [ - [ - "head", - array_of_list(let_assignment, _let.head) - ], - [ - "body", - statement(_let.body) - ] - ]); - case /* FunctionDeclaration */18 : - var fn = b._0; - var id = fn.id; - var match = id !== undefined ? [ - "FunctionDeclaration", - identifier(id) - ] : [ - "FunctionExpression", - $$null - ]; - var b$1 = fn.body; - var body; - body = b$1.TAG === /* BodyBlock */0 ? block(b$1._0) : expression(b$1._0); - return node(match[0], loc, [ - [ - "id", - match[1] - ], - [ - "params", - array_of_list(pattern, fn.params) - ], - [ - "defaults", - array_of_list((function (param) { - return option(expression, param); - }), fn.defaults) - ], - [ - "rest", - option(identifier, fn.rest) - ], - [ - "body", - body - ], - [ - "async", - bool(fn.async) - ], - [ - "generator", - bool(fn.generator) - ], - [ - "expression", - bool(fn.expression) - ], - [ - "returnType", - option(type_annotation, fn.returnType) - ], - [ - "typeParameters", - option(type_parameter_declaration, fn.typeParameters) - ] - ]); - case /* VariableDeclaration */19 : - return variable_declaration([ - loc, - b._0 - ]); - case /* ClassDeclaration */20 : - var param$1 = [ - loc, - b._0 - ]; - var c = param$1[1]; - var id$1 = c.id; - var match$1 = id$1 !== undefined ? [ - "ClassDeclaration", - identifier(id$1) - ] : [ - "ClassExpression", - $$null - ]; - return node(match$1[0], param$1[0], [ - [ - "id", - match$1[1] - ], - [ - "body", - class_body(c.body) - ], - [ - "superClass", - option(expression, c.superClass) - ], - [ - "typeParameters", - option(type_parameter_declaration, c.typeParameters) - ], - [ - "superTypeParameters", - option(type_parameter_instantiation, c.superTypeParameters) - ], - [ - "implements", - array_of_list(class_implements, c.implements) - ], - [ - "decorators", - array_of_list(expression, c.classDecorators) - ] - ]); - case /* InterfaceDeclaration */21 : - return interface_declaration([ - loc, - b._0 - ]); - case /* DeclareVariable */22 : - return declare_variable([ - loc, - b._0 - ]); - case /* DeclareFunction */23 : - return declare_function([ - loc, - b._0 - ]); - case /* DeclareClass */24 : - return declare_class([ - loc, - b._0 - ]); - case /* DeclareModule */25 : - var m = b._0; - var lit = m.id; - var id$2; - id$2 = lit.TAG === /* Identifier */0 ? identifier(lit._0) : literal(lit._0); - var match$2 = m.kind; - var tmp; - tmp = match$2.TAG === /* CommonJS */0 ? string("CommonJS") : string("ES"); - return node("DeclareModule", loc, [ - [ - "id", - id$2 - ], - [ - "body", - block(m.body) - ], - [ - "kind", - tmp - ] - ]); - case /* DeclareModuleExports */26 : - return node("DeclareModuleExports", loc, [[ - "typeAnnotation", - type_annotation(b._0) - ]]); - case /* DeclareExportDeclaration */27 : - var $$export = b._0; - var match$3 = $$export.declaration; - var declaration; - if (match$3 !== undefined) { - switch (match$3.TAG | 0) { - case /* Variable */0 : - declaration = declare_variable(match$3._0); - break; - case /* Function */1 : - declaration = declare_function(match$3._0); - break; - case /* Class */2 : - declaration = declare_class(match$3._0); - break; - case /* DefaultType */3 : - declaration = _type(match$3._0); - break; - case /* NamedType */4 : - declaration = type_alias(match$3._0); - break; - case /* Interface */5 : - declaration = interface_declaration(match$3._0); - break; - - } - } else { - declaration = $$null; - } - return node("DeclareExportDeclaration", loc, [ - [ - "default", - bool($$export.default) - ], - [ - "declaration", - declaration - ], - [ - "specifiers", - export_specifiers($$export.specifiers) - ], - [ - "source", - option(literal, $$export.source) - ] - ]); - case /* ExportDeclaration */28 : - var $$export$1 = b._0; - var match$4 = $$export$1.declaration; - var declaration$1 = match$4 !== undefined ? ( - match$4.TAG === /* Declaration */0 ? statement(match$4._0) : expression(match$4._0) - ) : $$null; - return node("ExportDeclaration", loc, [ - [ - "default", - bool($$export$1.default) - ], - [ - "declaration", - declaration$1 - ], - [ - "specifiers", - export_specifiers($$export$1.specifiers) - ], - [ - "source", - option(literal, $$export$1.source) - ], - [ - "exportKind", - string($$export$1.exportKind ? "value" : "type") - ] - ]); - case /* ImportDeclaration */29 : - var $$import = b._0; - var specifiers = List.map((function (id) { - switch (id.TAG | 0) { - case /* ImportNamedSpecifier */0 : - var match = id._0; - var local_id = match.local; - var remote_id = match.remote; - var span_loc = local_id !== undefined ? btwn(remote_id[0], local_id[0]) : remote_id[0]; - return node("ImportSpecifier", span_loc, [ - [ - "id", - identifier(remote_id) - ], - [ - "name", - option(identifier, local_id) - ] - ]); - case /* ImportDefaultSpecifier */1 : - var id$1 = id._0; - return node("ImportDefaultSpecifier", id$1[0], [[ - "id", - identifier(id$1) - ]]); - case /* ImportNamespaceSpecifier */2 : - var param = id._0; - return node("ImportNamespaceSpecifier", param[0], [[ - "id", - identifier(param[1]) - ]]); - - } - }), $$import.specifiers); - var match$5 = $$import.importKind; - var import_kind; - switch (match$5) { - case /* ImportType */0 : - import_kind = "type"; - break; - case /* ImportTypeof */1 : - import_kind = "typeof"; - break; - case /* ImportValue */2 : - import_kind = "value"; - break; - - } - return node("ImportDeclaration", loc, [ - [ - "specifiers", - array($$Array.of_list(specifiers)) - ], - [ - "source", - literal($$import.source) - ], - [ - "importKind", - string(import_kind) - ] - ]); - - } - }; - var pattern = function (param) { - var obj = param[1]; - var loc = param[0]; - switch (obj.TAG | 0) { - case /* Object */0 : - var obj$1 = obj._0; - return node("ObjectPattern", loc, [ - [ - "properties", - array_of_list(object_pattern_property, obj$1.properties) - ], - [ - "typeAnnotation", - option(type_annotation, obj$1.typeAnnotation) - ] - ]); - case /* Array */1 : - var arr = obj._0; - return node("ArrayPattern", loc, [ - [ - "elements", - array_of_list((function (param) { - return option(array_pattern_element, param); - }), arr.elements) - ], - [ - "typeAnnotation", - option(type_annotation, arr.typeAnnotation) - ] - ]); - case /* Assignment */2 : - var match = obj._0; - return node("AssignmentPattern", loc, [ - [ - "left", - pattern(match.left) - ], - [ - "right", - expression(match.right) + expression(match.right) ] ]); case /* Identifier */3 : @@ -16768,173 +16131,264 @@ function parse(content, options) { } }; - var declare_function = function (param) { - return node("DeclareFunction", param[0], [[ - "id", - identifier(param[1].id) + var object_pattern_property = function (param) { + if (param.TAG === /* Property */0) { + var match = param._0; + var prop = match[1]; + var lit = prop.key; + var match$1; + switch (lit.TAG | 0) { + case /* Literal */0 : + match$1 = [ + literal(lit._0), + false + ]; + break; + case /* Identifier */1 : + match$1 = [ + identifier(lit._0), + false + ]; + break; + case /* Computed */2 : + match$1 = [ + expression(lit._0), + true + ]; + break; + + } + return node("PropertyPattern", match[0], [ + [ + "key", + match$1[0] + ], + [ + "pattern", + pattern(prop.pattern) + ], + [ + "computed", + bool(match$1[1]) + ], + [ + "shorthand", + bool(prop.shorthand) + ] + ]); + } + var match$2 = param._0; + return node("SpreadPropertyPattern", match$2[0], [[ + "argument", + pattern(match$2[1].argument) ]]); }; - var export_specifiers = function (param) { - if (param !== undefined) { - if (param.TAG === /* ExportSpecifiers */0) { - return array_of_list(export_specifier, param._0); - } else { - return array([node("ExportBatchSpecifier", param._0, [[ - "name", - option(identifier, param._1) - ]])]); + var array_pattern_element = function (p) { + if (p.TAG === /* Element */0) { + return pattern(p._0); + } + var match = p._0; + return node("SpreadElementPattern", match[0], [[ + "argument", + pattern(match[1].argument) + ]]); + }; + var object_property = function (param) { + if (param.TAG === /* Property */0) { + var match = param._0; + var prop = match[1]; + var lit = prop.key; + var match$1; + switch (lit.TAG | 0) { + case /* Literal */0 : + match$1 = [ + literal(lit._0), + false + ]; + break; + case /* Identifier */1 : + match$1 = [ + identifier(lit._0), + false + ]; + break; + case /* Computed */2 : + match$1 = [ + expression(lit._0), + true + ]; + break; + } - } else { - return array([]); + var match$2 = prop.kind; + var kind; + switch (match$2) { + case /* Init */0 : + kind = "init"; + break; + case /* Get */1 : + kind = "get"; + break; + case /* Set */2 : + kind = "set"; + break; + + } + return node("Property", match[0], [ + [ + "key", + match$1[0] + ], + [ + "value", + expression(prop.value) + ], + [ + "kind", + string(kind) + ], + [ + "method", + bool(prop._method) + ], + [ + "shorthand", + bool(prop.shorthand) + ], + [ + "computed", + bool(match$1[1]) + ] + ]); } + var match$3 = param._0; + return node("SpreadProperty", match$3[0], [[ + "argument", + expression(match$3[1].argument) + ]]); }; - var type_alias = function (param) { - var alias = param[1]; - return node("TypeAlias", param[0], [ + var let_assignment = function (assignment) { + return obj([ + [ + "id", + pattern(assignment.id) + ], + [ + "init", + option(expression, assignment.init) + ] + ]); + }; + var expression_or_spread = function (expr) { + if (expr.TAG === /* Expression */0) { + return expression(expr._0); + } + var match = expr._0; + return node("SpreadElement", match[0], [[ + "argument", + expression(match[1].argument) + ]]); + }; + var template_literal = function (param) { + var value = param[1]; + return node("TemplateLiteral", param[0], [ + [ + "quasis", + array_of_list(template_element, value.quasis) + ], + [ + "expressions", + array_of_list(expression, value.expressions) + ] + ]); + }; + var block = function (param) { + return node("BlockStatement", param[0], [[ + "body", + array_of_list(statement, param[1].body) + ]]); + }; + var function_expression = function (param) { + var _function = param[1]; + var b = _function.body; + var body; + body = b.TAG === /* BodyBlock */0 ? block(b._0) : expression(b._0); + return node("FunctionExpression", param[0], [ + [ + "id", + option(identifier, _function.id) + ], + [ + "params", + array_of_list(pattern, _function.params) + ], + [ + "defaults", + array_of_list((function (param) { + return option(expression, param); + }), _function.defaults) + ], + [ + "rest", + option(identifier, _function.rest) + ], + [ + "body", + body + ], [ - "id", - identifier(alias.id) + "async", + bool(_function.async) ], [ - "typeParameters", - option(type_parameter_declaration, alias.typeParameters) + "generator", + bool(_function.generator) ], [ - "right", - _type(alias.right) - ] - ]); - }; - var let_assignment = function (assignment) { - return obj([ + "expression", + bool(_function.expression) + ], [ - "id", - pattern(assignment.id) + "returnType", + option(type_annotation, _function.returnType) ], [ - "init", - option(expression, assignment.init) + "typeParameters", + option(type_parameter_declaration, _function.typeParameters) ] ]); }; - var block = function (param) { - return node("BlockStatement", param[0], [[ - "body", - array_of_list(statement, param[1].body) - ]]); - }; - var $$catch = function (param) { - var c = param[1]; - return node("CatchClause", param[0], [ + var jsx_element = function (param) { + var element = param[1]; + return node("JSXElement", param[0], [ [ - "param", - pattern(c.param) + "openingElement", + jsx_opening(element.openingElement) ], [ - "guard", - option(expression, c.guard) + "closingElement", + option(jsx_closing, element.closingElement) ], [ - "body", - block(c.body) + "children", + array_of_list(jsx_child, element.children) ] ]); }; - var literal = function (param) { - var lit = param[1]; - var raw = lit.raw; - var value = lit.value; - var loc = param[0]; - var value_; - if (/* tag */typeof value === "number") { - value_ = $$null; - } else { - switch (value.TAG | 0) { - case /* String */0 : - value_ = string(value._0); - break; - case /* Boolean */1 : - value_ = bool(value._0); - break; - case /* Number */2 : - value_ = number$1(value._0); - break; - case /* RegExp */3 : - var match = value._0; - value_ = regexp$1(loc, match.pattern, match.flags); - break; - - } - } - var props; - var exit = 0; - if (/* tag */typeof value === "number" || value.TAG !== /* RegExp */3) { - exit = 1; - } else { - var match$1 = value._0; - var regex = obj([ - [ - "pattern", - string(match$1.pattern) - ], - [ - "flags", - string(match$1.flags) - ] - ]); - props = [ - [ - "value", - value_ - ], - [ - "raw", - string(raw) - ], - [ - "regex", - regex - ] - ]; - } - if (exit === 1) { - props = [ - [ - "value", - value_ - ], - [ - "raw", - string(raw) - ] - ]; - } - return node("Literal", loc, props); - }; - var declare_variable = function (param) { - return node("DeclareVariable", param[0], [[ - "id", - identifier(param[1].id) - ]]); - }; - var declare_class = function (param) { - var d = param[1]; - return node("DeclareClass", param[0], [ - [ - "id", - identifier(d.id) - ], + var comprehension_block = function (param) { + var b = param[1]; + return node("ComprehensionBlock", param[0], [ [ - "typeParameters", - option(type_parameter_declaration, d.typeParameters) + "left", + pattern(b.left) ], [ - "body", - object_type(d.body) + "right", + expression(b.right) ], [ - "extends", - array_of_list(interface_extends, d.extends) + "each", + bool(b.each) ] ]); }; @@ -16944,11 +16398,18 @@ function parse(content, options) { array_of_list(type_param, param[1].params) ]]); }; - var type_annotation = function (param) { - return node("TypeAnnotation", param[0], [[ - "typeAnnotation", - _type(param[1]) - ]]); + var variable_declarator = function (param) { + var declarator = param[1]; + return node("VariableDeclarator", param[0], [ + [ + "id", + pattern(declarator.id) + ], + [ + "init", + option(expression, declarator.init) + ] + ]); }; var export_specifier = function (param) { var specifier = param[1]; @@ -16963,194 +16424,575 @@ function parse(content, options) { ] ]); }; - var type_parameter_instantiation = function (param) { - return node("TypeParameterInstantiation", param[0], [[ - "params", - array_of_list(_type, param[1].params) - ]]); - }; - var class_implements = function (param) { - var $$implements = param[1]; - return node("ClassImplements", param[0], [ + var generic_type_qualified_identifier = function (param) { + var q = param[1]; + var id = q.qualification; + var qualification; + qualification = id.TAG === /* Unqualified */0 ? identifier(id._0) : generic_type_qualified_identifier(id._0); + return node("QualifiedTypeIdentifier", param[0], [ [ - "id", - identifier($$implements.id) + "qualification", + qualification ], [ - "typeParameters", - option(type_parameter_instantiation, $$implements.typeParameters) + "id", + identifier(q.id) ] ]); }; - var class_body = function (param) { - return node("ClassBody", param[0], [[ - "body", - array_of_list(class_element, param[1].body) + var type_parameter_instantiation = function (param) { + return node("TypeParameterInstantiation", param[0], [[ + "params", + array_of_list(_type, param[1].params) ]]); }; - var jsx_opening_attribute = function (attribute) { - if (attribute.TAG === /* Attribute */0) { - var param = attribute._0; - var attribute$1 = param[1]; - var id = attribute$1.name; - var name; - name = id.TAG === /* Identifier */0 ? jsx_identifier(id._0) : jsx_namespaced_name(id._0); - return node("JSXAttribute", param[0], [ - [ - "name", - name - ], - [ - "value", - option(jsx_attribute_value, attribute$1.value) - ] - ]); - } else { - var param$1 = attribute._0; - return node("JSXSpreadAttribute", param$1[0], [[ - "argument", - expression(param$1[1].argument) - ]]); - } - }; - var jsx_name = function (id) { - switch (id.TAG | 0) { - case /* Identifier */0 : - return jsx_identifier(id._0); - case /* NamespacedName */1 : - return jsx_namespaced_name(id._0); - case /* MemberExpression */2 : - return jsx_member_expression(id._0); - - } - }; - var jsx_opening = function (param) { - var opening = param[1]; - return node("JSXOpeningElement", param[0], [ - [ - "name", - jsx_name(opening.name) - ], - [ - "attributes", - array_of_list(jsx_opening_attribute, opening.attributes) - ], - [ - "selfClosing", - bool(opening.selfClosing) - ] - ]); - }; - var jsx_child = function (param) { - var element = param[1]; + var statement = function (param) { + var b = param[1]; var loc = param[0]; - switch (element.TAG | 0) { - case /* Element */0 : - return jsx_element([ + if (/* tag */typeof b === "number") { + if (b === /* Empty */0) { + return node("EmptyStatement", loc, []); + } else { + return node("DebuggerStatement", loc, []); + } + } + switch (b.TAG | 0) { + case /* Block */0 : + return block([ loc, - element._0 + b._0 + ]); + case /* Expression */1 : + return node("ExpressionStatement", loc, [[ + "expression", + expression(b._0.expression) + ]]); + case /* If */2 : + var _if = b._0; + return node("IfStatement", loc, [ + [ + "test", + expression(_if.test) + ], + [ + "consequent", + statement(_if.consequent) + ], + [ + "alternate", + option(statement, _if.alternate) + ] + ]); + case /* Labeled */3 : + var labeled = b._0; + return node("LabeledStatement", loc, [ + [ + "label", + identifier(labeled.label) + ], + [ + "body", + statement(labeled.body) + ] + ]); + case /* Break */4 : + return node("BreakStatement", loc, [[ + "label", + option(identifier, b._0.label) + ]]); + case /* Continue */5 : + return node("ContinueStatement", loc, [[ + "label", + option(identifier, b._0.label) + ]]); + case /* With */6 : + var _with = b._0; + return node("WithStatement", loc, [ + [ + "object", + expression(_with._object) + ], + [ + "body", + statement(_with.body) + ] + ]); + case /* TypeAlias */7 : + return type_alias([ + loc, + b._0 + ]); + case /* Switch */8 : + var $$switch = b._0; + return node("SwitchStatement", loc, [ + [ + "discriminant", + expression($$switch.discriminant) + ], + [ + "cases", + array_of_list($$case, $$switch.cases) + ], + [ + "lexical", + bool($$switch.lexical) + ] + ]); + case /* Return */9 : + return node("ReturnStatement", loc, [[ + "argument", + option(expression, b._0.argument) + ]]); + case /* Throw */10 : + return node("ThrowStatement", loc, [[ + "argument", + expression(b._0.argument) + ]]); + case /* Try */11 : + var _try = b._0; + return node("TryStatement", loc, [ + [ + "block", + block(_try.block) + ], + [ + "handler", + option($$catch, _try.handler) + ], + [ + "guardedHandlers", + array_of_list($$catch, _try.guardedHandlers) + ], + [ + "finalizer", + option(block, _try.finalizer) + ] + ]); + case /* While */12 : + var _while = b._0; + return node("WhileStatement", loc, [ + [ + "test", + expression(_while.test) + ], + [ + "body", + statement(_while.body) + ] + ]); + case /* DoWhile */13 : + var dowhile = b._0; + return node("DoWhileStatement", loc, [ + [ + "body", + statement(dowhile.body) + ], + [ + "test", + expression(dowhile.test) + ] + ]); + case /* For */14 : + var _for = b._0; + var init = function (init$1) { + if (init$1.TAG === /* InitDeclaration */0) { + return variable_declaration(init$1._0); + } else { + return expression(init$1._0); + } + }; + return node("ForStatement", loc, [ + [ + "init", + option(init, _for.init) + ], + [ + "test", + option(expression, _for.test) + ], + [ + "update", + option(expression, _for.update) + ], + [ + "body", + statement(_for.body) + ] + ]); + case /* ForIn */15 : + var forin = b._0; + var left = forin.left; + var left$1; + left$1 = left.TAG === /* LeftDeclaration */0 ? variable_declaration(left._0) : expression(left._0); + return node("ForInStatement", loc, [ + [ + "left", + left$1 + ], + [ + "right", + expression(forin.right) + ], + [ + "body", + statement(forin.body) + ], + [ + "each", + bool(forin.each) + ] + ]); + case /* ForOf */16 : + var forof = b._0; + var left$2 = forof.left; + var left$3; + left$3 = left$2.TAG === /* LeftDeclaration */0 ? variable_declaration(left$2._0) : expression(left$2._0); + return node("ForOfStatement", loc, [ + [ + "left", + left$3 + ], + [ + "right", + expression(forof.right) + ], + [ + "body", + statement(forof.body) + ] + ]); + case /* Let */17 : + var _let = b._0; + return node("LetStatement", loc, [ + [ + "head", + array_of_list(let_assignment, _let.head) + ], + [ + "body", + statement(_let.body) + ] + ]); + case /* FunctionDeclaration */18 : + var fn = b._0; + var id = fn.id; + var match = id !== undefined ? [ + "FunctionDeclaration", + identifier(id) + ] : [ + "FunctionExpression", + $$null + ]; + var b$1 = fn.body; + var body; + body = b$1.TAG === /* BodyBlock */0 ? block(b$1._0) : expression(b$1._0); + return node(match[0], loc, [ + [ + "id", + match[1] + ], + [ + "params", + array_of_list(pattern, fn.params) + ], + [ + "defaults", + array_of_list((function (param) { + return option(expression, param); + }), fn.defaults) + ], + [ + "rest", + option(identifier, fn.rest) + ], + [ + "body", + body + ], + [ + "async", + bool(fn.async) + ], + [ + "generator", + bool(fn.generator) + ], + [ + "expression", + bool(fn.expression) + ], + [ + "returnType", + option(type_annotation, fn.returnType) + ], + [ + "typeParameters", + option(type_parameter_declaration, fn.typeParameters) + ] ]); - case /* ExpressionContainer */1 : - return jsx_expression_container([ + case /* VariableDeclaration */19 : + return variable_declaration([ loc, - element._0 + b._0 ]); - case /* Text */2 : + case /* ClassDeclaration */20 : var param$1 = [ loc, - element._0 + b._0 ]; - var text = param$1[1]; - return node("JSXText", param$1[0], [ + var c = param$1[1]; + var id$1 = c.id; + var match$1 = id$1 !== undefined ? [ + "ClassDeclaration", + identifier(id$1) + ] : [ + "ClassExpression", + $$null + ]; + return node(match$1[0], param$1[0], [ [ - "value", - string(text.value) + "id", + match$1[1] + ], + [ + "body", + class_body(c.body) + ], + [ + "superClass", + option(expression, c.superClass) + ], + [ + "typeParameters", + option(type_parameter_declaration, c.typeParameters) + ], + [ + "superTypeParameters", + option(type_parameter_instantiation, c.superTypeParameters) + ], + [ + "implements", + array_of_list(class_implements, c.implements) + ], + [ + "decorators", + array_of_list(expression, c.classDecorators) + ] + ]); + case /* InterfaceDeclaration */21 : + return interface_declaration([ + loc, + b._0 + ]); + case /* DeclareVariable */22 : + return declare_variable([ + loc, + b._0 + ]); + case /* DeclareFunction */23 : + return declare_function([ + loc, + b._0 + ]); + case /* DeclareClass */24 : + return declare_class([ + loc, + b._0 + ]); + case /* DeclareModule */25 : + var m = b._0; + var lit = m.id; + var id$2; + id$2 = lit.TAG === /* Identifier */0 ? identifier(lit._0) : literal(lit._0); + var match$2 = m.kind; + var tmp; + tmp = match$2.TAG === /* CommonJS */0 ? string("CommonJS") : string("ES"); + return node("DeclareModule", loc, [ + [ + "id", + id$2 + ], + [ + "body", + block(m.body) + ], + [ + "kind", + tmp + ] + ]); + case /* DeclareModuleExports */26 : + return node("DeclareModuleExports", loc, [[ + "typeAnnotation", + type_annotation(b._0) + ]]); + case /* DeclareExportDeclaration */27 : + var $$export = b._0; + var match$3 = $$export.declaration; + var declaration; + if (match$3 !== undefined) { + switch (match$3.TAG | 0) { + case /* Variable */0 : + declaration = declare_variable(match$3._0); + break; + case /* Function */1 : + declaration = declare_function(match$3._0); + break; + case /* Class */2 : + declaration = declare_class(match$3._0); + break; + case /* DefaultType */3 : + declaration = _type(match$3._0); + break; + case /* NamedType */4 : + declaration = type_alias(match$3._0); + break; + case /* Interface */5 : + declaration = interface_declaration(match$3._0); + break; + + } + } else { + declaration = $$null; + } + return node("DeclareExportDeclaration", loc, [ + [ + "default", + bool($$export.default) + ], + [ + "declaration", + declaration + ], + [ + "specifiers", + export_specifiers($$export.specifiers) + ], + [ + "source", + option(literal, $$export.source) + ] + ]); + case /* ExportDeclaration */28 : + var $$export$1 = b._0; + var match$4 = $$export$1.declaration; + var declaration$1 = match$4 !== undefined ? ( + match$4.TAG === /* Declaration */0 ? statement(match$4._0) : expression(match$4._0) + ) : $$null; + return node("ExportDeclaration", loc, [ + [ + "default", + bool($$export$1.default) + ], + [ + "declaration", + declaration$1 + ], + [ + "specifiers", + export_specifiers($$export$1.specifiers) + ], + [ + "source", + option(literal, $$export$1.source) + ], + [ + "exportKind", + string($$export$1.exportKind ? "value" : "type") + ] + ]); + case /* ImportDeclaration */29 : + var $$import = b._0; + var specifiers = List.map((function (id) { + switch (id.TAG | 0) { + case /* ImportNamedSpecifier */0 : + var match = id._0; + var local_id = match.local; + var remote_id = match.remote; + var span_loc = local_id !== undefined ? btwn(remote_id[0], local_id[0]) : remote_id[0]; + return node("ImportSpecifier", span_loc, [ + [ + "id", + identifier(remote_id) + ], + [ + "name", + option(identifier, local_id) + ] + ]); + case /* ImportDefaultSpecifier */1 : + var id$1 = id._0; + return node("ImportDefaultSpecifier", id$1[0], [[ + "id", + identifier(id$1) + ]]); + case /* ImportNamespaceSpecifier */2 : + var param = id._0; + return node("ImportNamespaceSpecifier", param[0], [[ + "id", + identifier(param[1]) + ]]); + + } + }), $$import.specifiers); + var match$5 = $$import.importKind; + var import_kind; + switch (match$5) { + case /* ImportType */0 : + import_kind = "type"; + break; + case /* ImportTypeof */1 : + import_kind = "typeof"; + break; + case /* ImportValue */2 : + import_kind = "value"; + break; + + } + return node("ImportDeclaration", loc, [ + [ + "specifiers", + array($$Array.of_list(specifiers)) + ], + [ + "source", + literal($$import.source) ], [ - "raw", - string(text.raw) + "importKind", + string(import_kind) ] ]); } }; - var jsx_closing = function (param) { - return node("JSXClosingElement", param[0], [[ - "name", - jsx_name(param[1].name) + var jsx_expression_container = function (param) { + var expr = param[1].expression; + var expression$1; + expression$1 = expr.TAG === /* Expression */0 ? expression(expr._0) : node("JSXEmptyExpression", expr._0, []); + return node("JSXExpressionContainer", param[0], [[ + "expression", + expression$1 ]]); }; - var generic_type_qualified_identifier = function (param) { - var q = param[1]; - var id = q.qualification; - var qualification; - qualification = id.TAG === /* Unqualified */0 ? identifier(id._0) : generic_type_qualified_identifier(id._0); - return node("QualifiedTypeIdentifier", param[0], [ - [ - "qualification", - qualification - ], - [ - "id", - identifier(q.id) - ] - ]); - }; - var object_type = function (param) { - var o = param[1]; - return node("ObjectTypeAnnotation", param[0], [ - [ - "properties", - array_of_list(object_type_property, o.properties) - ], - [ - "indexers", - array_of_list(object_type_indexer, o.indexers) - ], - [ - "callProperties", - array_of_list(object_type_call_property, o.callProperties) - ] - ]); - }; - var interface_extends = function (param) { - var g = param[1]; - var id = g.id; - var id$1; - id$1 = id.TAG === /* Unqualified */0 ? identifier(id._0) : generic_type_qualified_identifier(id._0); - return node("InterfaceExtends", param[0], [ + var class_implements = function (param) { + var $$implements = param[1]; + return node("ClassImplements", param[0], [ [ "id", - id$1 + identifier($$implements.id) ], [ "typeParameters", - option(type_parameter_instantiation, g.typeParameters) + option(type_parameter_instantiation, $$implements.typeParameters) ] ]); }; - var template_element = function (param) { - var element = param[1]; - var value = obj([ - [ - "raw", - string(element.value.raw) - ], - [ - "cooked", - string(element.value.cooked) - ] - ]); - return node("TemplateElement", param[0], [ - [ - "value", - value - ], - [ - "tail", - bool(element.tail) - ] - ]); + var class_body = function (param) { + return node("ClassBody", param[0], [[ + "body", + array_of_list(class_element, param[1].body) + ]]); }; var function_type = function (param) { var fn = param[1]; @@ -17173,170 +17015,198 @@ function parse(content, options) { ] ]); }; - var object_property = function (param) { - if (param.TAG === /* Property */0) { - var match = param._0; - var prop = match[1]; - var lit = prop.key; - var match$1; - switch (lit.TAG | 0) { - case /* Literal */0 : - match$1 = [ - literal(lit._0), - false - ]; - break; - case /* Identifier */1 : - match$1 = [ - identifier(lit._0), - false - ]; - break; - case /* Computed */2 : - match$1 = [ - expression(lit._0), - true - ]; - break; - - } - var match$2 = prop.kind; - var kind; - switch (match$2) { - case /* Init */0 : - kind = "init"; - break; - case /* Get */1 : - kind = "get"; - break; - case /* Set */2 : - kind = "set"; - break; - - } - return node("Property", match[0], [ - [ - "key", - match$1[0] - ], - [ - "value", - expression(prop.value) - ], - [ - "kind", - string(kind) - ], - [ - "method", - bool(prop._method) - ], - [ - "shorthand", - bool(prop.shorthand) - ], - [ - "computed", - bool(match$1[1]) - ] - ]); - } - var match$3 = param._0; - return node("SpreadProperty", match$3[0], [[ - "argument", - expression(match$3[1].argument) - ]]); - }; - var comprehension_block = function (param) { - var b = param[1]; - return node("ComprehensionBlock", param[0], [ + var object_type = function (param) { + var o = param[1]; + return node("ObjectTypeAnnotation", param[0], [ [ - "left", - pattern(b.left) + "properties", + array_of_list(object_type_property, o.properties) ], [ - "right", - expression(b.right) + "indexers", + array_of_list(object_type_indexer, o.indexers) ], [ - "each", - bool(b.each) + "callProperties", + array_of_list(object_type_call_property, o.callProperties) ] ]); }; - var expression_or_spread = function (expr) { - if (expr.TAG === /* Expression */0) { - return expression(expr._0); - } - var match = expr._0; - return node("SpreadElement", match[0], [[ - "argument", - expression(match[1].argument) + var jsx_identifier = function (param) { + return node("JSXIdentifier", param[0], [[ + "name", + string(param[1].name) ]]); }; - var function_expression = function (param) { - var _function = param[1]; - var b = _function.body; - var body; - body = b.TAG === /* BodyBlock */0 ? block(b._0) : expression(b._0); - return node("FunctionExpression", param[0], [ + var object_type_call_property = function (param) { + var callProperty = param[1]; + return node("ObjectTypeCallProperty", param[0], [ [ - "id", - option(identifier, _function.id) + "value", + function_type(callProperty.value) ], [ - "params", - array_of_list(pattern, _function.params) + "static", + bool(callProperty.static) + ] + ]); + }; + var object_type_property = function (param) { + var prop = param[1]; + var lit = prop.key; + var key; + switch (lit.TAG | 0) { + case /* Literal */0 : + key = literal(lit._0); + break; + case /* Identifier */1 : + key = identifier(lit._0); + break; + case /* Computed */2 : + throw { + RE_EXN_ID: "Failure", + _1: "There should not be computed object type property keys", + Error: new Error() + }; + + } + return node("ObjectTypeProperty", param[0], [ + [ + "key", + key ], [ - "defaults", - array_of_list((function (param) { - return option(expression, param); - }), _function.defaults) + "value", + _type(prop.value) ], [ - "rest", - option(identifier, _function.rest) + "optional", + bool(prop.optional) ], [ - "body", - body + "static", + bool(prop.static) + ] + ]); + }; + var object_type_indexer = function (param) { + var indexer = param[1]; + return node("ObjectTypeIndexer", param[0], [ + [ + "id", + identifier(indexer.id) ], [ - "async", - bool(_function.async) + "key", + _type(indexer.key) ], [ - "generator", - bool(_function.generator) + "value", + _type(indexer.value) ], [ - "expression", - bool(_function.expression) + "static", + bool(indexer.static) + ] + ]); + }; + var jsx_opening = function (param) { + var opening = param[1]; + return node("JSXOpeningElement", param[0], [ + [ + "name", + jsx_name(opening.name) ], [ - "returnType", - option(type_annotation, _function.returnType) + "attributes", + array_of_list(jsx_opening_attribute, opening.attributes) ], [ - "typeParameters", - option(type_parameter_declaration, _function.typeParameters) + "selfClosing", + bool(opening.selfClosing) ] ]); }; - var template_literal = function (param) { - var value = param[1]; - return node("TemplateLiteral", param[0], [ + var jsx_child = function (param) { + var element = param[1]; + var loc = param[0]; + switch (element.TAG | 0) { + case /* Element */0 : + return jsx_element([ + loc, + element._0 + ]); + case /* ExpressionContainer */1 : + return jsx_expression_container([ + loc, + element._0 + ]); + case /* Text */2 : + var param$1 = [ + loc, + element._0 + ]; + var text = param$1[1]; + return node("JSXText", param$1[0], [ + [ + "value", + string(text.value) + ], + [ + "raw", + string(text.raw) + ] + ]); + + } + }; + var jsx_closing = function (param) { + return node("JSXClosingElement", param[0], [[ + "name", + jsx_name(param[1].name) + ]]); + }; + var comment = function (param) { + var c = param[1]; + var match; + match = c.TAG === /* Block */0 ? [ + "Block", + c._0 + ] : [ + "Line", + c._0 + ]; + return node(match[0], param[0], [[ + "value", + string(match[1]) + ]]); + }; + var jsx_namespaced_name = function (param) { + var namespaced_name = param[1]; + return node("JSXNamespacedName", param[0], [ [ - "quasis", - array_of_list(template_element, value.quasis) + "namespace", + jsx_identifier(namespaced_name.namespace) ], [ - "expressions", - array_of_list(expression, value.expressions) + "name", + jsx_identifier(namespaced_name.name) ] ]); }; + var jsx_attribute_value = function (param) { + if (param.TAG === /* Literal */0) { + return literal([ + param._0, + param._1 + ]); + } else { + return jsx_expression_container([ + param._0, + param._1 + ]); + } + }; var type_param = function (param) { var tp = param[1]; var variance = function (param) { @@ -17365,6 +17235,23 @@ function parse(content, options) { ] ]); }; + var function_type_param = function (param) { + var param$1 = param[1]; + return node("FunctionTypeParam", param[0], [ + [ + "name", + identifier(param$1.name) + ], + [ + "typeAnnotation", + _type(param$1.typeAnnotation) + ], + [ + "optional", + bool(param$1.optional) + ] + ]); + }; var class_element = function (m) { if (m.TAG === /* Method */0) { var param = m._0; @@ -17431,131 +17318,12 @@ function parse(content, options) { ], [ "decorators", - array_of_list(expression, method_.decorators) - ] - ]); - } else { - var param$1 = m._0; - var prop = param$1[1]; - var lit = prop.key; - var match$1; - switch (lit.TAG | 0) { - case /* Literal */0 : - match$1 = [ - literal(lit._0), - false - ]; - break; - case /* Identifier */1 : - match$1 = [ - identifier(lit._0), - false - ]; - break; - case /* Computed */2 : - match$1 = [ - expression(lit._0), - true - ]; - break; - - } - return node("ClassProperty", param$1[0], [ - [ - "key", - match$1[0] - ], - [ - "value", - option(expression, prop.value) - ], - [ - "typeAnnotation", - option(type_annotation, prop.typeAnnotation) - ], - [ - "computed", - bool(match$1[1]) - ], - [ - "static", - bool(prop.static) - ] - ]); - } - }; - var comment = function (param) { - var c = param[1]; - var match; - match = c.TAG === /* Block */0 ? [ - "Block", - c._0 - ] : [ - "Line", - c._0 - ]; - return node(match[0], param[0], [[ - "value", - string(match[1]) - ]]); - }; - var function_type_param = function (param) { - var param$1 = param[1]; - return node("FunctionTypeParam", param[0], [ - [ - "name", - identifier(param$1.name) - ], - [ - "typeAnnotation", - _type(param$1.typeAnnotation) - ], - [ - "optional", - bool(param$1.optional) - ] - ]); - }; - var variable_declarator = function (param) { - var declarator = param[1]; - return node("VariableDeclarator", param[0], [ - [ - "id", - pattern(declarator.id) - ], - [ - "init", - option(expression, declarator.init) - ] - ]); - }; - var jsx_attribute_value = function (param) { - if (param.TAG === /* Literal */0) { - return literal([ - param._0, - param._1 - ]); - } else { - return jsx_expression_container([ - param._0, - param._1 - ]); - } - }; - var array_pattern_element = function (p) { - if (p.TAG === /* Element */0) { - return pattern(p._0); - } - var match = p._0; - return node("SpreadElementPattern", match[0], [[ - "argument", - pattern(match[1].argument) - ]]); - }; - var object_pattern_property = function (param) { - if (param.TAG === /* Property */0) { - var match = param._0; - var prop = match[1]; + array_of_list(expression, method_.decorators) + ] + ]); + } else { + var param$1 = m._0; + var prop = param$1[1]; var lit = prop.key; var match$1; switch (lit.TAG | 0) { @@ -17579,31 +17347,263 @@ function parse(content, options) { break; } - return node("PropertyPattern", match[0], [ + return node("ClassProperty", param$1[0], [ [ "key", match$1[0] ], [ - "pattern", - pattern(prop.pattern) + "value", + option(expression, prop.value) + ], + [ + "typeAnnotation", + option(type_annotation, prop.typeAnnotation) ], [ "computed", bool(match$1[1]) ], [ - "shorthand", - bool(prop.shorthand) + "static", + bool(prop.static) ] ]); } - var match$2 = param._0; - return node("SpreadPropertyPattern", match$2[0], [[ - "argument", - pattern(match$2[1].argument) + }; + var template_element = function (param) { + var element = param[1]; + var value = obj([ + [ + "raw", + string(element.value.raw) + ], + [ + "cooked", + string(element.value.cooked) + ] + ]); + return node("TemplateElement", param[0], [ + [ + "value", + value + ], + [ + "tail", + bool(element.tail) + ] + ]); + }; + var jsx_name = function (id) { + switch (id.TAG | 0) { + case /* Identifier */0 : + return jsx_identifier(id._0); + case /* NamespacedName */1 : + return jsx_namespaced_name(id._0); + case /* MemberExpression */2 : + return jsx_member_expression(id._0); + + } + }; + var jsx_opening_attribute = function (attribute) { + if (attribute.TAG === /* Attribute */0) { + var param = attribute._0; + var attribute$1 = param[1]; + var id = attribute$1.name; + var name; + name = id.TAG === /* Identifier */0 ? jsx_identifier(id._0) : jsx_namespaced_name(id._0); + return node("JSXAttribute", param[0], [ + [ + "name", + name + ], + [ + "value", + option(jsx_attribute_value, attribute$1.value) + ] + ]); + } else { + var param$1 = attribute._0; + return node("JSXSpreadAttribute", param$1[0], [[ + "argument", + expression(param$1[1].argument) + ]]); + } + }; + var jsx_member_expression = function (param) { + var member_expression = param[1]; + var id = member_expression._object; + var _object; + _object = id.TAG === /* Identifier */0 ? jsx_identifier(id._0) : jsx_member_expression(id._0); + return node("JSXMemberExpression", param[0], [ + [ + "object", + _object + ], + [ + "property", + jsx_identifier(member_expression.property) + ] + ]); + }; + var $$case = function (param) { + var c = param[1]; + return node("SwitchCase", param[0], [ + [ + "test", + option(expression, c.test) + ], + [ + "consequent", + array_of_list(statement, c.consequent) + ] + ]); + }; + var $$catch = function (param) { + var c = param[1]; + return node("CatchClause", param[0], [ + [ + "param", + pattern(c.param) + ], + [ + "guard", + option(expression, c.guard) + ], + [ + "body", + block(c.body) + ] + ]); + }; + var declare_function = function (param) { + return node("DeclareFunction", param[0], [[ + "id", + identifier(param[1].id) + ]]); + }; + var interface_declaration = function (param) { + var i = param[1]; + return node("InterfaceDeclaration", param[0], [ + [ + "id", + identifier(i.id) + ], + [ + "typeParameters", + option(type_parameter_declaration, i.typeParameters) + ], + [ + "body", + object_type(i.body) + ], + [ + "extends", + array_of_list(interface_extends, i.extends) + ] + ]); + }; + var type_alias = function (param) { + var alias = param[1]; + return node("TypeAlias", param[0], [ + [ + "id", + identifier(alias.id) + ], + [ + "typeParameters", + option(type_parameter_declaration, alias.typeParameters) + ], + [ + "right", + _type(alias.right) + ] + ]); + }; + var declare_class = function (param) { + var d = param[1]; + return node("DeclareClass", param[0], [ + [ + "id", + identifier(d.id) + ], + [ + "typeParameters", + option(type_parameter_declaration, d.typeParameters) + ], + [ + "body", + object_type(d.body) + ], + [ + "extends", + array_of_list(interface_extends, d.extends) + ] + ]); + }; + var export_specifiers = function (param) { + if (param !== undefined) { + if (param.TAG === /* ExportSpecifiers */0) { + return array_of_list(export_specifier, param._0); + } else { + return array([node("ExportBatchSpecifier", param._0, [[ + "name", + option(identifier, param._1) + ]])]); + } + } else { + return array([]); + } + }; + var variable_declaration = function (param) { + var $$var = param[1]; + var match = $$var.kind; + var kind; + switch (match) { + case /* Var */0 : + kind = "var"; + break; + case /* Let */1 : + kind = "let"; + break; + case /* Const */2 : + kind = "const"; + break; + + } + return node("VariableDeclaration", param[0], [ + [ + "declarations", + array_of_list(variable_declarator, $$var.declarations) + ], + [ + "kind", + string(kind) + ] + ]); + }; + var declare_variable = function (param) { + return node("DeclareVariable", param[0], [[ + "id", + identifier(param[1].id) ]]); }; + var interface_extends = function (param) { + var g = param[1]; + var id = g.id; + var id$1; + id$1 = id.TAG === /* Unqualified */0 ? identifier(id._0) : generic_type_qualified_identifier(id._0); + return node("InterfaceExtends", param[0], [ + [ + "id", + id$1 + ], + [ + "typeParameters", + option(type_parameter_instantiation, g.typeParameters) + ] + ]); + }; var program$2 = function (param) { return node("Program", param[0], [ [ diff --git a/jscomp/test/ocaml_re_test.js b/jscomp/test/ocaml_re_test.js index 78a774aab5..bdb70e46c9 100644 --- a/jscomp/test/ocaml_re_test.js +++ b/jscomp/test/ocaml_re_test.js @@ -3402,39 +3402,21 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { }; } }; - var piece = function (param) { - var r = atom(undefined); - if (accept(/* '*' */42)) { - return greedy_mod(repn(r, 0, undefined)); - } - if (accept(/* '+' */43)) { - return greedy_mod(repn(r, 1, undefined)); - } - if (accept(/* '?' */63)) { - return greedy_mod(repn(r, 0, 1)); - } - if (!accept(/* '{' */123)) { - return r; - } - var i$1 = integer(undefined); - if (i$1 !== undefined) { - var j = accept(/* ',' */44) ? integer(undefined) : i$1; - if (!accept(/* '}' */125)) { - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; - } - if (j !== undefined && j < i$1) { - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; + var regexp$p = function (_left) { + while(true) { + var left = _left; + if (!accept(/* '|' */124)) { + return left; } - return greedy_mod(repn(r, i$1, j)); - } - i.contents = i.contents - 1 | 0; - return r; + _left = alt$1({ + hd: left, + tl: { + hd: branch$p(/* [] */0), + tl: /* [] */0 + } + }); + continue ; + }; }; var branch$p = function (_left) { while(true) { @@ -3449,135 +3431,173 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { continue ; }; }; - var atom = function (param) { - if (accept(/* '.' */46)) { - if (dotall) { - return any; - } else { - return notnl; - } + var $$char = function (param) { + if (i.contents === l) { + throw { + RE_EXN_ID: Parse_error, + Error: new Error() + }; } - if (accept(/* '(' */40)) { - if (accept(/* '?' */63)) { - if (accept(/* ':' */58)) { - var r = regexp$p(branch$p(/* [] */0)); - if (!accept(/* ')' */41)) { + var c = get(undefined); + if (c === /* '[' */91) { + if (accept(/* '=' */61)) { + throw { + RE_EXN_ID: Not_supported, + Error: new Error() + }; + } + if (accept(/* ':' */58)) { + var compl$1 = accept(/* '^' */94); + var cls; + try { + cls = List.find(accept_s, { + hd: "alnum", + tl: { + hd: "ascii", + tl: { + hd: "blank", + tl: { + hd: "cntrl", + tl: { + hd: "digit", + tl: { + hd: "lower", + tl: { + hd: "print", + tl: { + hd: "space", + tl: { + hd: "upper", + tl: { + hd: "word", + tl: { + hd: "punct", + tl: { + hd: "graph", + tl: { + hd: "xdigit", + tl: /* [] */0 + } + } + } + } + } + } + } + } + } + } + } + } + }); + } + catch (raw_exn){ + var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); + if (exn.RE_EXN_ID === "Not_found") { throw { RE_EXN_ID: Parse_error, Error: new Error() }; } - return r; + throw exn; } - if (accept(/* '#' */35)) { - var _param; - while(true) { - if (accept(/* ')' */41)) { - return epsilon; - } - i.contents = i.contents + 1 | 0; - _param = undefined; - continue ; - }; + if (!accept_s(":]")) { + throw { + RE_EXN_ID: Parse_error, + Error: new Error() + }; } + var posix_class = posix_class_of_string(cls); + var re = compl$1 ? compl({ + hd: posix_class, + tl: /* [] */0 + }) : posix_class; + return { + NAME: "Set", + VAL: re + }; + } + if (!accept(/* '.' */46)) { + return { + NAME: "Char", + VAL: c + }; + } + if (i.contents === l) { throw { RE_EXN_ID: Parse_error, Error: new Error() }; } - var r$1 = regexp$p(branch$p(/* [] */0)); - if (!accept(/* ')' */41)) { + var c$1 = get(undefined); + if (!accept(/* '.' */46)) { + throw { + RE_EXN_ID: Not_supported, + Error: new Error() + }; + } + if (!accept(/* ']' */93)) { throw { RE_EXN_ID: Parse_error, Error: new Error() }; } return { - TAG: /* Group */6, - _0: r$1 + NAME: "Char", + VAL: c$1 }; } - if (accept(/* '^' */94)) { - if (multiline) { - return /* Beg_of_line */0; - } else { - return /* Beg_of_str */5; - } - } - if (accept(/* '$' */36)) { - if (multiline) { - return /* End_of_line */1; - } else if (dollar_endonly) { - return /* Last_end_of_line */7; - } else { - return /* End_of_str */6; - } - } - if (accept(/* '[' */91)) { - if (accept(/* '^' */94)) { - return compl(bracket(/* [] */0)); - } else { - return alt$1(bracket(/* [] */0)); - } - } - if (accept(/* '\\' */92)) { - if (i.contents === l) { - throw { - RE_EXN_ID: Parse_error, - Error: new Error() + if (c !== /* '\\' */92) { + return { + NAME: "Char", + VAL: c }; + } + var c$2 = get(undefined); + if (c$2 >= 58) { + if (c$2 >= 123) { + return { + NAME: "Char", + VAL: c$2 + }; } - var c = get(undefined); - switch (c) { - case 48 : - case 49 : - case 50 : - case 51 : - case 52 : - case 53 : - case 54 : - case 55 : - case 56 : - case 57 : - throw { - RE_EXN_ID: Not_supported, - Error: new Error() - }; - case 65 : - return /* Beg_of_str */5; - case 66 : - return /* Not_bound */4; + switch (c$2) { case 68 : - return compl({ - hd: digit, - tl: /* [] */0 - }); - case 71 : - return /* Start */8; + return { + NAME: "Set", + VAL: compl({ + hd: digit, + tl: /* [] */0 + }) + }; case 83 : - return compl({ - hd: space, - tl: /* [] */0 - }); - case 87 : - return compl({ - hd: alnum, - tl: { - hd: { - TAG: /* Set */0, - _0: { - hd: [ - /* '_' */95, - /* '_' */95 - ], - tl: /* [] */0 - } - }, + return { + NAME: "Set", + VAL: compl({ + hd: space, tl: /* [] */0 - } - }); - case 90 : - return /* Last_end_of_line */7; + }) + }; + case 87 : + return { + NAME: "Set", + VAL: compl({ + hd: alnum, + tl: { + hd: { + TAG: /* Set */0, + _0: { + hd: [ + /* '_' */95, + /* '_' */95 + ], + tl: /* [] */0 + } + }, + tl: /* [] */0 + } + }) + }; case 58 : case 59 : case 60 : @@ -3592,41 +3612,65 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { case 95 : case 96 : return { - TAG: /* Set */0, - _0: single(c) + NAME: "Char", + VAL: c$2 }; case 98 : - return alt$1({ - hd: /* Beg_of_word */2, - tl: { - hd: /* End_of_word */3, - tl: /* [] */0 - } - }); + return { + NAME: "Char", + VAL: /* '\b' */8 + }; case 100 : - return digit; + return { + NAME: "Set", + VAL: digit + }; + case 110 : + return { + NAME: "Char", + VAL: /* '\n' */10 + }; + case 114 : + return { + NAME: "Char", + VAL: /* '\r' */13 + }; case 115 : - return space; + return { + NAME: "Set", + VAL: space + }; + case 116 : + return { + NAME: "Char", + VAL: /* '\t' */9 + }; case 119 : - return alt$1({ - hd: alnum, - tl: { - hd: { - TAG: /* Set */0, - _0: { - hd: [ - /* '_' */95, - /* '_' */95 - ], - tl: /* [] */0 - } - }, - tl: /* [] */0 - } - }); + return { + NAME: "Set", + VAL: alt$1({ + hd: alnum, + tl: { + hd: { + TAG: /* Set */0, + _0: { + hd: [ + /* '_' */95, + /* '_' */95 + ], + tl: /* [] */0 + } + }, + tl: /* [] */0 + } + }) + }; + case 65 : + case 66 : case 67 : case 69 : case 70 : + case 71 : case 72 : case 73 : case 74 : @@ -3643,6 +3687,7 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { case 86 : case 88 : case 89 : + case 90 : case 97 : case 99 : case 101 : @@ -3654,126 +3699,33 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { case 107 : case 108 : case 109 : - case 110 : - case 111 : - case 112 : - case 113 : - case 114 : - case 116 : - case 117 : - case 118 : - case 120 : - case 121 : - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; - case 122 : - return /* End_of_str */6; - default: - return { - TAG: /* Set */0, - _0: single(c) - }; - } - } else { - if (i.contents === l) { - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; - } - var c$1 = get(undefined); - if (c$1 >= 64) { - if (c$1 !== 92) { - if (c$1 !== 123) { - return { - TAG: /* Set */0, - _0: single(c$1) - }; - } - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; - } - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; - } - if (c$1 >= 44) { - if (c$1 >= 63) { - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; - } - return { - TAG: /* Set */0, - _0: single(c$1) - }; + case 111 : + case 112 : + case 113 : + case 117 : + case 118 : + case 120 : + case 121 : + case 122 : + throw { + RE_EXN_ID: Parse_error, + Error: new Error() + }; + } - if (c$1 >= 42) { + } else { + if (c$2 >= 48) { throw { - RE_EXN_ID: Parse_error, + RE_EXN_ID: Not_supported, Error: new Error() }; } return { - TAG: /* Set */0, - _0: single(c$1) + NAME: "Char", + VAL: c$2 }; } }; - var integer = function (param) { - if (i.contents === l) { - return ; - } - var d = get(undefined); - if (d > 57 || d < 48) { - i.contents = i.contents - 1 | 0; - return ; - } else { - var _i = d - /* '0' */48 | 0; - while(true) { - var i$1 = _i; - if (i.contents === l) { - return i$1; - } - var d$1 = get(undefined); - if (d$1 > 57 || d$1 < 48) { - i.contents = i.contents - 1 | 0; - return i$1; - } - var i$p = Math.imul(10, i$1) + (d$1 - /* '0' */48 | 0) | 0; - if (i$p < i$1) { - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; - } - _i = i$p; - continue ; - }; - } - }; - var regexp$p = function (_left) { - while(true) { - var left = _left; - if (!accept(/* '|' */124)) { - return left; - } - _left = alt$1({ - hd: left, - tl: { - hd: branch$p(/* [] */0), - tl: /* [] */0 - } - }); - continue ; - }; - }; var bracket = function (_s) { while(true) { var s = _s; @@ -3855,173 +3807,201 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { continue ; }; }; - var $$char = function (param) { - if (i.contents === l) { - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; + var piece = function (param) { + var r = atom(undefined); + if (accept(/* '*' */42)) { + return greedy_mod(repn(r, 0, undefined)); } - var c = get(undefined); - if (c === /* '[' */91) { - if (accept(/* '=' */61)) { + if (accept(/* '+' */43)) { + return greedy_mod(repn(r, 1, undefined)); + } + if (accept(/* '?' */63)) { + return greedy_mod(repn(r, 0, 1)); + } + if (!accept(/* '{' */123)) { + return r; + } + var i$1 = integer(undefined); + if (i$1 !== undefined) { + var j = accept(/* ',' */44) ? integer(undefined) : i$1; + if (!accept(/* '}' */125)) { throw { - RE_EXN_ID: Not_supported, + RE_EXN_ID: Parse_error, Error: new Error() }; } - if (accept(/* ':' */58)) { - var compl$1 = accept(/* '^' */94); - var cls; - try { - cls = List.find(accept_s, { - hd: "alnum", - tl: { - hd: "ascii", - tl: { - hd: "blank", - tl: { - hd: "cntrl", - tl: { - hd: "digit", - tl: { - hd: "lower", - tl: { - hd: "print", - tl: { - hd: "space", - tl: { - hd: "upper", - tl: { - hd: "word", - tl: { - hd: "punct", - tl: { - hd: "graph", - tl: { - hd: "xdigit", - tl: /* [] */0 - } - } - } - } - } - } - } - } - } - } - } - } - }); + if (j !== undefined && j < i$1) { + throw { + RE_EXN_ID: Parse_error, + Error: new Error() + }; + } + return greedy_mod(repn(r, i$1, j)); + } + i.contents = i.contents - 1 | 0; + return r; + }; + var integer = function (param) { + if (i.contents === l) { + return ; + } + var d = get(undefined); + if (d > 57 || d < 48) { + i.contents = i.contents - 1 | 0; + return ; + } else { + var _i = d - /* '0' */48 | 0; + while(true) { + var i$1 = _i; + if (i.contents === l) { + return i$1; } - catch (raw_exn){ - var exn = Caml_js_exceptions.internalToOCamlException(raw_exn); - if (exn.RE_EXN_ID === "Not_found") { - throw { - RE_EXN_ID: Parse_error, - Error: new Error() - }; - } - throw exn; + var d$1 = get(undefined); + if (d$1 > 57 || d$1 < 48) { + i.contents = i.contents - 1 | 0; + return i$1; } - if (!accept_s(":]")) { + var i$p = Math.imul(10, i$1) + (d$1 - /* '0' */48 | 0) | 0; + if (i$p < i$1) { throw { RE_EXN_ID: Parse_error, Error: new Error() }; } - var posix_class = posix_class_of_string(cls); - var re = compl$1 ? compl({ - hd: posix_class, - tl: /* [] */0 - }) : posix_class; - return { - NAME: "Set", - VAL: re - }; + _i = i$p; + continue ; + }; + } + }; + var atom = function (param) { + if (accept(/* '.' */46)) { + if (dotall) { + return any; + } else { + return notnl; } - if (!accept(/* '.' */46)) { - return { - NAME: "Char", - VAL: c - }; + } + if (accept(/* '(' */40)) { + if (accept(/* '?' */63)) { + if (accept(/* ':' */58)) { + var r = regexp$p(branch$p(/* [] */0)); + if (!accept(/* ')' */41)) { + throw { + RE_EXN_ID: Parse_error, + Error: new Error() + }; + } + return r; + } + if (accept(/* '#' */35)) { + var _param; + while(true) { + if (accept(/* ')' */41)) { + return epsilon; + } + i.contents = i.contents + 1 | 0; + _param = undefined; + continue ; + }; + } + throw { + RE_EXN_ID: Parse_error, + Error: new Error() + }; } - if (i.contents === l) { + var r$1 = regexp$p(branch$p(/* [] */0)); + if (!accept(/* ')' */41)) { throw { RE_EXN_ID: Parse_error, Error: new Error() }; } - var c$1 = get(undefined); - if (!accept(/* '.' */46)) { - throw { - RE_EXN_ID: Not_supported, - Error: new Error() - }; + return { + TAG: /* Group */6, + _0: r$1 + }; + } + if (accept(/* '^' */94)) { + if (multiline) { + return /* Beg_of_line */0; + } else { + return /* Beg_of_str */5; + } + } + if (accept(/* '$' */36)) { + if (multiline) { + return /* End_of_line */1; + } else if (dollar_endonly) { + return /* Last_end_of_line */7; + } else { + return /* End_of_str */6; + } + } + if (accept(/* '[' */91)) { + if (accept(/* '^' */94)) { + return compl(bracket(/* [] */0)); + } else { + return alt$1(bracket(/* [] */0)); } - if (!accept(/* ']' */93)) { + } + if (accept(/* '\\' */92)) { + if (i.contents === l) { throw { RE_EXN_ID: Parse_error, Error: new Error() }; } - return { - NAME: "Char", - VAL: c$1 - }; - } - if (c !== /* '\\' */92) { - return { - NAME: "Char", - VAL: c - }; - } - var c$2 = get(undefined); - if (c$2 >= 58) { - if (c$2 >= 123) { - return { - NAME: "Char", - VAL: c$2 - }; - } - switch (c$2) { + var c = get(undefined); + switch (c) { + case 48 : + case 49 : + case 50 : + case 51 : + case 52 : + case 53 : + case 54 : + case 55 : + case 56 : + case 57 : + throw { + RE_EXN_ID: Not_supported, + Error: new Error() + }; + case 65 : + return /* Beg_of_str */5; + case 66 : + return /* Not_bound */4; case 68 : - return { - NAME: "Set", - VAL: compl({ - hd: digit, - tl: /* [] */0 - }) - }; + return compl({ + hd: digit, + tl: /* [] */0 + }); + case 71 : + return /* Start */8; case 83 : - return { - NAME: "Set", - VAL: compl({ - hd: space, - tl: /* [] */0 - }) - }; + return compl({ + hd: space, + tl: /* [] */0 + }); case 87 : - return { - NAME: "Set", - VAL: compl({ - hd: alnum, - tl: { - hd: { - TAG: /* Set */0, - _0: { - hd: [ - /* '_' */95, - /* '_' */95 - ], - tl: /* [] */0 - } - }, - tl: /* [] */0 - } - }) - }; + return compl({ + hd: alnum, + tl: { + hd: { + TAG: /* Set */0, + _0: { + hd: [ + /* '_' */95, + /* '_' */95 + ], + tl: /* [] */0 + } + }, + tl: /* [] */0 + } + }); + case 90 : + return /* Last_end_of_line */7; case 58 : case 59 : case 60 : @@ -4036,65 +4016,41 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { case 95 : case 96 : return { - NAME: "Char", - VAL: c$2 + TAG: /* Set */0, + _0: single(c) }; case 98 : - return { - NAME: "Char", - VAL: /* '\b' */8 - }; + return alt$1({ + hd: /* Beg_of_word */2, + tl: { + hd: /* End_of_word */3, + tl: /* [] */0 + } + }); case 100 : - return { - NAME: "Set", - VAL: digit - }; - case 110 : - return { - NAME: "Char", - VAL: /* '\n' */10 - }; - case 114 : - return { - NAME: "Char", - VAL: /* '\r' */13 - }; + return digit; case 115 : - return { - NAME: "Set", - VAL: space - }; - case 116 : - return { - NAME: "Char", - VAL: /* '\t' */9 - }; + return space; case 119 : - return { - NAME: "Set", - VAL: alt$1({ - hd: alnum, - tl: { - hd: { - TAG: /* Set */0, - _0: { - hd: [ - /* '_' */95, - /* '_' */95 - ], - tl: /* [] */0 - } - }, - tl: /* [] */0 - } - }) - }; - case 65 : - case 66 : + return alt$1({ + hd: alnum, + tl: { + hd: { + TAG: /* Set */0, + _0: { + hd: [ + /* '_' */95, + /* '_' */95 + ], + tl: /* [] */0 + } + }, + tl: /* [] */0 + } + }); case 67 : case 69 : case 70 : - case 71 : case 72 : case 73 : case 74 : @@ -4111,7 +4067,6 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { case 86 : case 88 : case 89 : - case 90 : case 97 : case 99 : case 101 : @@ -4123,30 +4078,75 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) { case 107 : case 108 : case 109 : + case 110 : case 111 : case 112 : case 113 : + case 114 : + case 116 : case 117 : case 118 : case 120 : case 121 : - case 122 : throw { RE_EXN_ID: Parse_error, Error: new Error() }; - + case 122 : + return /* End_of_str */6; + default: + return { + TAG: /* Set */0, + _0: single(c) + }; } } else { - if (c$2 >= 48) { + if (i.contents === l) { throw { - RE_EXN_ID: Not_supported, + RE_EXN_ID: Parse_error, + Error: new Error() + }; + } + var c$1 = get(undefined); + if (c$1 >= 64) { + if (c$1 !== 92) { + if (c$1 !== 123) { + return { + TAG: /* Set */0, + _0: single(c$1) + }; + } + throw { + RE_EXN_ID: Parse_error, + Error: new Error() + }; + } + throw { + RE_EXN_ID: Parse_error, + Error: new Error() + }; + } + if (c$1 >= 44) { + if (c$1 >= 63) { + throw { + RE_EXN_ID: Parse_error, + Error: new Error() + }; + } + return { + TAG: /* Set */0, + _0: single(c$1) + }; + } + if (c$1 >= 42) { + throw { + RE_EXN_ID: Parse_error, Error: new Error() }; } return { - NAME: "Char", - VAL: c$2 + TAG: /* Set */0, + _0: single(c$1) }; } }; diff --git a/jscomp/test/test_pervasive.js b/jscomp/test/test_pervasive.js index e27662158d..77c9a0c0e9 100644 --- a/jscomp/test/test_pervasive.js +++ b/jscomp/test/test_pervasive.js @@ -56,6 +56,11 @@ var Pervasives$1 = { fast_sort: List.fast_sort, sort_uniq: List.sort_uniq, merge: List.merge, + Jsx: Pervasives.Jsx, + JsxEvent: Pervasives.JsxEvent, + JsxDOM: Pervasives.JsxDOM, + JsxPPXReactSupport: Pervasives.JsxPPXReactSupport, + JsxModules: Pervasives.JsxModules, invalid_arg: Pervasives.invalid_arg, failwith: Pervasives.failwith, Exit: Pervasives.Exit, diff --git a/jscomp/test/test_pervasives2.js b/jscomp/test/test_pervasives2.js index 6eee3af71e..3b31b134b7 100644 --- a/jscomp/test/test_pervasives2.js +++ b/jscomp/test/test_pervasives2.js @@ -57,6 +57,11 @@ var List$1 = { fast_sort: List.fast_sort, sort_uniq: List.sort_uniq, merge: List.merge, + Jsx: Pervasives.Jsx, + JsxEvent: Pervasives.JsxEvent, + JsxDOM: Pervasives.JsxDOM, + JsxPPXReactSupport: Pervasives.JsxPPXReactSupport, + JsxModules: Pervasives.JsxModules, invalid_arg: Pervasives.invalid_arg, failwith: Pervasives.failwith, Exit: Pervasives.Exit, @@ -100,6 +105,11 @@ var U = { length: Stack.length, iter: Stack.iter, fold: Stack.fold, + Jsx: Pervasives.Jsx, + JsxEvent: Pervasives.JsxEvent, + JsxDOM: Pervasives.JsxDOM, + JsxPPXReactSupport: Pervasives.JsxPPXReactSupport, + JsxModules: Pervasives.JsxModules, invalid_arg: Pervasives.invalid_arg, failwith: Pervasives.failwith, Exit: Pervasives.Exit, diff --git a/jscomp/test/test_pervasives3.js b/jscomp/test/test_pervasives3.js index d375f3f2d0..814548d41e 100644 --- a/jscomp/test/test_pervasives3.js +++ b/jscomp/test/test_pervasives3.js @@ -4,6 +4,11 @@ var List = require("../../lib/js/list.js"); var Pervasives = require("../../lib/js/pervasives.js"); var Pervasives$1 = { + Jsx: Pervasives.Jsx, + JsxEvent: Pervasives.JsxEvent, + JsxDOM: Pervasives.JsxDOM, + JsxPPXReactSupport: Pervasives.JsxPPXReactSupport, + JsxModules: Pervasives.JsxModules, invalid_arg: Pervasives.invalid_arg, failwith: Pervasives.failwith, Exit: Pervasives.Exit, diff --git a/lib/es6/jsx.js b/lib/es6/jsxC.js similarity index 100% rename from lib/es6/jsx.js rename to lib/es6/jsxC.js diff --git a/lib/es6/jsxDOM.js b/lib/es6/jsxDOMC.js similarity index 100% rename from lib/es6/jsxDOM.js rename to lib/es6/jsxDOMC.js diff --git a/lib/js/jsx.js b/lib/es6/jsxDOMU.js similarity index 100% rename from lib/js/jsx.js rename to lib/es6/jsxDOMU.js diff --git a/lib/es6/jsxEvent.js b/lib/es6/jsxEventC.js similarity index 100% rename from lib/es6/jsxEvent.js rename to lib/es6/jsxEventC.js diff --git a/lib/es6/jsxEventU.js b/lib/es6/jsxEventU.js new file mode 100644 index 0000000000..d21199bd53 --- /dev/null +++ b/lib/es6/jsxEventU.js @@ -0,0 +1,59 @@ + + + +function MakeEventWithType(Type) { + return {}; +} + +var Synthetic = {}; + +var Clipboard = {}; + +var Composition = {}; + +var Keyboard = {}; + +var Focus = {}; + +var Form = {}; + +var Mouse = {}; + +var Pointer = {}; + +var $$Selection = {}; + +var $$Touch = {}; + +var UI = {}; + +var Wheel = {}; + +var Media = {}; + +var $$Image = {}; + +var Animation = {}; + +var Transition = {}; + +export { + MakeEventWithType , + Synthetic , + Clipboard , + Composition , + Keyboard , + Focus , + Form , + Mouse , + Pointer , + $$Selection , + $$Touch , + UI , + Wheel , + Media , + $$Image , + Animation , + Transition , +} +/* No side effect */ diff --git a/lib/es6/jsxPPXReactSupport.js b/lib/es6/jsxPPXReactSupportC.js similarity index 97% rename from lib/es6/jsxPPXReactSupport.js rename to lib/es6/jsxPPXReactSupportC.js index cc30cc81c2..1ddf8ffe99 100644 --- a/lib/es6/jsxPPXReactSupport.js +++ b/lib/es6/jsxPPXReactSupportC.js @@ -19,7 +19,10 @@ function createElementVariadicWithKey(key, component, props, elements) { ]); } +var Jsx; + export { + Jsx , createElementWithKey , createElementVariadicWithKey , } diff --git a/lib/es6/jsxPPXReactSupportU.js b/lib/es6/jsxPPXReactSupportU.js new file mode 100644 index 0000000000..1ddf8ffe99 --- /dev/null +++ b/lib/es6/jsxPPXReactSupportU.js @@ -0,0 +1,29 @@ + + +import * as React from "react"; +import * as Caml_splice_call from "./caml_splice_call.js"; + +function createElementWithKey(key, component, props) { + return React.createElement(component, key !== undefined ? Object.assign({}, props, { + key: key + }) : props); +} + +function createElementVariadicWithKey(key, component, props, elements) { + return Caml_splice_call.spliceApply(React.createElement, [ + component, + key !== undefined ? Object.assign({}, props, { + key: key + }) : props, + elements + ]); +} + +var Jsx; + +export { + Jsx , + createElementWithKey , + createElementVariadicWithKey , +} +/* react Not a pure module */ diff --git a/lib/js/jsxDOM.js b/lib/es6/jsxU.js similarity index 100% rename from lib/js/jsxDOM.js rename to lib/es6/jsxU.js diff --git a/lib/es6/pervasives.js b/lib/es6/pervasives.js index 075946766c..76ffce3694 100644 --- a/lib/es6/pervasives.js +++ b/lib/es6/pervasives.js @@ -7,6 +7,12 @@ import * as Caml_string from "./caml_string.js"; import * as Caml_exceptions from "./caml_exceptions.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; +var JsxModules = { + Jsx: undefined, + JsxEvent: undefined, + JsxDOM: undefined +}; + function failwith(s) { throw { RE_EXN_ID: "Failure", @@ -204,6 +210,14 @@ function exit(retcode) { return Caml_sys.sys_exit(retcode); } +var Jsx; + +var JsxEvent; + +var JsxDOM; + +var JsxPPXReactSupport; + var max_int = 2147483647; var infinity = Infinity; @@ -217,6 +231,11 @@ var min_float = 2.22507385850720138e-308; var epsilon_float = 2.22044604925031308e-16; export { + Jsx , + JsxEvent , + JsxDOM , + JsxPPXReactSupport , + JsxModules , invalid_arg , failwith , Exit , diff --git a/lib/es6/pervasivesU.js b/lib/es6/pervasivesU.js index 8aa72b27bd..4ee5a1f5b7 100644 --- a/lib/es6/pervasivesU.js +++ b/lib/es6/pervasivesU.js @@ -6,7 +6,11 @@ import * as Caml_string from "./caml_string.js"; import * as Caml_exceptions from "./caml_exceptions.js"; import * as Caml_js_exceptions from "./caml_js_exceptions.js"; -var Jsx = {}; +var JsxModules = { + Jsx: undefined, + JsxEvent: undefined, + JsxDOM: undefined +}; function failwith(s) { throw { @@ -205,6 +209,14 @@ function exit(retcode) { return Caml_sys.sys_exit(retcode); } +var Jsx; + +var JsxEvent; + +var JsxDOM; + +var JsxPPXReactSupport; + var max_int = 2147483647; var infinity = Infinity; @@ -219,6 +231,10 @@ var epsilon_float = 2.22044604925031308e-16; export { Jsx , + JsxEvent , + JsxDOM , + JsxPPXReactSupport , + JsxModules , invalid_arg , failwith , Exit , diff --git a/lib/js/jsxC.js b/lib/js/jsxC.js new file mode 100644 index 0000000000..ae1b9f17e6 --- /dev/null +++ b/lib/js/jsxC.js @@ -0,0 +1 @@ +/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */ diff --git a/lib/js/jsxDOMC.js b/lib/js/jsxDOMC.js new file mode 100644 index 0000000000..ae1b9f17e6 --- /dev/null +++ b/lib/js/jsxDOMC.js @@ -0,0 +1 @@ +/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */ diff --git a/lib/js/jsxDOMU.js b/lib/js/jsxDOMU.js new file mode 100644 index 0000000000..ae1b9f17e6 --- /dev/null +++ b/lib/js/jsxDOMU.js @@ -0,0 +1 @@ +/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */ diff --git a/lib/js/jsxEvent.js b/lib/js/jsxEventC.js similarity index 100% rename from lib/js/jsxEvent.js rename to lib/js/jsxEventC.js diff --git a/lib/js/jsxEventU.js b/lib/js/jsxEventU.js new file mode 100644 index 0000000000..41006f5a8d --- /dev/null +++ b/lib/js/jsxEventU.js @@ -0,0 +1,57 @@ +'use strict'; + + +function MakeEventWithType(Type) { + return {}; +} + +var Synthetic = {}; + +var Clipboard = {}; + +var Composition = {}; + +var Keyboard = {}; + +var Focus = {}; + +var Form = {}; + +var Mouse = {}; + +var Pointer = {}; + +var $$Selection = {}; + +var $$Touch = {}; + +var UI = {}; + +var Wheel = {}; + +var Media = {}; + +var $$Image = {}; + +var Animation = {}; + +var Transition = {}; + +exports.MakeEventWithType = MakeEventWithType; +exports.Synthetic = Synthetic; +exports.Clipboard = Clipboard; +exports.Composition = Composition; +exports.Keyboard = Keyboard; +exports.Focus = Focus; +exports.Form = Form; +exports.Mouse = Mouse; +exports.Pointer = Pointer; +exports.$$Selection = $$Selection; +exports.$$Touch = $$Touch; +exports.UI = UI; +exports.Wheel = Wheel; +exports.Media = Media; +exports.$$Image = $$Image; +exports.Animation = Animation; +exports.Transition = Transition; +/* No side effect */ diff --git a/lib/js/jsxPPXReactSupport.js b/lib/js/jsxPPXReactSupportC.js similarity index 96% rename from lib/js/jsxPPXReactSupport.js rename to lib/js/jsxPPXReactSupportC.js index bd3b42f95e..5c42e89375 100644 --- a/lib/js/jsxPPXReactSupport.js +++ b/lib/js/jsxPPXReactSupportC.js @@ -19,6 +19,9 @@ function createElementVariadicWithKey(key, component, props, elements) { ]); } +var Jsx; + +exports.Jsx = Jsx; exports.createElementWithKey = createElementWithKey; exports.createElementVariadicWithKey = createElementVariadicWithKey; /* react Not a pure module */ diff --git a/lib/js/jsxPPXReactSupportU.js b/lib/js/jsxPPXReactSupportU.js new file mode 100644 index 0000000000..5c42e89375 --- /dev/null +++ b/lib/js/jsxPPXReactSupportU.js @@ -0,0 +1,27 @@ +'use strict'; + +var React = require("react"); +var Caml_splice_call = require("./caml_splice_call.js"); + +function createElementWithKey(key, component, props) { + return React.createElement(component, key !== undefined ? Object.assign({}, props, { + key: key + }) : props); +} + +function createElementVariadicWithKey(key, component, props, elements) { + return Caml_splice_call.spliceApply(React.createElement, [ + component, + key !== undefined ? Object.assign({}, props, { + key: key + }) : props, + elements + ]); +} + +var Jsx; + +exports.Jsx = Jsx; +exports.createElementWithKey = createElementWithKey; +exports.createElementVariadicWithKey = createElementVariadicWithKey; +/* react Not a pure module */ diff --git a/lib/js/jsxU.js b/lib/js/jsxU.js new file mode 100644 index 0000000000..ae1b9f17e6 --- /dev/null +++ b/lib/js/jsxU.js @@ -0,0 +1 @@ +/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */ diff --git a/lib/js/pervasives.js b/lib/js/pervasives.js index bb83d87084..08d080efaf 100644 --- a/lib/js/pervasives.js +++ b/lib/js/pervasives.js @@ -7,6 +7,12 @@ var Caml_string = require("./caml_string.js"); var Caml_exceptions = require("./caml_exceptions.js"); var Caml_js_exceptions = require("./caml_js_exceptions.js"); +var JsxModules = { + Jsx: undefined, + JsxEvent: undefined, + JsxDOM: undefined +}; + function failwith(s) { throw { RE_EXN_ID: "Failure", @@ -204,6 +210,14 @@ function exit(retcode) { return Caml_sys.sys_exit(retcode); } +var Jsx; + +var JsxEvent; + +var JsxDOM; + +var JsxPPXReactSupport; + var max_int = 2147483647; var infinity = Infinity; @@ -216,6 +230,11 @@ var min_float = 2.22507385850720138e-308; var epsilon_float = 2.22044604925031308e-16; +exports.Jsx = Jsx; +exports.JsxEvent = JsxEvent; +exports.JsxDOM = JsxDOM; +exports.JsxPPXReactSupport = JsxPPXReactSupport; +exports.JsxModules = JsxModules; exports.invalid_arg = invalid_arg; exports.failwith = failwith; exports.Exit = Exit; diff --git a/lib/js/pervasivesU.js b/lib/js/pervasivesU.js index a7923eac9f..d05e80257a 100644 --- a/lib/js/pervasivesU.js +++ b/lib/js/pervasivesU.js @@ -6,7 +6,11 @@ var Caml_string = require("./caml_string.js"); var Caml_exceptions = require("./caml_exceptions.js"); var Caml_js_exceptions = require("./caml_js_exceptions.js"); -var Jsx = {}; +var JsxModules = { + Jsx: undefined, + JsxEvent: undefined, + JsxDOM: undefined +}; function failwith(s) { throw { @@ -205,6 +209,14 @@ function exit(retcode) { return Caml_sys.sys_exit(retcode); } +var Jsx; + +var JsxEvent; + +var JsxDOM; + +var JsxPPXReactSupport; + var max_int = 2147483647; var infinity = Infinity; @@ -218,6 +230,10 @@ var min_float = 2.22507385850720138e-308; var epsilon_float = 2.22044604925031308e-16; exports.Jsx = Jsx; +exports.JsxEvent = JsxEvent; +exports.JsxDOM = JsxDOM; +exports.JsxPPXReactSupport = JsxPPXReactSupport; +exports.JsxModules = JsxModules; exports.invalid_arg = invalid_arg; exports.failwith = failwith; exports.Exit = Exit; diff --git a/packages/artifacts.txt b/packages/artifacts.txt index b4c36b0ee9..6057a77fd3 100644 --- a/packages/artifacts.txt +++ b/packages/artifacts.txt @@ -145,11 +145,15 @@ lib/es6/js_undefined.js lib/es6/js_vector.js lib/es6/js_weakmap.js lib/es6/js_weakset.js -lib/es6/jsx.js -lib/es6/jsxDOM.js +lib/es6/jsxC.js +lib/es6/jsxDOMC.js lib/es6/jsxDOMStyle.js -lib/es6/jsxEvent.js -lib/es6/jsxPPXReactSupport.js +lib/es6/jsxDOMU.js +lib/es6/jsxEventC.js +lib/es6/jsxEventU.js +lib/es6/jsxPPXReactSupportC.js +lib/es6/jsxPPXReactSupportU.js +lib/es6/jsxU.js lib/es6/lazy.js lib/es6/lexing.js lib/es6/list.js @@ -309,11 +313,15 @@ lib/js/js_undefined.js lib/js/js_vector.js lib/js/js_weakmap.js lib/js/js_weakset.js -lib/js/jsx.js -lib/js/jsxDOM.js +lib/js/jsxC.js +lib/js/jsxDOMC.js lib/js/jsxDOMStyle.js -lib/js/jsxEvent.js -lib/js/jsxPPXReactSupport.js +lib/js/jsxDOMU.js +lib/js/jsxEventC.js +lib/js/jsxEventU.js +lib/js/jsxPPXReactSupportC.js +lib/js/jsxPPXReactSupportU.js +lib/js/jsxU.js lib/js/lazy.js lib/js/lexing.js lib/js/list.js @@ -784,21 +792,33 @@ lib/ocaml/js_weakmap.ml lib/ocaml/js_weakset.cmi lib/ocaml/js_weakset.cmt lib/ocaml/js_weakset.ml -lib/ocaml/jsx.cmi -lib/ocaml/jsx.cmt -lib/ocaml/jsx.res -lib/ocaml/jsxDOM.cmi -lib/ocaml/jsxDOM.cmt -lib/ocaml/jsxDOM.res +lib/ocaml/jsxC.cmi +lib/ocaml/jsxC.cmt +lib/ocaml/jsxC.res +lib/ocaml/jsxDOMC.cmi +lib/ocaml/jsxDOMC.cmt +lib/ocaml/jsxDOMC.res lib/ocaml/jsxDOMStyle.cmi lib/ocaml/jsxDOMStyle.cmt lib/ocaml/jsxDOMStyle.res -lib/ocaml/jsxEvent.cmi -lib/ocaml/jsxEvent.cmt -lib/ocaml/jsxEvent.ml -lib/ocaml/jsxPPXReactSupport.cmi -lib/ocaml/jsxPPXReactSupport.cmt -lib/ocaml/jsxPPXReactSupport.res +lib/ocaml/jsxDOMU.cmi +lib/ocaml/jsxDOMU.cmt +lib/ocaml/jsxDOMU.res +lib/ocaml/jsxEventC.cmi +lib/ocaml/jsxEventC.cmt +lib/ocaml/jsxEventC.res +lib/ocaml/jsxEventU.cmi +lib/ocaml/jsxEventU.cmt +lib/ocaml/jsxEventU.res +lib/ocaml/jsxPPXReactSupportC.cmi +lib/ocaml/jsxPPXReactSupportC.cmt +lib/ocaml/jsxPPXReactSupportC.res +lib/ocaml/jsxPPXReactSupportU.cmi +lib/ocaml/jsxPPXReactSupportU.cmt +lib/ocaml/jsxPPXReactSupportU.res +lib/ocaml/jsxU.cmi +lib/ocaml/jsxU.cmt +lib/ocaml/jsxU.res lib/ocaml/lazy.cmi lib/ocaml/lazy.cmt lib/ocaml/lazy.cmti