Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 463720 | Differences between
and this patch

Collapse All | Expand All

(-)vala-0.16.1.orig/vala/valagirparser.c (-56 / +66 lines)
Lines 10294-10300 Link Here
10294
	ValaClass* _tmp34_;
10294
	ValaClass* _tmp34_;
10295
	ValaGirComment* _tmp35_ = NULL;
10295
	ValaGirComment* _tmp35_ = NULL;
10296
	ValaGirComment* _tmp36_;
10296
	ValaGirComment* _tmp36_;
10297
	const gchar* _tmp61_;
10297
	const gchar* _tmp64_;
10298
	g_return_if_fail (self != NULL);
10298
	g_return_if_fail (self != NULL);
10299
	g_return_if_fail (element_name != NULL);
10299
	g_return_if_fail (element_name != NULL);
10300
	_tmp0_ = element_name;
10300
	_tmp0_ = element_name;
Lines 10391-10468 Link Here
10391
	_vala_comment_unref0 (_tmp36_);
10391
	_vala_comment_unref0 (_tmp36_);
10392
	while (TRUE) {
10392
	while (TRUE) {
10393
		ValaMarkupTokenType _tmp37_;
10393
		ValaMarkupTokenType _tmp37_;
10394
		gboolean _tmp38_ = FALSE;
10394
		ValaMarkupReader* _tmp38_;
10395
		ValaMarkupReader* _tmp39_;
10395
		const gchar* _tmp39_;
10396
		const gchar* _tmp40_;
10396
		const gchar* _tmp40_;
10397
		const gchar* _tmp41_;
10397
		gboolean _tmp41_ = FALSE;
10398
		ValaMarkupReader* _tmp42_;
10399
		const gchar* _tmp43_;
10400
		const gchar* _tmp44_;
10398
		_tmp37_ = self->priv->current_token;
10401
		_tmp37_ = self->priv->current_token;
10399
		if (!(_tmp37_ == VALA_MARKUP_TOKEN_TYPE_START_ELEMENT)) {
10402
		if (!(_tmp37_ == VALA_MARKUP_TOKEN_TYPE_START_ELEMENT)) {
10400
			break;
10403
			break;
10401
		}
10404
		}
10402
		_tmp38_ = vala_gir_parser_push_metadata (self);
10405
		_tmp38_ = self->priv->reader;
10403
		if (!_tmp38_) {
10406
		_tmp39_ = vala_markup_reader_get_name (_tmp38_);
10407
		_tmp40_ = _tmp39_;
10408
		if (g_strcmp0 (_tmp40_, "instance-parameter") == 0) {
10404
			vala_gir_parser_skip_element (self);
10409
			vala_gir_parser_skip_element (self);
10405
			continue;
10410
			continue;
10406
		}
10411
		}
10407
		_tmp39_ = self->priv->reader;
10412
		_tmp41_ = vala_gir_parser_push_metadata (self);
10408
		_tmp40_ = vala_markup_reader_get_name (_tmp39_);
10413
		if (!_tmp41_) {
10409
		_tmp41_ = _tmp40_;
10414
			vala_gir_parser_skip_element (self);
10410
		if (g_strcmp0 (_tmp41_, "field") == 0) {
10415
			continue;
10416
		}
10417
		_tmp42_ = self->priv->reader;
10418
		_tmp43_ = vala_markup_reader_get_name (_tmp42_);
10419
		_tmp44_ = _tmp43_;
10420
		if (g_strcmp0 (_tmp44_, "field") == 0) {
10411
			vala_gir_parser_parse_field (self);
10421
			vala_gir_parser_parse_field (self);
10412
		} else {
10422
		} else {
10413
			ValaMarkupReader* _tmp42_;
10423
			ValaMarkupReader* _tmp45_;
10414
			const gchar* _tmp43_;
10424
			const gchar* _tmp46_;
10415
			const gchar* _tmp44_;
10425
			const gchar* _tmp47_;
10416
			_tmp42_ = self->priv->reader;
10426
			_tmp45_ = self->priv->reader;
10417
			_tmp43_ = vala_markup_reader_get_name (_tmp42_);
10427
			_tmp46_ = vala_markup_reader_get_name (_tmp45_);
10418
			_tmp44_ = _tmp43_;
10428
			_tmp47_ = _tmp46_;
10419
			if (g_strcmp0 (_tmp44_, "constructor") == 0) {
10429
			if (g_strcmp0 (_tmp47_, "constructor") == 0) {
10420
				vala_gir_parser_parse_constructor (self);
10430
				vala_gir_parser_parse_constructor (self);
10421
			} else {
10431
			} else {
10422
				ValaMarkupReader* _tmp45_;
10432
				ValaMarkupReader* _tmp48_;
10423
				const gchar* _tmp46_;
10433
				const gchar* _tmp49_;
10424
				const gchar* _tmp47_;
10434
				const gchar* _tmp50_;
10425
				_tmp45_ = self->priv->reader;
10435
				_tmp48_ = self->priv->reader;
10426
				_tmp46_ = vala_markup_reader_get_name (_tmp45_);
10436
				_tmp49_ = vala_markup_reader_get_name (_tmp48_);
10427
				_tmp47_ = _tmp46_;
10437
				_tmp50_ = _tmp49_;
10428
				if (g_strcmp0 (_tmp47_, "method") == 0) {
10438
				if (g_strcmp0 (_tmp50_, "method") == 0) {
10429
					vala_gir_parser_parse_method (self, "method");
10439
					vala_gir_parser_parse_method (self, "method");
10430
				} else {
10440
				} else {
10431
					ValaMarkupReader* _tmp48_;
10441
					ValaMarkupReader* _tmp51_;
10432
					const gchar* _tmp49_;
10442
					const gchar* _tmp52_;
10433
					const gchar* _tmp50_;
10443
					const gchar* _tmp53_;
10434
					_tmp48_ = self->priv->reader;
10444
					_tmp51_ = self->priv->reader;
10435
					_tmp49_ = vala_markup_reader_get_name (_tmp48_);
10445
					_tmp52_ = vala_markup_reader_get_name (_tmp51_);
10436
					_tmp50_ = _tmp49_;
10446
					_tmp53_ = _tmp52_;
10437
					if (g_strcmp0 (_tmp50_, "function") == 0) {
10447
					if (g_strcmp0 (_tmp53_, "function") == 0) {
10438
						vala_gir_parser_skip_element (self);
10448
						vala_gir_parser_skip_element (self);
10439
					} else {
10449
					} else {
10440
						ValaMarkupReader* _tmp51_;
10450
						ValaMarkupReader* _tmp54_;
10441
						const gchar* _tmp52_;
10451
						const gchar* _tmp55_;
10442
						const gchar* _tmp53_;
10452
						const gchar* _tmp56_;
10443
						_tmp51_ = self->priv->reader;
10453
						_tmp54_ = self->priv->reader;
10444
						_tmp52_ = vala_markup_reader_get_name (_tmp51_);
10454
						_tmp55_ = vala_markup_reader_get_name (_tmp54_);
10445
						_tmp53_ = _tmp52_;
10455
						_tmp56_ = _tmp55_;
10446
						if (g_strcmp0 (_tmp53_, "union") == 0) {
10456
						if (g_strcmp0 (_tmp56_, "union") == 0) {
10447
							vala_gir_parser_parse_union (self);
10457
							vala_gir_parser_parse_union (self);
10448
						} else {
10458
						} else {
10449
							ValaSourceReference* _tmp54_ = NULL;
10459
							ValaSourceReference* _tmp57_ = NULL;
10450
							ValaSourceReference* _tmp55_;
10460
							ValaSourceReference* _tmp58_;
10451
							ValaMarkupReader* _tmp56_;
10461
							ValaMarkupReader* _tmp59_;
10452
							const gchar* _tmp57_;
10462
							const gchar* _tmp60_;
10453
							const gchar* _tmp58_;
10463
							const gchar* _tmp61_;
10454
							gchar* _tmp59_ = NULL;
10464
							gchar* _tmp62_ = NULL;
10455
							gchar* _tmp60_;
10465
							gchar* _tmp63_;
10456
							_tmp54_ = vala_gir_parser_get_current_src (self);
10466
							_tmp57_ = vala_gir_parser_get_current_src (self);
10457
							_tmp55_ = _tmp54_;
10458
							_tmp56_ = self->priv->reader;
10459
							_tmp57_ = vala_markup_reader_get_name (_tmp56_);
10460
							_tmp58_ = _tmp57_;
10467
							_tmp58_ = _tmp57_;
10461
							_tmp59_ = g_strdup_printf ("unknown child element `%s' in `class'", _tmp58_);
10468
							_tmp59_ = self->priv->reader;
10462
							_tmp60_ = _tmp59_;
10469
							_tmp60_ = vala_markup_reader_get_name (_tmp59_);
10463
							vala_report_error (_tmp55_, _tmp60_);
10470
							_tmp61_ = _tmp60_;
10464
							_g_free0 (_tmp60_);
10471
							_tmp62_ = g_strdup_printf ("unknown child element `%s' in `class'", _tmp61_);
10465
							_vala_source_reference_unref0 (_tmp55_);
10472
							_tmp63_ = _tmp62_;
10473
							vala_report_error (_tmp58_, _tmp63_);
10474
							_g_free0 (_tmp63_);
10475
							_vala_source_reference_unref0 (_tmp58_);
10466
							vala_gir_parser_skip_element (self);
10476
							vala_gir_parser_skip_element (self);
10467
						}
10477
						}
10468
					}
10478
					}
Lines 10472-10479 Link Here
10472
		vala_gir_parser_pop_metadata (self);
10482
		vala_gir_parser_pop_metadata (self);
10473
	}
10483
	}
10474
	vala_gir_parser_pop_node (self);
10484
	vala_gir_parser_pop_node (self);
10475
	_tmp61_ = element_name;
10485
	_tmp64_ = element_name;
10476
	vala_gir_parser_end_element (self, _tmp61_);
10486
	vala_gir_parser_end_element (self, _tmp64_);
10477
	_vala_code_node_unref0 (cl);
10487
	_vala_code_node_unref0 (cl);
10478
	_g_free0 (name);
10488
	_g_free0 (name);
10479
}
10489
}

Return to bug 463720