Attachment #650702 for bug #714130

View | Details | Raw Unified | Return to bug 714130
Collapse All | Expand All

Lines 308-313 if(UNIX) Link Here

(-)a/CMakeLists.txt (-1 / +5 lines)
308	endif()	308	endif()
309	endif()	309	endif()
310		310
		311	check_c_compiler_flag(-fno-common HAVE_FNO_COMMON)
		312	if (HAVE_FNO_COMMON)
		313	add_compile_options(-fno-common)
		314	endif()
		315
311	check_c_compiler_flag(-fdiagnostics-color=auto HAS_DIAG_COLOR_FLAG)	316	check_c_compiler_flag(-fdiagnostics-color=auto HAS_DIAG_COLOR_FLAG)
312	if(HAS_DIAG_COLOR_FLAG)	317	if(HAS_DIAG_COLOR_FLAG)
313	if(CMAKE_GENERATOR MATCHES "Ninja")	318	if(CMAKE_GENERATOR MATCHES "Ninja")
314	ch_before_blocking_events	319	ch_before_blocking_events
315	--
316	src/nvim/msgpack_rpc/channel.h \| 2 +-	320	src/nvim/msgpack_rpc/channel.h \| 2 +-
317	1 file changed, 1 insertion(+), 1 deletion(-)	321	1 file changed, 1 insertion(+), 1 deletion(-)




/// HACK: os/input.c drains this queue immediately before blocking for input.
///       Events on this queue are async-safe, but they need the resolved state
///       of os_inchar(), so they are processed "just-in-time".
EXTERN MultiQueue *ch_before_blocking_events INIT(= NULL);


#ifdef INCLUDE_GENERATED_DECLARATIONS
--
src/nvim/channel.c | 1 -
src/nvim/channel.h | 2 +-
src/nvim/main.c    | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)

Lines 19-25 Link Here

(-)a/src/nvim/channel.c (-1 lines)
19	#include "nvim/ascii.h"	19	#include "nvim/ascii.h"
20		20
21	static bool did_stdio = false;	21	static bool did_stdio = false;
22	PMap(uint64_t) *channels = NULL;
23		22
24	/// next free id for a job or rpc channel	23	/// next free id for a job or rpc channel
25	/// 1 is reserved for stdio channel	24	/// 1 is reserved for stdio channel

Lines 85-91 struct Channel { Link Here

(-)a/src/nvim/channel.h (-1 / +1 lines)
85	bool callback_scheduled;	85	bool callback_scheduled;
86	};	86	};
87		87
88	EXTERN PMap(uint64_t) *channels;	88	EXTERN PMap(uint64_t) *channels INIT(= NULL);
89		89
90	#ifdef INCLUDE_GENERATED_DECLARATIONS	90	#ifdef INCLUDE_GENERATED_DECLARATIONS
91	# include "channel.h.generated.h"	91	# include "channel.h.generated.h"

Lines 10-15 Link Here

(-)a/src/nvim/main.c (-1 / +1 lines)
10	#include <msgpack.h>	10	#include <msgpack.h>
11		11
12	#include "nvim/ascii.h"	12	#include "nvim/ascii.h"
		13	#include "nvim/channel.h"
13	#include "nvim/vim.h"	14	#include "nvim/vim.h"
14	#include "nvim/main.h"	15	#include "nvim/main.h"
15	#include "nvim/aucmd.h"	16	#include "nvim/aucmd.h"
16	--
17	src/nvim/getchar.h \| 4 ++--	17	src/nvim/getchar.h \| 4 ++--
18	1 file changed, 2 insertions(+), 2 deletions(-)	18	1 file changed, 2 insertions(+), 2 deletions(-)




/// Values for "noremap" argument of ins_typebuf()
///
/// Also used for map->m_noremap and menu->noremap[].
enum RemapValues {
  REMAP_YES = 0,  ///< Allow remapping.
  REMAP_NONE = -1,  ///< No remapping.
  REMAP_SCRIPT = -2,  ///< Remap script-local mappings only.
  REMAP_SKIP = -3,  ///< No remapping for first char.
};

// Argument for flush_buffers().
typedef enum {
--
src/nvim/viml/parser/expressions.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)




  } data;
};

enum ExprParserFlags {
  /// Allow multiple expressions in a row: e.g. for :echo
  ///
  /// Parser will still parse only one of them though.

  //     viml_expressions_parser.c, nvim_parse_expression() flags parsing
  //     alongside with its documentation and flag sets in check_parsing()
  //     function in expressions parser functional and unit tests.
};

