- Adapted indenation to new agreed upon system

- Added support for second generation scriptcontext based counter
This commit is contained in:
koennecke
2009-02-13 09:00:03 +00:00
parent a3dcad2bfa
commit 91d4af0541
405 changed files with 88101 additions and 88173 deletions

View File

@ -11,45 +11,46 @@
#include "scaldate.h"
int isleap (unsigned yr)
int isleap(unsigned yr)
{
return yr % 400 == 0 || (yr % 4 == 0 && yr % 100 != 0);
return yr % 400 == 0 || (yr % 4 == 0 && yr % 100 != 0);
}
static unsigned months_to_days (unsigned month)
static unsigned months_to_days(unsigned month)
{
return (month * 3057 - 3007) / 100;
return (month * 3057 - 3007) / 100;
}
static long years_to_days (unsigned yr)
static long years_to_days(unsigned yr)
{
return yr * 365L + yr / 4 - yr / 100 + yr / 400;
return yr * 365L + yr / 4 - yr / 100 + yr / 400;
}
long ymd_to_scalar (unsigned yr, unsigned mo, unsigned day)
long ymd_to_scalar(unsigned yr, unsigned mo, unsigned day)
{
long scalar;
scalar = day + months_to_days(mo);
if ( mo > 2 ) /* adjust if past February */
scalar -= isleap(yr) ? 1 : 2;
yr--;
scalar += years_to_days(yr);
return scalar;
long scalar;
scalar = day + months_to_days(mo);
if (mo > 2) /* adjust if past February */
scalar -= isleap(yr) ? 1 : 2;
yr--;
scalar += years_to_days(yr);
return scalar;
}
void scalar_to_ymd (long scalar, unsigned *yr, unsigned *mo, unsigned *day)
void scalar_to_ymd(long scalar, unsigned *yr, unsigned *mo, unsigned *day)
{
unsigned n; /* compute inverse of years_to_days() */
unsigned n; /* compute inverse of years_to_days() */
for ( n = (unsigned)((scalar * 400L) / 146097L); years_to_days(n) < scalar;)
n++; /* 146097 == years_to_days(400) */
*yr = n;
n = (unsigned)(scalar - years_to_days(n-1));
if ( n > 59 ) { /* adjust if past February */
n += 2;
if ( isleap(*yr) )
n -= n > 62 ? 1 : 2;
}
*mo = (n * 100 + 3007) / 3057; /* inverse of months_to_days() */
*day = n - months_to_days(*mo);
for (n = (unsigned) ((scalar * 400L) / 146097L);
years_to_days(n) < scalar;)
n++; /* 146097 == years_to_days(400) */
*yr = n;
n = (unsigned) (scalar - years_to_days(n - 1));
if (n > 59) { /* adjust if past February */
n += 2;
if (isleap(*yr))
n -= n > 62 ? 1 : 2;
}
*mo = (n * 100 + 3007) / 3057; /* inverse of months_to_days() */
*day = n - months_to_days(*mo);
}