Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2022-04-11 23:47:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Mon Apr 11 23:47:10 2022 rev:83 rq:968165 version:5.93.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2022-03-14 19:35:52.846041091 +0100 +++ /work/SRC/openSUSE:Factory/.kholidays.new.1900/kholidays.changes 2022-04-11 23:48:30.267577221 +0200 @@ -1,0 +2,13 @@ +Sun Apr 3 10:47:13 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.93.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.93.0 +- Changes since 5.92.0: + * Require unittests to pass for CI jobs to pass + * All values of category get read from holiday file + * Unreliable print of solstice in holidays + * Remove double entries and correct indian- national calendar (kde#441275) + +------------------------------------------------------------------- Old: ---- kholidays-5.92.0.tar.xz kholidays-5.92.0.tar.xz.sig New: ---- kholidays-5.93.0.tar.xz kholidays-5.93.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.gE0kwm/_old 2022-04-11 23:48:30.747571734 +0200 +++ /var/tmp/diff_new_pack.gE0kwm/_new 2022-04-11 23:48:30.751571689 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Holidays5 -%define _tar_path 5.92 +%define _tar_path 5.93 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kholidays -Version: 5.92.0 +Version: 5.93.0 Release: 0 Summary: Holiday calculation library License: LGPL-2.1-or-later ++++++ kholidays-5.92.0.tar.xz -> kholidays-5.93.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/.kde-ci.yml new/kholidays-5.93.0/.kde-ci.yml --- old/kholidays-5.92.0/.kde-ci.yml 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/.kde-ci.yml 2022-04-02 12:20:47.000000000 +0200 @@ -5,3 +5,4 @@ Options: test-before-installing: True + require-passing-tests-on: [ 'Linux', 'FreeBSD' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/CMakeLists.txt new/kholidays-5.93.0/CMakeLists.txt --- old/kholidays-5.92.0/CMakeLists.txt 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/CMakeLists.txt 2022-04-02 12:20:47.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.92.0") +set(KF_VERSION "5.93.0") project(KHolidays VERSION ${KF_VERSION}) -find_package(ECM 5.92.0 REQUIRED NO_MODULE) +find_package(ECM 5.93.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_AUTORCC ON) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/autotests/holiday_calendar_systems new/kholidays-5.93.0/autotests/holiday_calendar_systems --- old/kholidays-5.92.0/autotests/holiday_calendar_systems 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-5.93.0/autotests/holiday_calendar_systems 2022-04-02 12:20:47.000000000 +0200 @@ -0,0 +1,22 @@ +: +: test holiday file. +: + +: Metadata Section + +: Country Code for file if for a country, blank otherwise +country "" +: Language Code for language holiday names are in, optional +language "" +: Short name for holiday file to override region name for display to users, optional +name "Multiple Calendar Systems" +: Description for holiday file for display to users, optional +description "A test file for multiple calendar systems" + +: Holiday List Section + +"New Years Day00" public religious seasonal cultural civil on 1/1 +"New Years Day01 seasonal" seasonal public on 1/1 +"Bangla New Year" public cultural indiannational vaishakh 1 + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/autotests/holiday_solstice_in_holidays new/kholidays-5.93.0/autotests/holiday_solstice_in_holidays --- old/kholidays-5.92.0/autotests/holiday_solstice_in_holidays 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-5.93.0/autotests/holiday_solstice_in_holidays 2022-04-02 12:20:47.000000000 +0200 @@ -0,0 +1,20 @@ +: +: test holiday file. +: + +: Metadata Section + +: Country Code for file if for a country, blank otherwise +country "" +: Language Code for language holiday names are in, optional +language "" +: Short name for holiday file to override region name for display to users, optional +name "Solstice in normal holidays" +: Description for holiday file for display to users, optional +description "A test file for solstice in normal holiday calendar" + +: Holiday List Section + +"New Years" public on 1/1 + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/autotests/testholidayregion.cpp new/kholidays-5.93.0/autotests/testholidayregion.cpp --- old/kholidays-5.92.0/autotests/testholidayregion.cpp 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/autotests/testholidayregion.cpp 2022-04-02 12:20:47.000000000 +0200 @@ -35,7 +35,8 @@ { if (!holidays.isEmpty()) { for (const KHolidays::Holiday &holiday : holidays) { - qDebug() << "Date = " << holiday.observedStartDate().toString(Qt::ISODate) << " Duration = " << holiday.duration() << " Name = " << holiday.name(); + qDebug() << "Date = " << holiday.observedStartDate().toString(Qt::ISODate) << " Duration = " << holiday.duration() << " Name = " << holiday.name() + << " category = " << holiday.categoryList(); } } else { qDebug() << "No holidays"; @@ -64,17 +65,31 @@ qDebug() << ""; } +void HolidayRegionTest::testLoadFileCalendarSystems() +{ + KHolidays::HolidayRegion region(QFileInfo(KDESRCDIR "/holiday_calendar_systems")); + printMetadata(region); + parseRegionCalendarYear(region, 2020, QStringLiteral("gregorian")); + parseRegionCalendarYear(region, 2020); + parseRegionCalendarYear(region, 2021); + parseRegionCalendarYear(region, 2022); + parseRegionCalendarYear(region, 2023); + parseRegionCalendarYear(region, 2024); + parseRegionCalendarYear(region, 2025); + qDebug() << ""; +} + void HolidayRegionTest::testLoadFile() { KHolidays::HolidayRegion region(QFileInfo(KDESRCDIR "/holiday_gb-eaw_en-gb_Test")); printMetadata(region); - parseRegionCalendarYear(region, 2010, QStringLiteral("gregorian")); - parseRegionCalendarYear(region, 2010); - parseRegionCalendarYear(region, 2011); - parseRegionCalendarYear(region, 2012); - parseRegionCalendarYear(region, 2013); - parseRegionCalendarYear(region, 2014); - parseRegionCalendarYear(region, 2015); + parseRegionCalendarYear(region, 2020, QStringLiteral("gregorian")); + parseRegionCalendarYear(region, 2020); + parseRegionCalendarYear(region, 2021); + parseRegionCalendarYear(region, 2022); + parseRegionCalendarYear(region, 2023); + parseRegionCalendarYear(region, 2024); + parseRegionCalendarYear(region, 2025); qDebug() << ""; } @@ -82,40 +97,40 @@ { KHolidays::HolidayRegion region(QStringLiteral("gb-eaw_en-gb")); printMetadata(region); - parseRegionDateRange(region, QDate(2010, 7, 1), QDate(2011, 6, 30)); - parseRegionDateRange(region, QDate(2010, 1, 1), QDate(2012, 12, 31)); - parseRegionDateRange(region, QDate(2010, 1, 1), QDate(2010, 12, 31)); - parseRegionDate(region, QDate(2010, 1, 1)); - parseRegionCalendarYear(region, 2010); - parseRegionCalendarYear(region, 2011); - parseRegionCalendarYear(region, 2012); - parseRegionCalendarYear(region, 2013); - parseRegionCalendarYear(region, 2014); - parseRegionCalendarYear(region, 2015); + parseRegionDateRange(region, QDate(2020, 7, 1), QDate(2021, 6, 30)); + parseRegionDateRange(region, QDate(2020, 1, 1), QDate(2022, 12, 31)); + parseRegionDateRange(region, QDate(2020, 1, 1), QDate(2020, 12, 31)); + parseRegionDate(region, QDate(2020, 1, 1)); + parseRegionCalendarYear(region, 2020); + parseRegionCalendarYear(region, 2021); + parseRegionCalendarYear(region, 2022); + parseRegionCalendarYear(region, 2023); + parseRegionCalendarYear(region, 2024); + parseRegionCalendarYear(region, 2025); } void HolidayRegionTest::testIran() { KHolidays::HolidayRegion region(QStringLiteral("ir_en-us")); printMetadata(region); - parseRegionCalendarYear(region, 2010); - parseRegionCalendarYear(region, 2011); - parseRegionCalendarYear(region, 2012); - parseRegionCalendarYear(region, 2013); - parseRegionCalendarYear(region, 2014); - parseRegionCalendarYear(region, 2015); + parseRegionCalendarYear(region, 2020); + parseRegionCalendarYear(region, 2021); + parseRegionCalendarYear(region, 2022); + parseRegionCalendarYear(region, 2023); + parseRegionCalendarYear(region, 2024); + parseRegionCalendarYear(region, 2025); } void HolidayRegionTest::testIsrael() { KHolidays::HolidayRegion region(QStringLiteral("il_en-us")); printMetadata(region); - parseRegionCalendarYear(region, 2010); - parseRegionCalendarYear(region, 2011); - parseRegionCalendarYear(region, 2012); - parseRegionCalendarYear(region, 2013); - parseRegionCalendarYear(region, 2014); - parseRegionCalendarYear(region, 2015); + parseRegionCalendarYear(region, 2020); + parseRegionCalendarYear(region, 2021); + parseRegionCalendarYear(region, 2022); + parseRegionCalendarYear(region, 2023); + parseRegionCalendarYear(region, 2024); + parseRegionCalendarYear(region, 2025); } void HolidayRegionTest::testRegions() @@ -152,3 +167,14 @@ QCOMPARE(KHolidays::HolidayRegion::defaultRegionCode("AT-9"), QLatin1String("at_de")); QCOMPARE(KHolidays::HolidayRegion::defaultRegionCode("US-CA"), QLatin1String("us_en-us")); } + +void HolidayRegionTest::testSolistaleInHolidays() +{ + KHolidays::HolidayRegion region(QFileInfo(KDESRCDIR "/holiday_solstice_in_holidays")); + printMetadata(region); + parseRegionDateRange(region, QDate(2020, 7, 1), QDate(2021, 6, 30)); + parseRegionDateRange(region, QDate(2020, 1, 1), QDate(2020, 12, 31)); + parseRegionDateRange(region, QDate(2020, 11, 1), QDate(2021, 1, 2)); + parseRegionDateRange(region, QDate(2020, 12, 25), QDate(2021, 7, 2)); + parseRegionDateRange(region, QDate(2020, 12, 25), QDate(2022, 1, 2)); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/autotests/testholidayregion.h new/kholidays-5.93.0/autotests/testholidayregion.h --- old/kholidays-5.92.0/autotests/testholidayregion.h 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/autotests/testholidayregion.h 2022-04-02 12:20:47.000000000 +0200 @@ -20,12 +20,14 @@ { Q_OBJECT private Q_SLOTS: + void testLoadFileCalendarSystems(); void testLoadFile(); void testGb(); void testIran(); void testIsrael(); void testRegions(); void testDefaultRegions(); + void testSolistaleInHolidays(); private: void printMetadata(const KHolidays::HolidayRegion ®ion); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/po/ca/libkholidays5_qt.po new/kholidays-5.93.0/po/ca/libkholidays5_qt.po --- old/kholidays-5.92.0/po/ca/libkholidays5_qt.po 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/po/ca/libkholidays5_qt.po 2022-04-02 12:20:47.000000000 +0200 @@ -7,6 +7,7 @@ # Josep M. Ferrer <[email protected]>, 2007, 2009, 2010, 2012, 2014, 2015, 2020, 2021. # Manuel Tortosa Moreno <[email protected]>, 2010. # Antoni Bella P??rez <[email protected]>, 2014. +# Empar Montoro Mart??n <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: kholidays\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/po/ca@valencia/libkholidays5_qt.po new/kholidays-5.93.0/po/ca@valencia/libkholidays5_qt.po --- old/kholidays-5.92.0/po/ca@valencia/libkholidays5_qt.po 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/po/ca@valencia/libkholidays5_qt.po 2022-04-02 12:20:47.000000000 +0200 @@ -1,10 +1,10 @@ # Translation of libkholidays5_qt.po to Catalan (Valencian) -# Copyright (C) 2005-2019 This_file_is_part_of_KDE +# Copyright (C) 2005-2021 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Albert Astals Cid <[email protected]>, 2005. -# Josep M. Ferrer <[email protected]>, 2007, 2009, 2010, 2012, 2014, 2015. +# Josep M. Ferrer <[email protected]>, 2007, 2009, 2010, 2012, 2014, 2015, 2020, 2021. # Manuel Tortosa Moreno <[email protected]>, 2010. # Antoni Bella P??rez <[email protected]>, 2014. # Empar Montoro Mart??n <[email protected]>, 2019. @@ -13,18 +13,17 @@ "Project-Id-Version: kholidays\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2015-06-13 09:34+0000\n" -"PO-Revision-Date: 2019-06-18 07:50+0200\n" -"Last-Translator: Empar Montoro Mart??n <[email protected]>\n" +"PO-Revision-Date: 2021-11-07 20:49+0100\n" +"Last-Translator: Josep M. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 20.12.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Poedit 2.0.6\n" "X-Qt-Contexts: true\n" -"X-Project-Style: kde\n" #: astroseasons.cpp:139 msgctxt "AstroSeasons|" @@ -52,77 +51,74 @@ msgstr "Quebec" #: holidayregion.cpp:889 -#, fuzzy -#| msgctxt "HolidayRegion|German region" -#| msgid "Bavaria" msgctxt "HolidayRegion|German region" msgid "Germany, Bavaria" -msgstr "Baviera" +msgstr "Alemanya, Baviera" #: holidayregion.cpp:891 msgctxt "HolidayRegion|German region" msgid "Germany, Brandenburg" -msgstr "" +msgstr "Alemanya, Brandenburg" #: holidayregion.cpp:893 msgctxt "HolidayRegion|German region" msgid "Germany, Berlin" -msgstr "" +msgstr "Alemanya, Berl??n" #: holidayregion.cpp:895 msgctxt "HolidayRegion|German region" msgid "Germany, Baden-Wuerttemberg" -msgstr "" +msgstr "Alemanya, Baden-W??rttemberg" #: holidayregion.cpp:897 msgctxt "HolidayRegion|German region" msgid "Germany, Hesse" -msgstr "" +msgstr "Alemanya, Hessen" #: holidayregion.cpp:899 msgctxt "HolidayRegion|German region" msgid "Germany, Mecklenburg-Hither Pomerania" -msgstr "" +msgstr "Alemanya, Mecklenburg-Pomer??nia Occidental" #: holidayregion.cpp:901 msgctxt "HolidayRegion|German region" msgid "Germany, Lower Saxony" -msgstr "" +msgstr "Alemanya, Baixa Sax??nia" #: holidayregion.cpp:903 msgctxt "HolidayRegion|German region" msgid "Germany, North Rhine-Westphalia" -msgstr "" +msgstr "Alemanya, Rin del Nord-Westf??lia" #: holidayregion.cpp:905 msgctxt "HolidayRegion|German region" msgid "Germany, Rhineland-Palatinate" -msgstr "" +msgstr "Alemanya, Ren??nia-Palatinat" #: holidayregion.cpp:907 msgctxt "HolidayRegion|German region" msgid "Germany, Schleswig-Holstein" -msgstr "" +msgstr "Alemanya, Schleswig-Holstein" #: holidayregion.cpp:909 msgctxt "HolidayRegion|German region" msgid "Germany, Saarland" -msgstr "" +msgstr "Alemanya, Saarland" #: holidayregion.cpp:911 msgctxt "HolidayRegion|German region" msgid "Germany, Saxony" -msgstr "" +msgstr "Alemanya, Sax??nia" #: holidayregion.cpp:913 msgctxt "HolidayRegion|German region" msgid "Germany, Saxony-Anhalt" -msgstr "" +msgstr "Alemanya, Sax??nia-Anhalt" #: holidayregion.cpp:915 msgctxt "HolidayRegion|German region" msgid "Germany, Thuringia" -msgstr "" +msgstr "Alemanya, Tur??ngia" #: holidayregion.cpp:918 msgctxt "HolidayRegion|Spanish region" @@ -317,12 +313,12 @@ #: holidayregion.cpp:1010 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Sunni" -msgstr "Islam sunn??" +msgstr "Islam sunnita" #: holidayregion.cpp:1012 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Shia" -msgstr "Islam xi??" +msgstr "Islam xi??ta" #: holidayregion.cpp:1014 msgctxt "HolidayRegion|Holiday type" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/po/zh_CN/libkholidays5_qt.po new/kholidays-5.93.0/po/zh_CN/libkholidays5_qt.po --- old/kholidays-5.92.0/po/zh_CN/libkholidays5_qt.po 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/po/zh_CN/libkholidays5_qt.po 2022-04-02 12:20:47.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2022-02-26 05:16\n" +"PO-Revision-Date: 2022-03-31 13:30\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/src/parsers/holidayparserdriver.cpp new/kholidays-5.93.0/src/parsers/holidayparserdriver.cpp --- old/kholidays-5.92.0/src/parsers/holidayparserdriver.cpp 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/src/parsers/holidayparserdriver.cpp 2022-04-02 12:20:47.000000000 +0200 @@ -56,7 +56,7 @@ m_requestEnd = endDate; parse(); - for (int year = startDate.year(); year < endDate.year(); ++year) { + for (int year = startDate.year(); year <= endDate.year(); ++year) { for (auto s : {AstroSeasons::JuneSolstice, AstroSeasons::DecemberSolstice, AstroSeasons::MarchEquinox, AstroSeasons::SeptemberEquinox}) { const auto dt = AstroSeasons::seasonDate(s, year); if (dt >= startDate && dt <= endDate) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/src/parsers/plan2/holidayparserplan.cpp new/kholidays-5.93.0/src/parsers/plan2/holidayparserplan.cpp --- old/kholidays-5.92.0/src/parsers/plan2/holidayparserplan.cpp 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/src/parsers/plan2/holidayparserplan.cpp 2022-04-02 12:20:47.000000000 +0200 @@ -533,7 +533,7 @@ /* Line 678 of lalr1.cc */ #line 156 "holidayparserplan.ypp" { - driver.setEventCategory((yysemantic_stack_[(2) - (1)].sval)); + driver.setEventCategory((yysemantic_stack_[(2) - (2)].sval)); } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/src/parsers/plan2/holidayscannerplan.cpp new/kholidays-5.93.0/src/parsers/plan2/holidayscannerplan.cpp --- old/kholidays-5.92.0/src/parsers/plan2/holidayscannerplan.cpp 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/src/parsers/plan2/holidayscannerplan.cpp 2022-04-02 12:20:47.000000000 +0200 @@ -2436,7 +2436,7 @@ case 161: YY_RULE_SETUP #line 275 "holidayscannerplan.lpp" - { yylval->sval = (char *)"indian-national"; return token::CALENDAR; } + { yylval->sval = (char *)"indiannational"; return token::CALENDAR; } YY_BREAK case 162: YY_RULE_SETUP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.92.0/src/parsers/plan2/holidayscannerplan.lpp new/kholidays-5.93.0/src/parsers/plan2/holidayscannerplan.lpp --- old/kholidays-5.92.0/src/parsers/plan2/holidayscannerplan.lpp 2022-03-05 14:00:52.000000000 +0100 +++ new/kholidays-5.93.0/src/parsers/plan2/holidayscannerplan.lpp 2022-04-02 12:20:47.000000000 +0200 @@ -260,7 +260,7 @@ yaumalsabt { yylval->ival = 6; return token::WDAY; } yaumalahad { yylval->ival = 7; return token::WDAY; } -indiannational { yylval->sval = (char *)"indian-national"; return token::CALENDAR; } +indiannational { yylval->sval = (char *)"indiannational"; return token::CALENDAR; } chaitra { yylval->ival = 1; return token::MONTH; } vaishakh { yylval->ival = 2; return token::MONTH; }
