Commit Graph

160 Commits

Author SHA1 Message Date
Jérémie Dimino b721aa054b fix the split_words function in uTop.ml 2013-05-17 19:39:14 +01:00
Jeremie Dimino c1ec47d83e follow type aliases 2013-04-26 14:14:11 +01:00
Jeremie Dimino c1bb8be73f always show the box for backward search 2013-04-26 09:57:41 +01:00
Jeremie Dimino 8da5b260fa add an option to hide the completion bar 2013-04-26 09:53:59 +01:00
Jérémie Dimino 725c6b0327 Merge pull request #8 from benkard/input-multi
Add multi-phrase input
2013-04-14 09:51:44 -07:00
Matthias Andreas Benkard c9e89f0079 Emacs: Enable the use of multi-phrase input on startup. 2013-04-14 14:01:40 +02:00
Matthias Andreas Benkard 244c6cfe01 Apply maintainer's suggestions. 2013-04-14 13:32:04 +02:00
Jérémie Dimino e8c1b5f8ca change the '$' character in the prompt to '#' to match the standard
toplevel.
2013-04-05 17:21:50 +01:00
Matthias Andreas Benkard 9deca3da21 `input-multi`: Fix error highlighting. 2013-04-03 22:53:12 +02:00
Matthias Andreas Benkard 3c10f874bc Support the `input-multi` command on the Emacs side. 2013-04-03 22:03:18 +02:00
Matthias Andreas Benkard 022a271565 Fix a typo. 2013-04-03 22:02:56 +02:00
Matthias Andreas Benkard 4db7da7a4c uTop_main: Handle `input-multi` commands. 2013-04-03 21:21:57 +02:00
Matthias Andreas Benkard bef8cb8fed Add function `parse_use_file`. 2013-04-03 21:21:52 +02:00
Jérémie Dimino 7e7116ca9d fix detection of eof reaching when using camlp4 2013-03-09 19:15:14 +00:00
Jérémie Dimino 5123624b63 automatically load camlp4 when needed 2013-03-09 18:44:57 +00:00
Jeremie Dimino ae1636cf45 added the option -show-reserved to disable [hide_reserved] 2013-02-06 17:27:09 -05:00
Jeremie Dimino 8da31fbdce allow to hide identifiers starting with a '_'
Enabled by default.
2013-02-06 17:22:03 -05:00
Jeremie Dimino 77e525d17a make sure -short-paths is the default with ocaml >= 4.01.0 2013-01-29 15:02:52 -05:00
Jeremie Dimino b166bf9d17 added the command line option -short-paths for ocaml >= 4.01.0 2013-01-29 14:20:31 -05:00
Jeremie Dimino 9d5578d6f8 refactoring of expression rewriting
Ignore-this: 3713a9bc8818619cb8fa0afdc14d6a41

- factorize the code between lwt and async stuff
- handle type aliases

darcs-hash:20121015094544-c41ad-167ffe2a9f5ecb8973914e9e57b9879c09f561af
2012-10-15 11:45:44 +02:00
Jeremie Dimino 6574b1252e remove local variables from uTop_main.ml
Ignore-this: fec887057546e3d42782e2fb33a18bad

darcs-hash:20121015080512-c41ad-c684ef7b334e14ab95b71b85eb827a0aee0d153a
2012-10-15 10:05:12 +02:00
anil 98421358fd async-autorun
Ignore-this: d1d8552acc992f5825101d2a81d29e13
Detect statements that have an Async Deferred type and run them in a
separate thread that blocks the top-level until completed.  This is
similar to the Lwt patch, except that the Deferred types may have a
few more type aliases, and must be wrapped into a unit closure.

darcs-hash:20121015060259-b29a9-51a32b2a217d3097169e5ad9ba4f222227426a79
2012-10-15 08:02:59 +02:00
wojciech.meyer ee65d72abd Showing type of an identifier at point
Ignore-this: 40b69923375d0ccdf6b1a98891b1bca6

darcs-hash:20120801020653-33bd9-7e0a38b19718bfe0965d9570388f9f5cb74dda48
2012-08-01 04:06:53 +02:00
wojciech.meyer 354b6d774a Allow C-j to eval with auto-end
Ignore-this: 8cd09eabbc6b9d5483a5aa380e2cb278

