From 3855083919e86f49f174f73304a376100c97a344 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Fri, 4 Aug 2000 18:18:55 +0200
Subject: [PATCH] Changed Calendar to Calendar_I so that this module continues
to refer to itself.
Rev: lib/modules/Calendar_I.pmod/Austrian.pmod:1.2
Rev: lib/modules/Calendar_I.pmod/Gregorian.pmod:1.24
Rev: lib/modules/Calendar_I.pmod/ISO.pmod:1.9
Rev: lib/modules/Calendar_I.pmod/Julian.pmod:1.2
Rev: lib/modules/Calendar_I.pmod/Orthodox.pmod:1.3
Rev: lib/modules/Calendar_I.pmod/Stardate.pmod:1.2
Rev: lib/modules/Calendar_I.pmod/Swedish.pmod:1.14
Rev: lib/modules/Calendar_I.pmod/module.pmod:1.6
---
lib/modules/Calendar_I.pmod/Austrian.pmod | 2 +-
lib/modules/Calendar_I.pmod/Gregorian.pmod | 6 +++---
lib/modules/Calendar_I.pmod/ISO.pmod | 2 +-
lib/modules/Calendar_I.pmod/Julian.pmod | 8 ++++----
lib/modules/Calendar_I.pmod/Orthodox.pmod | 4 ++--
lib/modules/Calendar_I.pmod/Stardate.pmod | 4 ++--
lib/modules/Calendar_I.pmod/Swedish.pmod | 2 +-
lib/modules/Calendar_I.pmod/module.pmod | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/modules/Calendar_I.pmod/Austrian.pmod b/lib/modules/Calendar_I.pmod/Austrian.pmod
index 216139e91b..5d5de09fe5 100644
--- a/lib/modules/Calendar_I.pmod/Austrian.pmod
+++ b/lib/modules/Calendar_I.pmod/Austrian.pmod
@@ -1,6 +1,6 @@
// by Martin Baehr <mbaehr@email.archlab.tuwien.ac.at>
-inherit Calendar.ISO:ISO;
+inherit Calendar_I.ISO:ISO;
void create()
{
diff --git a/lib/modules/Calendar_I.pmod/Gregorian.pmod b/lib/modules/Calendar_I.pmod/Gregorian.pmod
index c4d170c5d2..60295814e7 100644
--- a/lib/modules/Calendar_I.pmod/Gregorian.pmod
+++ b/lib/modules/Calendar_I.pmod/Gregorian.pmod
@@ -1,6 +1,6 @@
// by Mirar
-//! module Calendar
+//! module Calendar_I
//! submodule Gregorian
//! time units:
//! <ref>Year</ref>, <ref>Month</ref>, <ref>Week</ref>, <ref>Day</ref>
@@ -20,7 +20,7 @@ mapping week_day_mapping,month_mapping;
class _TimeUnit
{
- inherit Calendar._TimeUnit;
+ inherit Calendar_I._TimeUnit;
program vYear=function_object(object_program(this_object()))->Year;
program vDay=function_object(object_program(this_object()))->Day;
@@ -36,7 +36,7 @@ class _TimeUnit
class Year
{
//! class Year
-//! A <ref>Calendar.time_unit</ref>.
+//! A <ref>Calendar_I.time_unit</ref>.
//!
//! Lesser units: <ref>Month</ref>, <ref>Week</ref>, <ref>Day</ref>
//! Greater units: none
diff --git a/lib/modules/Calendar_I.pmod/ISO.pmod b/lib/modules/Calendar_I.pmod/ISO.pmod
index 214f6a709b..448c0090d5 100644
--- a/lib/modules/Calendar_I.pmod/ISO.pmod
+++ b/lib/modules/Calendar_I.pmod/ISO.pmod
@@ -1,6 +1,6 @@
// IS-8601, international standard
-inherit Calendar.Gregorian:Gregorian;
+inherit Calendar_I.Gregorian:Gregorian;
class Year
{
diff --git a/lib/modules/Calendar_I.pmod/Julian.pmod b/lib/modules/Calendar_I.pmod/Julian.pmod
index 7c03a20b85..bde39fa269 100644
--- a/lib/modules/Calendar_I.pmod/Julian.pmod
+++ b/lib/modules/Calendar_I.pmod/Julian.pmod
@@ -1,8 +1,8 @@
-inherit Calendar.Gregorian;
+inherit Calendar_I.Gregorian;
class Year
{
- inherit Calendar.Gregorian.Year;
+ inherit Calendar_I.Gregorian.Year;
int julian_day(int d) // jd%7 gives weekday, mon=0, sun=6
{
@@ -18,13 +18,13 @@ class Year
class Day
{
- inherit Calendar.Gregorian.Day;
+ inherit Calendar_I.Gregorian.Day;
void create(int ... arg)
{
if (!sizeof(arg))
{
- int jd = Calendar.Gregorian.Day()->julian_day()-1721424;
+ int jd = Calendar_I.Gregorian.Day()->julian_day()-1721424;
y = jd*100/36525+1;
d = jd-(y-1)*36525/100;
}
diff --git a/lib/modules/Calendar_I.pmod/Orthodox.pmod b/lib/modules/Calendar_I.pmod/Orthodox.pmod
index faa7de36e9..f71a9f1e2e 100644
--- a/lib/modules/Calendar_I.pmod/Orthodox.pmod
+++ b/lib/modules/Calendar_I.pmod/Orthodox.pmod
@@ -1,10 +1,10 @@
// by Mirar
-inherit Calendar.Gregorian : christ;
+inherit Calendar_I.Gregorian : christ;
class Year
{
- inherit Calendar.Gregorian.Year;
+ inherit Calendar_I.Gregorian.Year;
int leap() // tack, hubbe... :-)
{
diff --git a/lib/modules/Calendar_I.pmod/Stardate.pmod b/lib/modules/Calendar_I.pmod/Stardate.pmod
index a91e964fca..2605dc1951 100644
--- a/lib/modules/Calendar_I.pmod/Stardate.pmod
+++ b/lib/modules/Calendar_I.pmod/Stardate.pmod
@@ -7,7 +7,7 @@
class TNGDate
{
- inherit Calendar._TimeUnit;
+ inherit Calendar_I._TimeUnit;
// 40759.5 2363-10-05 2584405
// 47391.2 2370-05-23 2586827
@@ -31,7 +31,7 @@ class TNGDate
{
float jd;
if (!sizeof(day))
- day=({Calendar.Gregorian.Second()});
+ day=({Calendar_I.Gregorian.Second()});
else if (floatp(day[0]))
{
from_stardate(day[0]);
diff --git a/lib/modules/Calendar_I.pmod/Swedish.pmod b/lib/modules/Calendar_I.pmod/Swedish.pmod
index 861bd0a7f8..a952e8ea13 100644
--- a/lib/modules/Calendar_I.pmod/Swedish.pmod
+++ b/lib/modules/Calendar_I.pmod/Swedish.pmod
@@ -1,6 +1,6 @@
// by Mirar
-inherit Calendar.ISO:ISO;
+inherit Calendar_I.ISO:ISO;
void create()
{
diff --git a/lib/modules/Calendar_I.pmod/module.pmod b/lib/modules/Calendar_I.pmod/module.pmod
index 302ac793ec..cec29ccff1 100644
--- a/lib/modules/Calendar_I.pmod/module.pmod
+++ b/lib/modules/Calendar_I.pmod/module.pmod
@@ -1,5 +1,5 @@
-//! module Calendar
+//! module Calendar_I
//!
//! This module implements calendar calculations, and base classes
//! for time units.
@@ -82,7 +82,7 @@ string print_month(void|object month,void|mapping options)
string res="";
if (!month) // resolv thing here is to avoid compile-time resolve
- month=master()->resolv("Calendar")["Gregorian"]["Month"]();
+ month=master()->resolv("Calendar_I")["Gregorian"]["Month"]();
options=(["mark_today":1,
"week_space":3,
--
GitLab