/// AST error definition
typedef struct {
--
src/nvim/eval/typval.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Lines 33-39 typedef double float_T; Link Here

(-)a/src/nvim/eval/typval.h (-2 / +2 lines)
33	enum { DO_NOT_FREE_CNT = (INT_MAX / 2) };	33	enum { DO_NOT_FREE_CNT = (INT_MAX / 2) };
34		34
35	/// Additional values for tv_list_alloc() len argument	35	/// Additional values for tv_list_alloc() len argument
36	enum {	36	enum ListLenSpecials {
37	/// List length is not known in advance	37	/// List length is not known in advance
38	///	38	///
39	/// To be used when there is neither a way to know how many elements will be	39	/// To be used when there is neither a way to know how many elements will be
Lines 49-55 enum { Link Here
49	///	49	///
50	/// To be used when it looks impractical to determine list length.	50	/// To be used when it looks impractical to determine list length.
51	kListLenMayKnow = -3,	51	kListLenMayKnow = -3,
52	} ListLenSpecials;	52	};
53		53
54	/// Maximal possible value of varnumber_T variable	54	/// Maximal possible value of varnumber_T variable
55	#define VARNUMBER_MAX INT64_MAX	55	#define VARNUMBER_MAX INT64_MAX

Return to bug 714130

Lines 326-332 struct expr_ast_node { Link Here

(-)a/src/nvim/viml/parser/expressions.h (-3 / +2 lines)
326	} data;	326	} data;
327	};	327	};
328		328
329	enum {	329	enum ExprParserFlags {
330	/// Allow multiple expressions in a row: e.g. for :echo	330	/// Allow multiple expressions in a row: e.g. for :echo
331	///	331	///
332	/// Parser will still parse only one of them though.	332	/// Parser will still parse only one of them though.
Lines 345-351 enum { Link Here
345	// viml_expressions_parser.c, nvim_parse_expression() flags parsing	345	// viml_expressions_parser.c, nvim_parse_expression() flags parsing
346	// alongside with its documentation and flag sets in check_parsing()	346	// alongside with its documentation and flag sets in check_parsing()
347	// function in expressions parser functional and unit tests.	347	// function in expressions parser functional and unit tests.
348	} ExprParserFlags;	348	};
349		349
350	/// AST error definition	350	/// AST error definition
351	typedef struct {	351	typedef struct {
352	--
353	src/nvim/eval/typval.h \| 4 ++--	352	src/nvim/eval/typval.h \| 4 ++--
354	1 file changed, 2 insertions(+), 2 deletions(-)	353	1 file changed, 2 insertions(+), 2 deletions(-)

Lines 15-21 Link Here

(-)a/src/nvim/msgpack_rpc/channel.h (-2 / +1 lines)
15	/// HACK: os/input.c drains this queue immediately before blocking for input.	15	/// HACK: os/input.c drains this queue immediately before blocking for input.
16	/// Events on this queue are async-safe, but they need the resolved state	16	/// Events on this queue are async-safe, but they need the resolved state
17	/// of os_inchar(), so they are processed "just-in-time".	17	/// of os_inchar(), so they are processed "just-in-time".
18	MultiQueue *ch_before_blocking_events;	18	EXTERN MultiQueue *ch_before_blocking_events INIT(= NULL);
19		19
20		20
21	#ifdef INCLUDE_GENERATED_DECLARATIONS	21	#ifdef INCLUDE_GENERATED_DECLARATIONS
22	--
23	src/nvim/channel.c \| 1 -	22	src/nvim/channel.c \| 1 -
24	src/nvim/channel.h \| 2 +-	23	src/nvim/channel.h \| 2 +-
25	src/nvim/main.c \| 1 +	24	src/nvim/main.c \| 1 +
26	3 files changed, 2 insertions(+), 2 deletions(-)	25	3 files changed, 2 insertions(+), 2 deletions(-)

Lines 10-21 Link Here

(-)a/src/nvim/getchar.h (-3 / +2 lines)
10	/// Values for "noremap" argument of ins_typebuf()	10	/// Values for "noremap" argument of ins_typebuf()
11	///	11	///
12	/// Also used for map->m_noremap and menu->noremap[].	12	/// Also used for map->m_noremap and menu->noremap[].
13	enum {	13	enum RemapValues {
14	REMAP_YES = 0, ///< Allow remapping.	14	REMAP_YES = 0, ///< Allow remapping.
15	REMAP_NONE = -1, ///< No remapping.	15	REMAP_NONE = -1, ///< No remapping.
16	REMAP_SCRIPT = -2, ///< Remap script-local mappings only.	16	REMAP_SCRIPT = -2, ///< Remap script-local mappings only.
17	REMAP_SKIP = -3, ///< No remapping for first char.	17	REMAP_SKIP = -3, ///< No remapping for first char.
18	} RemapValues;	18	};
19		19
20	// Argument for flush_buffers().	20	// Argument for flush_buffers().
21	typedef enum {	21	typedef enum {
22	--
23	src/nvim/viml/parser/expressions.h \| 4 ++--	22	src/nvim/viml/parser/expressions.h \| 4 ++--
24	1 file changed, 2 insertions(+), 2 deletions(-)	23	1 file changed, 2 insertions(+), 2 deletions(-)