darcs-hash:20120801001337-33bd9-a5d76dab972820c41fc2beb40818a98013f111c6
2012-08-01 02:13:37 +02:00
wojciech.meyer 718fb69db1 Print only OCaml preprocessor message loaded if it was really loaded
Ignore-this: b96ea788d929cf7dbb853adfa59e4213

darcs-hash:20120731235343-33bd9-711df107c2b3b4580c0c37fe8271e732a4caeada
2012-08-01 01:53:43 +02:00
wojciech.meyer e4796c8e51 car $ cdr -> cadr
Ignore-this: 2b5aa46e42282ee30710daaf8d735116

darcs-hash:20120731235124-33bd9-9fd2bf3a358e2ed54eac23aaa56df50ece816004
2012-08-01 01:51:24 +02:00
wojciech.meyer 63bf082195 Add also pre-processor to file local variables in uTop_main as a proof of concept
Ignore-this: 930ca27ff89052f1d8d42e0f7d01fd88

darcs-hash:20120731235039-33bd9-bcc756ab753b24f1f776442a4276609e0d051e89
2012-08-01 01:50:39 +02:00
wojciech.meyer 272f6f5c29 utop-ocaml-preprocessor - allow loading also pre-procesor from local file variables
Ignore-this: 50e32972f422612675d47fd9ce33fc43

darcs-hash:20120731234941-33bd9-16a892de7fff014771091a9a138380d665bdadd9
2012-08-01 01:49:41 +02:00
wojciech.meyer 5a47685bfb Factor out code to utop-eval-string
Ignore-this: 42d0ac92ee18eb0a7865743fe5058a5c

darcs-hash:20120731234841-33bd9-68f9230ddc9e8f41b48efa62dd9d048f2ae506d4
2012-08-01 01:48:41 +02:00
wojciech.meyer 82cccd480a Improvements for loading packages from the file local variables
Ignore-this: 8795ff387135ceb2b99ff8ae7f322875

darcs-hash:20120731231800-33bd9-adf29b40d61f7f63be893a8473edb6e77863b930
2012-08-01 01:18:00 +02:00
Jeremie Dimino 2691c736ef allow to complete text in a tuareg buffer using the toplevel environment
Ignore-this: cdb99a49351689dc70386cf39083709

darcs-hash:20120716154000-c41ad-eac5e3f59960f62c93e1cf27f8e1ce982d9f9b95
2012-07-16 17:40:00 +02:00
Jeremie Dimino 0d5e593728 add support the caml-mode
Ignore-this: b691ce8780c5d177ab69d0f00b521e5c

darcs-hash:20120716151404-c41ad-658717281b5b9ce73a0e5ac9cc219d700d8aee2a
2012-07-16 17:14:04 +02:00
Jeremie Dimino 51f7caafb5 adjustments for ocaml 4
Ignore-this: 8dcb773296b6ac7a6e83bb0b00f6697f

darcs-hash:20120615142321-c41ad-563f6c26dba5a942182e86a369167547ffbff121
2012-06-15 16:23:21 +02:00
Jeremie Dimino d74d29278d escape parentheses at beginning of lines in strings in .el files
Ignore-this: f8adf18e5730136895bd607cc270ef43

It seems to confuse the emacs syntax highlighter...

darcs-hash:20120323193634-c41ad-fcb6a026bc31ae4fd3b6148af46744e51a82b86f
2012-03-23 20:36:34 +01:00
Jeremie Dimino cfb648c2e1 decide whether to follow output in each windows instead of globally
Ignore-this: 36cd9d3b8cd1a4c41284ea8d0731506f

darcs-hash:20120322065232-c41ad-218be51b177171f6640703e504599079d8c10006
2012-03-22 07:52:32 +01:00
Jeremie Dimino 8d8f46c8b6 follow OCaml's output only if we are at the end of the buffer
Ignore-this: 739f69390b4952091f481cc8dfb3e144

darcs-hash:20120322064548-c41ad-a3383dfe0bfa362d15c06949cbf5c9b44c5a82d1
2012-03-22 07:45:48 +01:00
Jeremie Dimino 0fbf0ff84b fix utop-eval-input with allow-incomplete=t when the point is before the prompt
Ignore-this: a3dc2b3421588911f2770105081a8355

darcs-hash:20120321231655-c41ad-166ae6880230aa1f4d4eb616d221622523081c99
2012-03-22 00:16:55 +01:00
wojciech.meyer 11cf629c46 Basic functionality is almost there, however still plenty to make it production quality. In this changeset I regenerated setup.ml via. oasis 3 so it contains a huge diff.
Ignore-this: 357d4c82baa1ecdf5c49bf65459059e9

darcs-hash:20120321031530-33bd9-43e454ae62709103edfb0208e7ab95a5319ae93a
2012-03-21 04:15:30 +01:00
Jeremie Dimino 4264dc3d92 follow OCaml's output in emacs
Ignore-this: 20e2a63a90783cbcfbe273732293188b

darcs-hash:20120321131824-c41ad-cf97daa2d551f812603bc30f955a94d0e39478e1
2012-03-21 14:18:24 +01:00
Jeremie Dimino 543b99ab35 fix utop-send-string
Ignore-this: a638b987e583c642e076ecc1b8a159b1

It was always calling (utop) so the utop buffer always stole the
focus.

darcs-hash:20120318015443-c41ad-21c1d8a51b532c5bb783fb3272e64b3908e43df4
2012-03-18 02:54:43 +01:00
Jeremie Dimino 241e00d0a6 typo
Ignore-this: 93bcb3455b94dde47d1912bbb29750a7

darcs-hash:20120318012709-c41ad-54bc2df05955ac06897efb4406c77bc3918b09cb
2012-03-18 02:27:09 +01:00
wojciech.meyer a2acfb5a87 Small improvement
Ignore-this: f8bd21d0a948e37a9697ecddcde9ed7c

darcs-hash:20120315032047-33bd9-9931fb1c2c888b42466734f89b69f2010379d2eb
2012-03-15 04:20:47 +01:00
wojciech.meyer 0b4d9c8ce3 Now it's possible to load packages defined with the file variable utop-package-list, therefore they can be loaded at startup to the toplevel. Desirable user interface has been implemented as part of it. To enable put something like:
Ignore-this: cd594a9e2a71feadba95000a15838d82

(add-hook 'typerex-mode-hook 'utop-setup-ocaml-buffer)
(add-hook 'hack-local-variables-hook 'utop-query-load-package-list)

in your .emacs

darcs-hash:20120315031645-33bd9-c602dacabd15aaa3a63fd3c4146e7f81f16e567d
2012-03-15 04:16:45 +01:00
wojciech.meyer 4d78acb1bd Some cleanup
Ignore-this: 9623774e874ab9d118b1367aedee8788

darcs-hash:20120315015621-33bd9-351724bd992d32eb1885eaa69b83f9cce8684da1
2012-03-15 02:56:21 +01:00
wojciech.meyer afe9eed0b0 antiquote argument in macro
Ignore-this: 737b25283081ca375d7556539b89b6d8

darcs-hash:20120304123503-33bd9-23cae46c3a4812afa3104319891acf339f0489d2
2012-03-04 13:35:03 +01:00
wojciech.meyer da70c2bc46 copy to kill-ring last input
Ignore-this: 7fda2e532886b8dcbeac63bcb55ccc7e

darcs-hash:20120304022214-33bd9-0efeff0f0392361f8f327a1a7d2cbda0f2c951a4
2012-03-04 03:22:14 +01:00
wojciech.meyer cd033960ed bytecode compilation warning
Ignore-this: 96677670231e022f57ee2b180bfedb0f

darcs-hash:20120303231227-33bd9-a209e018067f92b81cd65fc3320fa8b47ce8a769
2012-03-04 00:12:27 +01:00
wojciech.meyer c83560e01f packages are in reversed order - fix that
Ignore-this: b322415cad374af853e936bccd2cb27b

darcs-hash:20120303225038-33bd9-7850599bceca75a02dd3fb7a508aa4008f6e3271
2012-03-03 23:50:38 +01:00
wojciech.meyer 0db2c4d588 utop arguments is taken via utop-query-arguments
Ignore-this: 8d0bb0b0ca55ace93e0f5a239b09cddd

darcs-hash:20120303224903-33bd9-ce492fbcb62a1efcf72c82cb032f7760aaf19e53
2012-03-03 23:49:03 +01:00
wojciech.meyer ce6525ad79 replace ad-hoc building of code in macros with quoted lists
Ignore-this: ec3137b5fe4c2d641d152bb77b4a7e64

darcs-hash:20120303224350-33bd9-a723683f6c5cb79023a7ff056bf5279cd64b72ee
2012-03-03 23:43:50 +01:00